v2.3.0

OpenImageAnalysisGroup · Jul 14, 2020 · 8997e5e · 8997e5e
1 parent 4cf11e1
commit 8997e5e
Show file tree

Hide file tree

Showing 275 changed files with 1,221 additions and 103,534 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,6 @@ hs_err_pid*
 
 IAP CONSOLE/bin/de/ipk/ag_ba/Console.class
 /.DS_Store
+
+make/zip/*.zip
+make/zip/IAP_*
diff --git a/Graffiti_Core/.classpath b/Graffiti_Core/.classpath
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="build/|javadoc/|.classpath|.project|create_javadoc.xml|jarfile.jardesc|MANIFEST.MF|graffiti_core.jar" kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="src" path="/Graffiti_lib"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/ini4j-0.5.2.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/jdom.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/soap.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-compress-1.8.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/paxtools-4.1.1-no-jena.jar"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="build/|javadoc/|.classpath|.project|create_javadoc.xml|jarfile.jardesc|MANIFEST.MF|graffiti_core.jar" kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="src" path="/Graffiti_lib"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/ini4j-0.5.2.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/jdom.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/soap.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-compress-1.8.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/paxtools-4.1.1-no-jena.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-digester.jar"/>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
diff --git a/Graffiti_Core/org/SystemAnalysis.java b/Graffiti_Core/org/SystemAnalysis.java
@@ -510,6 +510,7 @@ public static String getFileSeparator() {
 	public static boolean isRetina() {
 		if (isHeadless())
 			return false;
+		if (false) {
 		GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
 		final GraphicsDevice device = env.getDefaultScreenDevice();
 
@@ -526,6 +527,7 @@ public static boolean isRetina() {
 			}
 		} catch (Exception ignore) {
 		}
+		}
 		return false;
 	}
 

diff --git a/Graffiti_lib/.classpath b/Graffiti_lib/.classpath
@@ -1,58 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="commons-beanutils.jar"/>
-	<classpathentry kind="lib" path="commons-digester.jar"/>
-	<classpathentry kind="lib" path="jdom.jar"/>
-	<classpathentry kind="lib" path="java-cup-v11a-runtime.jar" sourcepath="/home/klukas/workspace/grav/src/develop/src"/>
-	<classpathentry kind="lib" path="jh.jar"/>
-	<classpathentry kind="lib" path="activation.jar"/>
-	<classpathentry kind="lib" path="axis.jar"/>
-	<classpathentry kind="lib" path="batik-awt-util.jar"/>
-	<classpathentry kind="lib" path="batik-bridge.jar"/>
-	<classpathentry kind="lib" path="batik-css.jar"/>
-	<classpathentry kind="lib" path="batik-dom.jar"/>
-	<classpathentry kind="lib" path="batik-ext.jar"/>
-	<classpathentry kind="lib" path="batik-gvt.jar"/>
-	<classpathentry kind="lib" path="batik-parser.jar"/>
-	<classpathentry kind="lib" path="batik-rasterizer.jar"/>
-	<classpathentry kind="lib" path="batik-script.jar"/>
-	<classpathentry kind="lib" path="batik-svg-dom.jar"/>
-	<classpathentry kind="lib" path="batik-svggen.jar"/>
-	<classpathentry kind="lib" path="batik-transcoder.jar"/>
-	<classpathentry kind="lib" path="batik-util.jar"/>
-	<classpathentry kind="lib" path="batik-xml.jar"/>
-	<classpathentry kind="lib" path="bsh-2.0b4.jar"/>
-	<classpathentry kind="lib" path="commons-cli-1.0.jar"/>
-	<classpathentry kind="lib" path="commons-discovery.jar"/>
-	<classpathentry kind="lib" path="itext-1.4.5.jar"/>
-	<classpathentry kind="lib" path="jaxen-full.jar"/>
-	<classpathentry kind="lib" path="jaxrpc.jar"/>
-	<classpathentry kind="lib" path="jcommon-0.9.5.jar"/>
-	<classpathentry kind="lib" path="jruby.jar"/>
-	<classpathentry kind="lib" path="optional.jar"/>
-	<classpathentry kind="lib" path="pdf-transcoder.jar"/>
-	<classpathentry kind="lib" path="rome-0.8.jar"/>
-	<classpathentry kind="lib" path="saaj.jar"/>
-	<classpathentry kind="lib" path="saxpath.jar"/>
-	<classpathentry kind="lib" path="secondstring-20030401.jar"/>
-	<classpathentry kind="lib" path="soap.jar"/>
-	<classpathentry kind="lib" path="vecmath1.2-1.14.jar"/>
-	<classpathentry kind="lib" path="wsdl4j.jar"/>
-	<classpathentry kind="lib" path="commons-logging-1.1.jar"/>
-	<classpathentry kind="lib" path="dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="log4j-1.2.13.jar"/>
-	<classpathentry kind="lib" path="commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="poi-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="poi-ooxml-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="poi-ooxml-schemas-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="poi-scratchpad-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="commons-math3-3.3.jar"/>
-	<classpathentry kind="lib" path="hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="junit-4.12.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="commons-beanutils.jar"/>
+	<classpathentry kind="lib" path="commons-digester.jar"/>
+	<classpathentry kind="lib" path="jdom.jar"/>
+	<classpathentry kind="lib" path="java-cup-v11a-runtime.jar" sourcepath="/home/klukas/workspace/grav/src/develop/src"/>
+	<classpathentry kind="lib" path="jh.jar"/>
+	<classpathentry kind="lib" path="activation.jar"/>
+	<classpathentry kind="lib" path="axis.jar"/>
+	<classpathentry kind="lib" path="batik-awt-util.jar"/>
+	<classpathentry kind="lib" path="batik-bridge.jar"/>
+	<classpathentry kind="lib" path="batik-css.jar"/>
+	<classpathentry kind="lib" path="batik-dom.jar"/>
+	<classpathentry kind="lib" path="batik-ext.jar"/>
+	<classpathentry kind="lib" path="batik-gvt.jar"/>
+	<classpathentry kind="lib" path="batik-parser.jar"/>
+	<classpathentry kind="lib" path="batik-rasterizer.jar"/>
+	<classpathentry kind="lib" path="batik-script.jar"/>
+	<classpathentry kind="lib" path="batik-svg-dom.jar"/>
+	<classpathentry kind="lib" path="batik-svggen.jar"/>
+	<classpathentry kind="lib" path="batik-transcoder.jar"/>
+	<classpathentry kind="lib" path="batik-util.jar"/>
+	<classpathentry kind="lib" path="batik-xml.jar"/>
+	<classpathentry kind="lib" path="bsh-2.0b4.jar"/>
+	<classpathentry kind="lib" path="commons-cli-1.0.jar"/>
+	<classpathentry kind="lib" path="commons-discovery.jar"/>
+	<classpathentry kind="lib" path="itext-1.4.5.jar"/>
+	<classpathentry kind="lib" path="jaxen-full.jar"/>
+	<classpathentry kind="lib" path="jaxrpc.jar"/>
+	<classpathentry kind="lib" path="jcommon-0.9.5.jar"/>
+	<classpathentry kind="lib" path="jruby.jar"/>
+	<classpathentry kind="lib" path="optional.jar"/>
+	<classpathentry kind="lib" path="pdf-transcoder.jar"/>
+	<classpathentry kind="lib" path="rome-0.8.jar"/>
+	<classpathentry kind="lib" path="saaj.jar"/>
+	<classpathentry kind="lib" path="saxpath.jar"/>
+	<classpathentry kind="lib" path="secondstring-20030401.jar"/>
+	<classpathentry kind="lib" path="soap.jar"/>
+	<classpathentry kind="lib" path="vecmath1.2-1.14.jar"/>
+	<classpathentry kind="lib" path="wsdl4j.jar"/>
+	<classpathentry kind="lib" path="commons-logging-1.1.jar"/>
+	<classpathentry kind="lib" path="dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="log4j-1.2.13.jar"/>
+	<classpathentry kind="lib" path="commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="poi-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="poi-ooxml-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="poi-ooxml-schemas-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="poi-scratchpad-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="commons-math3-3.3.jar"/>
+	<classpathentry kind="lib" path="hamcrest-core-1.3.jar"/>
+	<classpathentry kind="lib" path="junit-4.12.jar"/>
+	<classpathentry kind="lib" path="xalan-2.7.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/IAP CONSOLE/bin/de/ipk/ag_ba/CommandLineStatusProvider.class b/IAP CONSOLE/bin/de/ipk/ag_ba/CommandLineStatusProvider.class
diff --git a/IAP CONSOLE/bin/de/ipk/ag_ba/SplashScreenDontPrintProgress.class b/IAP CONSOLE/bin/de/ipk/ag_ba/SplashScreenDontPrintProgress.class
diff --git a/IAP/.classpath b/IAP/.classpath
@@ -1,62 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Core"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Editor"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_lib"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Plugins"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/IPK-Plugins"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/MultimodalDataHandling"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/IAP Transfer"/>
-	<classpathentry exported="true" kind="src" path="/IPK_lib"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="lib/plugin.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-net-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/ojdbc14.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/log4j-1.2.13.jar"/>
-	<classpathentry kind="lib" path="lib/jai_codec.jar"/>
-	<classpathentry kind="lib" path="lib/jai_core.jar"/>
-	<classpathentry kind="lib" path="lib/jna.jar"/>
-	<classpathentry kind="lib" path="lib/platform.jar"/>
-	<classpathentry kind="lib" path="lib/jsr166y.jar"/>
-	<classpathentry kind="lib" path="lib/bcprov-jdk16-146.jar"/>
-	<classpathentry kind="lib" path="lib/flanagan.java6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/mail.jar"/>
-	<classpathentry kind="lib" path="/IAP Transfer/lib/commons-vfs2-2.0.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-compress-1.8.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/poi-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/poi-ooxml-3.10-FINAL-20140208.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-math3-3.3.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/plyvis.jar"/>
-	<classpathentry kind="lib" path="lib/javaxt-core.jar"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/Graffiti_lib/activation.jar"/>
-	<classpathentry kind="lib" path="lib/ij.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/jdom.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/bsh-2.0b4.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/vecmath1.2-1.14.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/paxtools-4.1.1-no-jena.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/javafx.base.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/javafx.swing.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/javafx.graphics.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/javafx.controls.jar"/>
-	<classpathentry kind="lib" path="/Graffiti_lib/javafx.fxml.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry including="**/*.java" kind="src" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Core"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Editor"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_lib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/Graffiti_Plugins"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/IPK-Plugins"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/MultimodalDataHandling"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/IAP Transfer"/>
+	<classpathentry exported="true" kind="src" path="/IPK_lib"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/plugin.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-net-2.0.jar"/>
+	<classpathentry kind="lib" path="lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/log4j-1.2.13.jar"/>
+	<classpathentry kind="lib" path="lib/jai_codec.jar"/>
+	<classpathentry kind="lib" path="lib/jai_core.jar"/>
+	<classpathentry kind="lib" path="lib/jna.jar"/>
+	<classpathentry kind="lib" path="lib/platform.jar"/>
+	<classpathentry kind="lib" path="lib/jsr166y.jar"/>
+	<classpathentry kind="lib" path="lib/bcprov-jdk16-146.jar"/>
+	<classpathentry kind="lib" path="lib/flanagan.java6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/mail.jar"/>
+	<classpathentry kind="lib" path="/IAP Transfer/lib/commons-vfs2-2.0.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-compress-1.8.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/poi-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/poi-ooxml-3.10-FINAL-20140208.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-math3-3.3.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/commons-collections-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/plyvis.jar"/>
+	<classpathentry kind="lib" path="lib/javaxt-core.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/Graffiti_lib/activation.jar"/>
+	<classpathentry kind="lib" path="lib/ij.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/jdom.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/bsh-2.0b4.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/vecmath1.2-1.14.jar"/>
+	<classpathentry kind="lib" path="/Graffiti_lib/paxtools-4.1.1-no-jena.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/IAP/ant-scripts/createIAPquick.xml b/IAP/ant-scripts/createIAPquick.xml
@@ -3,9 +3,9 @@
     <!--ANT 1.7 is required -->
     <target name="build">
     	<!-- create vanted-jarfile -->
