[freeplane] 04/11: adapt patches for 1.3.11
Felix Natter
fnatter-guest at moszumanska.debian.org
Mon Jun 30 18:30:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 86531985feef8677999ca3b9cc500c52b5a055d0
Author: Felix Natter <fnatter at gmx.net>
Date: Sun Jun 29 18:46:22 2014 +0200
adapt patches for 1.3.11
---
debian/patches/10_libraries_properties.patch | 40 +-
debian/patches/15_libraries_manifest.patch | 46 ++-
debian/patches/20_freeplane_sh.patch | 8 +-
debian/patches/40_no_winmac.patch | 18 +-
debian/patches/50_no_copy_files.patch | 58 +--
debian/patches/60_no_license_latex.patch | 18 +-
debian/patches/70_skip_bugreport.patch | 14 +-
debian/patches/80_no_update_check.patch | 119 +++---
debian/patches/90_fix_jsyntaxpane_location.patch | 19 -
debian/patches/92_fix_old_manifest.patch | 22 +-
debian/patches/93_jgoodies1.6.patch | 474 ++++++++++++++++++-----
debian/patches/95_run_jflex.patch | 29 ++
debian/patches/series | 2 +-
13 files changed, 597 insertions(+), 270 deletions(-)
diff --git a/debian/patches/10_libraries_properties.patch b/debian/patches/10_libraries_properties.patch
index acd22df..a801cab 100644
--- a/debian/patches/10_libraries_properties.patch
+++ b/debian/patches/10_libraries_properties.patch
@@ -1,7 +1,7 @@
changes paths to dependency jars to /usr/share/java/...
--- a/freeplane/ant/ant.properties
+++ b/freeplane/ant/ant.properties
-@@ -1,12 +1,14 @@
+@@ -1,14 +1,17 @@
-freeplane.ext.lib = ${workspace}/freeplane/lib
+freeplane.ext.lib = /usr/share/java
freeplane.dist.lib = ${workspace}/freeplane/dist/lib
@@ -10,17 +10,22 @@ changes paths to dependency jars to /usr/share/java/...
freeplaneosgi.jar = ${freeplane.dist.lib}/freeplaneosgi.jar
freeplanemac.jar = ${freeplane.ext.lib}/freeplanemac.jar
freeplane.jars = ${freeplaneviewer.jar}:${freeplaneeditor.jar}:${freeplaneosgi.jar}:${freeplanemac.jar}
--commons-lang.jar = ${freeplane.ext.lib}/commons-lang-2.0.jar
+-commons-lang.jar = ${freeplane.ext.lib}/commons-lang-2.6.jar
+-commons-codec.jar = ${freeplane.ext.lib}/commons-codec-1.7.jar
-commons-io.jar = ${freeplane.ext.lib}/commons-io-2.4.jar
-forms.jar = ${freeplane.ext.lib}/forms-1.2.1.jar
-+# currently commons-lang-2.6.jar
++
+commons-lang.jar = ${freeplane.ext.lib}/commons-lang.jar
-+# TODO: upstream freeplane requires commons-io-2.4.jar, but debian only has 1.4 ?
++# commons-codec 1.7!
++commons-codec.jar = ${freeplane.ext.lib}/commons-codec.jar
+commons-io.jar = ${freeplane.ext.lib}/commons-io.jar
+forms.jar = ${freeplane.ext.lib}/jgoodies-forms.jar
SimplyHTML.jar = ${freeplane.ext.lib}/SimplyHTML.jar
-jortho.jar = ${freeplane.ext.lib}/jortho.jar
+-idwgpl.jar = ${freeplane.ext.lib}/idw-gpl.jar
++#jortho.jar = ${freeplane.ext.lib}/jortho.jar
+jortho.jar = ${workspace}/JOrtho_0.4_freeplane/dist/lib/jortho-0.4+fp1.1.1.jar
++idwgpl.jar = ${freeplane.ext.lib}/idw.jar
--- a/freeplane_framework/ant/ant.properties
+++ b/freeplane_framework/ant/ant.properties
@@ -1,4 +1,4 @@
@@ -44,18 +49,15 @@ changes paths to dependency jars to /usr/share/java/...
+++ b/freeplane_plugin_latex/ant/ant.properties
@@ -1,2 +1,2 @@
-plugin.ext.lib = lib
--jlatexmath.jar = ${plugin.ext.lib}/jlatexmath-0.9.7.jar
+plugin.ext.lib = /usr/share/java
-+jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
+ jlatexmath.jar = ${plugin.ext.lib}/jlatexmath.jar
--- a/freeplane_plugin_script/ant/ant.properties
+++ b/freeplane_plugin_script/ant/ant.properties
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,3 @@
-plugin.ext.lib = lib
+plugin.ext.lib = /usr/share/java
groovy.jar = ${plugin.ext.lib}/groovy-all.jar
--jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane/jsyntaxpane-jdk5.jar
-+#jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane/jsyntaxpane-jdk5.jar
-+jsyntaxpane.jar ${plugin.ext.lib}/jsyntaxpane.jar
+ jsyntaxpane.jar = ${plugin.ext.lib}/jsyntaxpane.jar
--- a/freeplane_plugin_svg/ant/ant.properties
+++ b/freeplane_plugin_svg/ant/ant.properties
@@ -1,23 +1,18 @@
@@ -87,3 +89,21 @@ changes paths to dependency jars to /usr/share/java/...
xml-apis-ext.jar = ${plugin.ext.lib}/xml-apis-ext.jar
# Xalan2 - XSL Transformations (XSLT) processor in Java
xml-apis.jar = ${plugin.ext.lib}/xml-apis.jar
+--- a/freeplane_plugin_openmaps/ant/ant.properties
++++ b/freeplane_plugin_openmaps/ant/ant.properties
+@@ -1,2 +1,2 @@
+-plugin.ext.lib = lib
+-JMapViewer.jar = ${plugin.ext.lib}/JMapViewer.jar
+\ No newline at end of file
++plugin.ext.lib = /usr/share/java
++JMapViewer.jar = ${plugin.ext.lib}/jmapviewer.jar
+\ No newline at end of file
+--- a/freeplane_plugin_workspace/ant/ant.properties
++++ b/freeplane_plugin_workspace/ant/ant.properties
+@@ -1,3 +1,3 @@
+-plugin.ext.lib = lib
+-jgoodies.jar = ${workspace}/freeplane/dist/org.freeplane.core/lib/forms-1.2.1.jar
+-commons_io.jar = ${workspace}/freeplane/dist/org.freeplane.core/lib/commons-io-2.4.jar
++plugin.ext.lib = /usr/share/java
++jgoodies.jar = ${plugin.ext.lib}/jgoodies-forms.jar
++commons_io.jar = ${plugin.ext.lib}/commons-io.jar
diff --git a/debian/patches/15_libraries_manifest.patch b/debian/patches/15_libraries_manifest.patch
index 6ce8a6a..dea9f7f 100644
--- a/debian/patches/15_libraries_manifest.patch
+++ b/debian/patches/15_libraries_manifest.patch
@@ -1,26 +1,30 @@
adapts jar paths in core MANIFEST as well as plugin MANIFESTs
--- a/freeplane/META-INF/MANIFEST.MF
+++ b/freeplane/META-INF/MANIFEST.MF
-@@ -7,12 +7,13 @@
+@@ -7,14 +7,15 @@
lib/freeplaneeditor.jar,
lib/freeplanemac.jar,
lib/freeplaneosgi.jar,
-- lib/commons-lang-2.0.jar,
+- lib/commons-lang-2.6.jar,
- lib/commons-io-2.4.jar,
- lib/forms-1.2.1.jar,
- lib/gnu-regexp-1.1.4.jar,
- lib/SimplyHTML.jar,
- lib/jortho.jar,
+- lib/idw-gpl.jar,
+- lib/commons-codec-1.7.jar
+ ../../../java/commons-lang.jar,
+ ../../../java/commons-io.jar,
+ ../../../java/jgoodies-forms.jar,
+ ../../../java/jgoodies-common.jar,
-+ ../../../java/gnu-regexp-1.1.4.jar,
++ ../../../java/gnu-regexp.jar,
+ ../../../java/SimplyHTML.jar,
+ ../../../java/jortho.jar,
- lib/imgscalr-lib-3.2.jar
++ ../../../java/idw.jar,
++ ../../../java/commons-codec.jar
Bundle-Activator: org.freeplane.main.osgi.Activator
Import-Package: org.osgi.framework,
+ org.osgi.service.url;version="1.0.0"
--- a/freeplane_plugin_help/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_help/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@
@@ -32,22 +36,25 @@ adapts jar paths in core MANIFEST as well as plugin MANIFESTs
Export-Package: org.freeplane.plugin.help;uses:="org.freeplane.core.ui,org.freeplane.core.controller,org.osgi.framework"
--- a/freeplane_plugin_latex/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_latex/META-INF/MANIFEST.MF
-@@ -9,4 +9,4 @@
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
+@@ -10,4 +10,4 @@
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1",
+ org.freeplane.plugin.script;bundle-version="1.0.1"
Bundle-ClassPath: lib/plugin.jar,
-- lib/jlatexmath-0.9.7.jar
+- lib/jlatexmath.jar
+ ../../../java/jlatexmath.jar
--- a/freeplane_plugin_script/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_script/META-INF/MANIFEST.MF
-@@ -7,6 +7,6 @@
- Import-Package: org.osgi.framework;version="1.3.0"
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+@@ -8,8 +8,8 @@
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
--Bundle-ClassPath: lib/groovy-all.jar,
-+Bundle-ClassPath: ../../../java/groovy-all.jar,
- lib/plugin.jar
- Export-Package: org.freeplane.plugin.script
+ Bundle-ClassPath: lib/plugin.jar,
+- lib/jsyntaxpane.jar,
+- lib/groovy-all.jar
++ ../../../java/jsyntaxpane.jar,
++ ../../../java/groovy-all.jar
+ Export-Package: jsyntaxpane,
+ jsyntaxpane.actions,
+ jsyntaxpane.actions.gui,
--- a/freeplane_plugin_svg/META-INF/MANIFEST.MF
+++ b/freeplane_plugin_svg/META-INF/MANIFEST.MF
@@ -7,27 +7,14 @@
@@ -88,3 +95,12 @@ adapts jar paths in core MANIFEST as well as plugin MANIFESTs
lib/plugin.jar,
- lib/xml-apis-ext.jar
+ ../../../java/xml-apis-ext.jar
+--- a/freeplane_plugin_openmaps/META-INF/MANIFEST.MF
++++ b/freeplane_plugin_openmaps/META-INF/MANIFEST.MF
+@@ -6,5 +6,5 @@
+ Bundle-Activator: org.freeplane.plugin.openmaps.Activator
+ Import-Package: org.osgi.framework;version="1.3.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+-Bundle-ClassPath: lib/JMapViewer.jar, lib/plugin.jar
++Bundle-ClassPath: ../../../java/jmapviewer.jar, lib/plugin.jar
+ Require-Bundle: org.freeplane.core;bundle-version="1.0.1"
diff --git a/debian/patches/20_freeplane_sh.patch b/debian/patches/20_freeplane_sh.patch
index 0c308be..5852b01 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -73,7 +73,7 @@ JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe
return 1
fi
}
-@@ -110,9 +117,16 @@
+@@ -119,9 +126,16 @@
_source /etc/freeplane/freeplanerc
_source "${userfpdir}/freeplanerc"
@@ -93,8 +93,8 @@ JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe
fi
output_debug_info
-@@ -158,7 +172,7 @@
- fi
+@@ -174,7 +188,7 @@
+ #JAVA_OPTS="-Dorg.freeplane.nosplash=true $JAVA_OPTS"
_debug "Calling: "\
-"${JAVACMD}" -Xmx512m\
@@ -102,7 +102,7 @@ JAVACMD->JAVA_CMD, use java-wrappers.sh instead of findjava if available, maybe
"-Dorg.freeplane.param1=$1"\
"-Dorg.freeplane.param2=$2"\
"-Dorg.freeplane.param3=$3"\
-@@ -178,7 +192,7 @@
+@@ -196,7 +210,7 @@
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
# now actually launch Freeplane
diff --git a/debian/patches/40_no_winmac.patch b/debian/patches/40_no_winmac.patch
index 52f3b52..9bd2e7c 100644
--- a/debian/patches/40_no_winmac.patch
+++ b/debian/patches/40_no_winmac.patch
@@ -1,12 +1,12 @@
don't build windows/mac installers
--- a/freeplane_framework/ant/build.xml
+++ b/freeplane_framework/ant/build.xml
-@@ -467,7 +467,7 @@
- </checksum>
- </target>
-
-- <target name="copyDistFiles" depends="git_version_info, binzip, srczip, installer, portableinstaller, zip4mac, dmg4mac, javadoc">
-+ <target name="copyDistFiles" depends="git_version_info, binzip, srczip">
- <copy file="${workspace}/freeplane/doc/history_en.txt"
- todir="${dist}" />
- <copy file="${build}/gitinfo.txt"
+@@ -488,7 +488,7 @@
+ </checksum>
+ </target>
+
+- <target name="copyDistFiles" depends="git_version_info, binzip, srczip, installer, portableinstaller, zip4mac, dmg4mac, javadoc">
++ <target name="copyDistFiles" depends="git_version_info, binzip, srczip">
+ <copy file="${workspace}/freeplane/doc/history_en.txt"
+ todir="${dist}" />
+ <copy file="${build}/gitinfo.txt"
diff --git a/debian/patches/50_no_copy_files.patch b/debian/patches/50_no_copy_files.patch
index 8d66163..62c3d8e 100644
--- a/debian/patches/50_no_copy_files.patch
+++ b/debian/patches/50_no_copy_files.patch
@@ -1,34 +1,34 @@
don't build some mac/win stuff, don't copy third-party libraries (they're not even included in freeplane_srcpure!)
--- a/freeplane/ant/build.xml
+++ b/freeplane/ant/build.xml
-@@ -131,14 +131,14 @@
- </jar>
- </target>
-
-- <target name="dist" depends="jar, buildmac">
-+ <target name="dist" depends="jar">
- <!-- third party libs -->
- <mkdir dir="${freeplane.dist.lib}" />
-- <copy todir="${freeplane.dist.lib}">
-+ <!-- <copy todir="${freeplane.dist.lib}">
- <fileset dir="${freeplane.ext.lib}">
- <include name="*.jar" />
- </fileset>
-- </copy>
-+ </copy> -->
- <mkdir dir="${dist.resources}" />
- <copy todir="${dist.resources}">
- <fileset dir="external-resources"/>
+@@ -187,14 +187,16 @@
+ </jar>
+ </target>
+
+- <target name="dist" depends="jar, signjar, signjarinfo, buildmac">
++ <target name="dist" depends="jar, signjar, signjarinfo">
+ <!-- third party libs -->
+ <mkdir dir="${freeplane.dist.lib}" />
++<!--
+ <copy todir="${freeplane.dist.lib}">
+ <fileset dir="${freeplane.ext.lib}">
+ <include name="*.jar" />
+ </fileset>
+ </copy>
++-->
+ <mkdir dir="${dist.resources}" />
+ <copy todir="${dist.resources}">
+ <fileset dir="external-resources"/>
--- a/freeplane_framework/ant/build.xml
+++ b/freeplane_framework/ant/build.xml
-@@ -142,10 +142,6 @@
- <copy todir="${build}">
- <fileset dir="${script}" />
- <fileset file="${framework.jar}" />
-- <fileset file="${freeplanelauncher.jar}" />
-- <fileset file="windows-icons/freeplaneIcons.dll" />
-- <fileset dir="launch4j" includes="*.exe" />
-- <fileset dir="launch4j" includes="*.ini" />
- </copy>
- <chmod file="${build}/freeplane.sh" perm="ugo+rx" />
- </target>
+@@ -166,10 +166,6 @@
+ <copy todir="${build}">
+ <fileset dir="${script}" />
+ <fileset file="${framework.jar}" />
+- <fileset file="${freeplanelauncher.jar}" />
+- <fileset file="windows-icons/freeplaneIcons.dll" />
+- <fileset dir="launch4j" includes="*.exe" />
+- <fileset dir="launch4j" includes="*.ini" />
+ </copy>
+ <chmod file="${build}/freeplane.sh" perm="ugo+rx" />
+ </target>
diff --git a/debian/patches/60_no_license_latex.patch b/debian/patches/60_no_license_latex.patch
index 2d17d71..e3bfed8 100644
--- a/debian/patches/60_no_license_latex.patch
+++ b/debian/patches/60_no_license_latex.patch
@@ -1,12 +1,12 @@
remove JLaTeXMath license, it's in separate libjlatexmath-java package
--- a/freeplane_plugin_latex/ant/build.xml
+++ b/freeplane_plugin_latex/ant/build.xml
-@@ -33,7 +33,7 @@
- <mkdir dir="${dist.osgi.dir}" />
- <copy todir="${dist.osgi.dir}">
- <fileset dir="${root}">
-- <include name="lib/**"/>
-+ <include name="lib/**/*.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${dist.osgi.dir}/META-INF" />
+@@ -45,7 +45,7 @@
+ <mkdir dir="${dist.osgi.dir}" />
+ <copy todir="${dist.osgi.dir}">
+ <fileset dir="${root}">
+- <include name="lib/**"/>
++ <include name="lib/**/*.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${dist.osgi.dir}/META-INF" />
diff --git a/debian/patches/70_skip_bugreport.patch b/debian/patches/70_skip_bugreport.patch
index bebbbe5..236441d 100644
--- a/debian/patches/70_skip_bugreport.patch
+++ b/debian/patches/70_skip_bugreport.patch
@@ -1,14 +1,14 @@
disable automatic sending of bug reports
--- a/build.xml
+++ b/build.xml
-@@ -7,7 +7,9 @@
+@@ -5,7 +5,9 @@
+ </target>
<target name="dist">
- <ant antfile="freeplane_framework/ant/build.xml" target="dist"
-- inheritAll="false" />
-+ inheritAll="false">
-+ <property name="skip_bugreport" value="true" />
-+ </ant>
+- <ant antfile="freeplane_framework/ant/build.xml" target="dist" inheritAll="false" />
++ <ant antfile="freeplane_framework/ant/build.xml" target="dist" inheritAll="false">
++ <property name="skip_bugreport" value="true" />
++ </ant>
</target>
<target name="format-translation">
- <ant antfile="JOrtho_0.4_freeplane/build.xml" target="format-translation"
+ <ant antfile="JOrtho_0.4_freeplane/build.xml" target="format-translation" inheritAll="false" />
diff --git a/debian/patches/80_no_update_check.patch b/debian/patches/80_no_update_check.patch
index 222930b..794c22c 100644
--- a/debian/patches/80_no_update_check.patch
+++ b/debian/patches/80_no_update_check.patch
@@ -1,54 +1,67 @@
disable update check in all menus as well as update check on startup (see #626187)
---- a/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java
-+++ b/freeplane/src/org/freeplane/main/application/FreeplaneStarter.java
-@@ -158,7 +158,7 @@
- LinkController.install();
- IconController.install();
- HelpController.install();
-- controller.addAction(new UpdateCheckAction());
-+ //controller.addAction(new UpdateCheckAction());
- controller.addAction(new NextNodeAction(Direction.FORWARD));
- controller.addAction(new NextNodeAction(Direction.BACK));
- controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
---- a/freeplane/resources/xml/browsemodemenu.xml
-+++ b/freeplane/resources/xml/browsemodemenu.xml
-@@ -114,9 +114,11 @@
- <menu_category menu_key="main_menu_mindmaps" name="mindmaps"/>
- </menu_submenu>
- <menu_submenu name="help" name_ref="help">
-+ <!--
- <menu_category name="update">
- <menu_action action="UpdateCheckAction"/>
- </menu_category>
-+ -->
- <menu_category name="Web resources">
- <menu_action action="OpenFreeplaneSiteAction"/>
- <menu_action action="AskForHelp"/>
---- a/freeplane/resources/xml/filemodemenu.xml
-+++ b/freeplane/resources/xml/filemodemenu.xml
-@@ -80,9 +80,11 @@
- <menu_category menu_key="main_menu_mindmaps" name="mindmaps"/>
- </menu_submenu>
- <menu_submenu name="help" name_ref="help">
-+ <!--
- <menu_category name="update">
- <menu_action action="UpdateCheckAction"/>
- </menu_category>
-+ -->
- <menu_category name="Web resources">
- <menu_action action="OpenFreeplaneSiteAction"/>
- <menu_action action="AskForHelp"/>
---- a/freeplane/resources/xml/mindmapmodemenu.xml
-+++ b/freeplane/resources/xml/mindmapmodemenu.xml
-@@ -403,9 +403,11 @@
- <menu_separator />
- </menu_submenu>
- <menu_submenu name="help" name_ref="help">
-+ <!--
- <menu_category name="update">
- <menu_action action="UpdateCheckAction" />
- </menu_category>
-+ -->
- <menu_separator />
- <menu_category name="Web resources">
- <menu_action action="OpenFreeplaneSiteAction" />
+TODO: in 1.3.x, the menus are stored in mindmaps => how to patch this?
+--- a/freeplane/src/org/freeplane/main/application/FreeplaneGUIStarter.java
++++ b/freeplane/src/org/freeplane/main/application/FreeplaneGUIStarter.java
+@@ -167,7 +167,7 @@
+ LinkController.install();
+ IconController.install();
+ HelpController.install();
+- controller.addAction(new UpdateCheckAction());
++ //controller.addAction(new UpdateCheckAction());
+ controller.addAction(new NextNodeAction(Direction.FORWARD));
+ controller.addAction(new NextNodeAction(Direction.BACK));
+ controller.addAction(new NextNodeAction(Direction.FORWARD_N_FOLD));
+--- a/freeplane/resources/xml/browsemodemenu.mm
++++ b/freeplane/resources/xml/browsemodemenu.mm
+@@ -483,6 +483,7 @@
+ <attribute NAME="type" VALUE="submenu"/>
+ <attribute NAME="name" VALUE="help"/>
+ <attribute NAME="name_ref" VALUE="help"/>
++<!--
+ <node TEXT="update" FOLDED="true" ID="ID_972374411" CREATED="1370343428377" MODIFIED="1370343428377">
+ <attribute NAME="type" VALUE="category"/>
+ <attribute NAME="name" VALUE="update"/>
+@@ -491,6 +492,7 @@
+ <attribute NAME="action" VALUE="UpdateCheckAction"/>
+ </node>
+ </node>
++-->
+ <node TEXT="Web resources" FOLDED="true" ID="ID_902808063" CREATED="1370343428377" MODIFIED="1370343428377">
+ <attribute NAME="type" VALUE="category"/>
+ <attribute NAME="name" VALUE="Web resources"/>
+--- a/freeplane/resources/xml/filemodemenu.mm
++++ b/freeplane/resources/xml/filemodemenu.mm
+@@ -367,6 +367,7 @@
+ <attribute NAME="type" VALUE="submenu"/>
+ <attribute NAME="name" VALUE="help"/>
+ <attribute NAME="name_ref" VALUE="help"/>
++<!--
+ <node TEXT="update" FOLDED="true" ID="ID_1178888256" CREATED="1370196341118" MODIFIED="1370196341118">
+ <attribute NAME="type" VALUE="category"/>
+ <attribute NAME="name" VALUE="update"/>
+@@ -375,6 +376,7 @@
+ <attribute NAME="action" VALUE="UpdateCheckAction"/>
+ </node>
+ </node>
++-->
+ <node TEXT="Web resources" FOLDED="true" ID="ID_911592986" CREATED="1370196341125" MODIFIED="1370196341125">
+ <attribute NAME="type" VALUE="category"/>
+ <attribute NAME="name" VALUE="Web resources"/>
+--- a/freeplane/resources/xml/mindmapmodemenu.mm
++++ b/freeplane/resources/xml/mindmapmodemenu.mm
+@@ -1592,6 +1592,7 @@
+ <attribute NAME="type" VALUE="submenu"/>
+ <attribute NAME="name" VALUE="help"/>
+ <attribute NAME="name_ref" VALUE="help"/>
++<!--
+ <node TEXT="update" FOLDED="true" ID="ID_722782407" CREATED="1370194798905" MODIFIED="1370194798905">
+ <attribute NAME="type" VALUE="category"/>
+ <attribute NAME="name" VALUE="update"/>
+@@ -1600,6 +1601,7 @@
+ <attribute NAME="action" VALUE="UpdateCheckAction"/>
+ </node>
+ </node>
++-->
+ <node TEXT="---" ID="ID_1292710565" CREATED="1370194798906" MODIFIED="1370194798906">
+ <attribute NAME="type" VALUE="separator"/>
+ </node>
diff --git a/debian/patches/90_fix_jsyntaxpane_location.patch b/debian/patches/90_fix_jsyntaxpane_location.patch
deleted file mode 100644
index 2a69c34..0000000
--- a/debian/patches/90_fix_jsyntaxpane_location.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-JSyntaxPaneProxy is only needed for J5, we hardcode the path to the JSyntaxPane jar to /usr/share/java/jsyntaxpane.jar
---- a/freeplane_plugin_script/src/org/freeplane/plugin/script/JSyntaxPaneProxy.java
-+++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/JSyntaxPaneProxy.java
-@@ -49,12 +49,15 @@
- URL nodehighlighterJar;
- try {
- final URL pluginUrl = context.getBundle().getEntry("/");
-+ /*
- if (Compat.isLowerJdk(Compat.VERSION_1_6_0)) {
- jsyntaxpaneJar = new URL(pluginUrl, "lib/jsyntaxpane/jsyntaxpane-jdk5.jar");
- }
- else {
- jsyntaxpaneJar = new URL(pluginUrl, "lib/jsyntaxpane/jsyntaxpane.jar");
- }
-+ */
-+ jsyntaxpaneJar = new URL("file:///usr/share/java/jsyntaxpane.jar");
- nodehighlighterJar = new URL(pluginUrl, "lib/jsyntaxpane/nodehighlighter.jar");
- }
- catch (MalformedURLException e1) {
diff --git a/debian/patches/92_fix_old_manifest.patch b/debian/patches/92_fix_old_manifest.patch
index 511a849..3725bba 100644
--- a/debian/patches/92_fix_old_manifest.patch
+++ b/debian/patches/92_fix_old_manifest.patch
@@ -2,14 +2,14 @@ remove classpath from _old_ MANIFEST, this is now done using the OSGi MANIFEST
--- a/freeplane/META-INF/OLD_MANIFEST.MF
+++ b/freeplane/META-INF/OLD_MANIFEST.MF
@@ -1,11 +1,2 @@
- Manifest-Version: 1.0
- Main-Class: org.freeplane.main.application.FreeplaneMain
--Class-Path: ../
-- freeplaneeditor.jar
-- freeplaneviewer.jar
-- freeplanemac.jar
-- commons-lang-2.0.jar
-- forms-1.0.5.jar
-- jortho.jar
-- gnu-regexp-1.1.4.jar
-- SimplyHTML.jar
+ Manifest-Version: 1.0
+ Main-Class: org.freeplane.main.application.FreeplaneMain
+-Class-Path: ../
+- freeplaneeditor.jar
+- freeplaneviewer.jar
+- freeplanemac.jar
+- commons-lang-2.6.jar
+- forms-1.0.5.jar
+- jortho.jar
+- gnu-regexp-1.1.4.jar
+- SimplyHTML.jar
diff --git a/debian/patches/93_jgoodies1.6.patch b/debian/patches/93_jgoodies1.6.patch
index d57f2b6..4338ae4 100644
--- a/debian/patches/93_jgoodies1.6.patch
+++ b/debian/patches/93_jgoodies1.6.patch
@@ -2,95 +2,95 @@ fix code for libjgoodies-forms-java 1.3->1.6 transition
--- a/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
+++ b/freeplane/src/org/freeplane/core/resources/components/OptionPanel.java
@@ -50,7 +50,7 @@
- import org.freeplane.features.mode.Controller;
-
- import com.jgoodies.forms.builder.DefaultFormBuilder;
--import com.jgoodies.forms.factories.ButtonBarFactory;
-+import com.jgoodies.forms.builder.ButtonBarBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-
- public class OptionPanel {
+ import org.freeplane.features.mode.Controller;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+ import com.jgoodies.forms.layout.FormLayout;
+
+ public class OptionPanel {
@@ -99,6 +99,35 @@
- new OptionPanelBuilder();
- }
-
-+ /**
-+ * Builds and returns a right aligned button bar with the given buttons.
-+ *
-+ * @param buttons an array of buttons to add
-+ * @return a right aligned button bar with the given buttons
-+ */
-+ public static JPanel buildRightAlignedBar(JButton[] buttons) {
-+// ButtonBarBuilder2 builder = new ButtonBarBuilder2();
-+ ButtonBarBuilder builder = new ButtonBarBuilder();
-+ builder.addGlue();
-+ builder.addButton(buttons);
-+ return builder.getPanel();
-+ }
-+
-+
-+ /**
-+ * Builds and returns a button bar with OK and Cancel.
-+ *
-+ * @param ok the OK button
-+ * @param cancel the Cancel button
-+ * @return a panel that contains the button(s)
-+ */
-+ public static JPanel buildOKCancelBar(
-+ JButton ok, JButton cancel) {
-+ return buildRightAlignedBar(new JButton[] {ok, cancel});
-+ }
-+
-+
-+
- public void buildPanel(final DefaultMutableTreeNode controlsTree) {
- final FormLayout leftLayout = new FormLayout("max(80dlu;p):grow", "");
- final DefaultFormBuilder leftBuilder = new DefaultFormBuilder(leftLayout);
+ new OptionPanelBuilder();
+ }
+
++ /**
++ * Builds and returns a right aligned button bar with the given buttons.
++ *
++ * @param buttons an array of buttons to add
++ * @return a right aligned button bar with the given buttons
++ */
++ public static JPanel buildRightAlignedBar(JButton[] buttons) {
++// ButtonBarBuilder2 builder = new ButtonBarBuilder2();
++ ButtonBarBuilder builder = new ButtonBarBuilder();
++ builder.addGlue();
++ builder.addButton(buttons);
++ return builder.getPanel();
++ }
++
++
++ /**
++ * Builds and returns a button bar with OK and Cancel.
++ *
++ * @param ok the OK button
++ * @param cancel the Cancel button
++ * @return a panel that contains the button(s)
++ */
++ public static JPanel buildOKCancelBar(
++ JButton ok, JButton cancel) {
++ return buildRightAlignedBar(new JButton[] {ok, cancel});
++ }
++
++
++
+ public void buildPanel(final DefaultMutableTreeNode controlsTree) {
+ final FormLayout leftLayout = new FormLayout("max(80dlu;p):grow", "");
+ final DefaultFormBuilder leftBuilder = new DefaultFormBuilder(leftLayout);
@@ -157,7 +186,7 @@
- }
- });
- topDialog.getRootPane().setDefaultButton(okButton);
-- topDialog.getContentPane().add(ButtonBarFactory.buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
-+ topDialog.getContentPane().add(buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
- }
-
- private boolean validate() {
+ }
+ });
+ topDialog.getRootPane().setDefaultButton(okButton);
+- topDialog.getContentPane().add(ButtonBarFactory.buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
++ topDialog.getContentPane().add(buildOKCancelBar(cancelButton, okButton), BorderLayout.SOUTH);
+ }
+
+ private boolean validate() {
--- a/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
+++ b/freeplane/src/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
-@@ -747,7 +747,7 @@
- final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
- final FormLayout rightLayout = new FormLayout(form, "");
- final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
-- rightBuilder.setBorder(Borders.DLU2_BORDER);
-+ rightBuilder.border(Borders.DLU2);
- rightBuilder.appendSeparator(TextUtils.getText("OptionPanel.separator.NodeStyle"));
- if (addStyleBox) {
- addAutomaticLayout(rightBuilder);
+@@ -761,7 +761,7 @@
+ final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
+ final FormLayout rightLayout = new FormLayout(form, "");
+ final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
+- rightBuilder.setBorder(Borders.DLU2_BORDER);
++ rightBuilder.border(Borders.DLU2);
+ rightBuilder.appendSeparator(TextUtils.getText("OptionPanel.separator.NodeStyle"));
+ if (addStyleBox) {
+ addAutomaticLayout(rightBuilder);
--- a/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
+++ b/freeplane/src/org/freeplane/view/swing/features/time/mindmapmode/TimeManagement.java
@@ -78,7 +78,7 @@
- import org.freeplane.features.text.mindmapmode.MTextController;
-
- import com.jgoodies.forms.builder.DefaultFormBuilder;
--import com.jgoodies.forms.factories.FormFactory;
-+import com.jgoodies.forms.layout.FormSpecs;
- import com.jgoodies.forms.layout.FormLayout;
-
- /**
+ import org.freeplane.features.text.mindmapmode.MTextController;
+
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.FormLayout;
+
+ /**
@@ -157,11 +157,11 @@
- calendarContainer.setAlignmentX(0.5f);
- add(calendarContainer);
-
-- DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormFactory.GROWING_BUTTON_COLSPEC.toString(), ""));
-+ DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormSpecs.GROWING_BUTTON_COLSPEC.toString(), ""));
- btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
- for(int i = 1; i< colCount; i++){
- btnBuilder.appendRelatedComponentsGapColumn();
-- btnBuilder.appendColumn(FormFactory.GROWING_BUTTON_COLSPEC);
-+ btnBuilder.appendColumn(FormSpecs.GROWING_BUTTON_COLSPEC);
- btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
- }
-
+ calendarContainer.setAlignmentX(0.5f);
+ add(calendarContainer);
+
+- DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormFactory.GROWING_BUTTON_COLSPEC.toString(), ""));
++ DefaultFormBuilder btnBuilder = new DefaultFormBuilder(new FormLayout(FormSpecs.GROWING_BUTTON_COLSPEC.toString(), ""));
+ btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
+ for(int i = 1; i< colCount; i++){
+ btnBuilder.appendRelatedComponentsGapColumn();
+- btnBuilder.appendColumn(FormFactory.GROWING_BUTTON_COLSPEC);
++ btnBuilder.appendColumn(FormSpecs.GROWING_BUTTON_COLSPEC);
+ btnBuilder.getLayout().addGroupedColumn(btnBuilder.getColumnCount());
+ }
+
--- a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
+++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnDetailsPanel.java
@@ -28,7 +28,7 @@
@@ -102,7 +102,7 @@ fix code for libjgoodies-forms-java 1.3->1.6 transition
import com.jgoodies.forms.layout.ColumnSpec;
import com.jgoodies.forms.layout.FormLayout;
import com.jgoodies.forms.layout.RowSpec;
-@@ -41,16 +41,16 @@
+@@ -41,18 +41,18 @@
public AddOnDetailsPanel(final AddOnProperties addOn, final String warning) {
this.warning = warning;
setLayout(new FormLayout(new ColumnSpec[] {
@@ -118,6 +118,10 @@ fix code for libjgoodies-forms-java 1.3->1.6 transition
- FormFactory.DEFAULT_ROWSPEC,
- FormFactory.RELATED_GAP_ROWSPEC,
- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
+ FormSpecs.RELATED_GAP_ROWSPEC,
+ FormSpecs.DEFAULT_ROWSPEC,
+ FormSpecs.RELATED_GAP_ROWSPEC,
@@ -125,8 +129,8 @@ fix code for libjgoodies-forms-java 1.3->1.6 transition
+ FormSpecs.RELATED_GAP_ROWSPEC,
+ FormSpecs.DEFAULT_ROWSPEC,
RowSpec.decode("top:default:grow"),}));
-
- JLabel imageLabel = createImageLabel(addOn);
+ if (warning != null) {
+ JLabel warningLabel = createWarningLabel(addOn);
--- a/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
+++ b/freeplane_plugin_script/src/org/freeplane/plugin/script/addons/AddOnInstallerPanel.java
@@ -43,7 +43,7 @@
@@ -167,22 +171,286 @@ fix code for libjgoodies-forms-java 1.3->1.6 transition
//
// Search
//
---- a/freeplane/src/org/freeplane/core/resources/components/KeyProperty.java
-+++ b/freeplane/src/org/freeplane/core/resources/components/KeyProperty.java
-@@ -32,6 +32,7 @@
-
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.RowSpec;
-+import com.jgoodies.forms.layout.Sizes;
-
- /**
- * @author Dimitry Polivaev
-@@ -77,7 +78,7 @@
- String tooltip = TextUtils.getOptionalText(getDescription());
- label.setToolTipText(tooltip);
- if (KeyProperty.rowSpec == null) {
-- KeyProperty.rowSpec = new RowSpec("fill:20dlu");
-+ KeyProperty.rowSpec = new RowSpec(RowSpec.FILL, Sizes.dluX(20), 0.0);
- }
- if (3 < builder.getColumn()) {
- builder.appendRelatedComponentsGapRow();
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/FileExistsDialogPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/FileExistsDialogPanel.java
+@@ -10,7 +10,7 @@
+
+ import org.freeplane.core.util.TextUtils;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -26,13 +26,13 @@
+ }
+
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("default:grow"),},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default:grow"),
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+
+ JLabel lblNewLabel = new JLabel(TextUtils.format(message, targetFile.getName(), targetFile.getParent()));
+ lblNewLabel.setVerticalAlignment(SwingConstants.TOP);
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/ImportProjectDialogPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/ImportProjectDialogPanel.java
+@@ -41,7 +41,7 @@
+ import org.freeplane.plugin.workspace.model.project.ProjectLoader;
+ import org.freeplane.plugin.workspace.nodes.ProjectRootNode;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -66,33 +66,33 @@
+ public ImportProjectDialogPanel() {
+ setPreferredSize(new Dimension(400, 180));
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("max(100dlu;min):grow"),
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,},
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:max(50dlu;pref)"),
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default"),
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+
+ JPanel panel = new JPanel();
+ panel.setBorder(new MatteBorder(0, 0, 1, 0, (Color) new Color(0, 0, 0)));
+ panel.setBackground(Color.WHITE);
+ add(panel, "1, 1, 8, 2, fill, fill");
+ panel.setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("default:grow"),},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default:grow"),}));
+
+ JLabel lblNewLabel = new JLabel(TextUtils.getText(ImportProjectDialogPanel.class.getSimpleName().toLowerCase(Locale.ENGLISH)+".help"));
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewDirectoryDialogPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewDirectoryDialogPanel.java
+@@ -11,7 +11,7 @@
+ import javax.swing.JTextField;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.ColumnSpec;
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.RowSpec;
+
+ /**
+@@ -30,18 +30,18 @@
+ public NewDirectoryDialogPanel(String parentPath) {
+ setMinimumSize(new Dimension(240,120));
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("36px"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("86px:grow"),
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,},
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,},
+ new RowSpec[] {
+- FormFactory.LINE_GAP_ROWSPEC,
++ FormSpecs.LINE_GAP_ROWSPEC,
+ RowSpec.decode("20px"),
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+
+ JLabel lblIn = new JLabel("In:");
+ add(lblIn, "3, 2, right, center");
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewProjectDialogPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NewProjectDialogPanel.java
+@@ -29,7 +29,7 @@
+ import org.freeplane.plugin.workspace.WorkspaceController;
+ import org.freeplane.plugin.workspace.model.project.AWorkspaceProject;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -46,22 +46,22 @@
+ public NewProjectDialogPanel() {
+ setPreferredSize(new Dimension(400, 160));
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("max(100dlu;min):grow"),
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,},
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:max(30dlu;pref)"),
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default"),
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default"),}));
+
+ JPanel panel = new JPanel();
+@@ -69,10 +69,10 @@
+ panel.setBackground(Color.WHITE);
+ add(panel, "1, 1, 8, 2, fill, fill");
+ panel.setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("default:grow"),},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
+ RowSpec.decode("fill:default:grow"),}));
+
+ JLabel lblNewLabel = new JLabel(TextUtils.getText(NewProjectDialogPanel.class.getSimpleName().toLowerCase(Locale.ENGLISH)+".help"));
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NodeRenameDialogPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/NodeRenameDialogPanel.java
+@@ -10,7 +10,7 @@
+ import javax.swing.JPanel;
+ import javax.swing.JTextField;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -35,18 +35,18 @@
+ public NodeRenameDialogPanel(String oldName, boolean isMutableNode) {
+ setMinimumSize(new Dimension(240,120));
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
+ ColumnSpec.decode("36px"),
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("86px:grow"),
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,},
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+
+ JLabel lblName = new JLabel("name:");
+ add(lblName, "3, 2, right, default");
+--- a/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/WorkspaceNewFolderPanel.java
++++ b/freeplane_plugin_workspace/src/org/freeplane/plugin/workspace/components/dialog/WorkspaceNewFolderPanel.java
+@@ -25,7 +25,7 @@
+ import org.freeplane.plugin.workspace.WorkspaceController;
+ import org.freeplane.plugin.workspace.model.AWorkspaceTreeNode;
+
+-import com.jgoodies.forms.factories.FormFactory;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.ColumnSpec;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.layout.RowSpec;
+@@ -60,27 +60,27 @@
+ setMinimumSize(new Dimension(320, 160));
+ setPreferredSize(new Dimension(320, 160));
+ setLayout(new FormLayout(new ColumnSpec[] {
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.LABEL_COMPONENT_GAP_COLSPEC,
+ ColumnSpec.decode("default:grow"),
+- FormFactory.RELATED_GAP_COLSPEC,
+- FormFactory.DEFAULT_COLSPEC,
+- FormFactory.RELATED_GAP_COLSPEC,},
++ FormSpecs.RELATED_GAP_COLSPEC,
++ FormSpecs.DEFAULT_COLSPEC,
++ FormSpecs.RELATED_GAP_COLSPEC,},
+ new RowSpec[] {
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.RELATED_GAP_ROWSPEC,
+- FormFactory.DEFAULT_ROWSPEC,}));
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.RELATED_GAP_ROWSPEC,
++ FormSpecs.DEFAULT_ROWSPEC,}));
+
+ JLabel lblPath = new JLabel(TextUtils.getText("workspace.action.node.new.folder.dialog.parent.label"));
+ lblPath.setHorizontalAlignment(SwingConstants.RIGHT);
diff --git a/debian/patches/95_run_jflex.patch b/debian/patches/95_run_jflex.patch
new file mode 100644
index 0000000..b2ddb5a
--- /dev/null
+++ b/debian/patches/95_run_jflex.patch
@@ -0,0 +1,29 @@
+add a target that runs jflex on latex.flex to generate LaTeXLexer.java
++ a clean step for LaTeXLexer.java
+--- a/freeplane_plugin_script/ant/build.xml
++++ b/freeplane_plugin_script/ant/build.xml
+@@ -18,7 +18,15 @@
+ <property name="classpath" value="${framework.jar}:${freeplane.jars}:${external.jars}:${jsyntaxpane.jar}" />
+ <property name="apidocdir" value="dist/doc/api" />
+
+- <target name="build" depends="build-ui-xml">
++ <target name="build-latex-lexer">
++ <exec executable="jflex">
++ <arg value="-d"/>
++ <arg value="src-jsyntaxpane/jsyntaxpane/lexers/"/>
++ <arg value="src-jsyntaxpane/jsyntaxpane/lexers/latex.flex"/>
++ </exec>
++ </target>
++
++ <target name="build" depends="build-ui-xml,build-latex-lexer">
+ <mkdir dir="build" />
+ <javac srcdir="src" destdir="build" classpath="${classpath}" debug="${debug}" source="${java_source_version}" target="${java_target_version}" encoding="utf8">
+ <exclude name="**/*Test.*" />
+@@ -111,6 +119,7 @@
+ </delete>
+ <delete file="lib/jsyntaxpane/nodehighlighter.jar" quiet="true"/>
+ <delete file="${src.pluginclass}/preferences.xml" quiet="true"/>
++ <delete file="src-jsyntaxpane/jsyntaxpane/lexers/LaTeXLexer.java"/>
+ </target>
+
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index bd22608..7c1cbb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,6 @@
60_no_license_latex.patch
70_skip_bugreport.patch
80_no_update_check.patch
-90_fix_jsyntaxpane_location.patch
92_fix_old_manifest.patch
93_jgoodies1.6.patch
+95_run_jflex.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git
More information about the pkg-java-commits
mailing list