-        <jar destfile="release/iap_2_0.jar" filesetmanifest="mergewithoutmain">
+        <jar destfile="release/iap_2_3.jar" filesetmanifest="mergewithoutmain">
             <fileset dir="../IAP Transfer/bin"/>
-            <fileset dir="../IAP/bin"/>
+            <fileset dir="../IAP/target/classes"/>
             <fileset dir="../Graffiti_Core/build/classes"/>
             <fileset dir="../IAP CONSOLE/bin"/>
             <zipfileset excludes="META-INF/*.SF" src="../IAP Transfer/lib/commons-codec-1.6.jar"/>
@@ -53,7 +53,7 @@
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-dom.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-ext.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-gvt.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-parser.jar"/>
+            <!--<zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-parser.jar"/> -->
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-rasterizer.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-script.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/batik-svg-dom.jar"/>
@@ -79,7 +79,7 @@
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/jcommon-0.9.5.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/jruby.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/mail.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/parser.jar"/>
+            <!-- <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/parser.jar"/> -->
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/optional.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/pdf-transcoder.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/rome-0.8.jar"/>
@@ -121,7 +121,7 @@
             <zipfileset excludes="META-INF/*.SF" src="../Graffiti_lib/commons-compress-1.8.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="../IAP/lib/jna.jar"/>
                 <zipfileset excludes="META-INF/*.SF" src="../IAP/lib/platform.jar"/>
-        	<zipfileset excludes="META-INF/*.SF" src="../IAP/lib/ij-1.49m.jar"/> 
+        	<zipfileset excludes="META-INF/*.SF" src="../IAP/lib/ij.jar"/> 
 
             <zipfileset excludes="META-INF/*.SF" src="../IAP Transfer/lib/jsoup-1.7.2.jar"/>
         	<zipfileset excludes="META-INF/*.SF" src="../IAP/lib/plyvis.jar"/>

diff --git a/IAP/src/de/ipk/ag_ba/commands/about/ActionAbout.java b/IAP/src/de/ipk/ag_ba/commands/about/ActionAbout.java
@@ -142,8 +142,8 @@ public ArrayList<NavigationButton> getResultNewActionSet() {
 		rr.add(new NavigationButton(new ActionAboutLicense("List of external library licenses"), guiSetting));
 
 		rr.add(new NavigationButton(new ActionFeedback("Send feedback mail"), guiSetting));
-		rr.add(new NavigationButton(new ActionJavaFX("JavaFX Test"), guiSetting));
-		rr.add(new NavigationButton(new ActionPLYVIS("PLY Visualization Tool"), guiSetting));
+		// rr.add(new NavigationButton(new ActionJavaFX("JavaFX Test"), guiSetting));
+		// rr.add(new NavigationButton(new ActionPLYVIS("PLY Visualization Tool"), guiSetting));
 
 		return rr;
 	}