LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File appframework-1.03-openjdk.diff of Package appframework (Project Java:packages)

diff -Nur AppFramework-1.03/nbproject/project.properties AppFramework-1.03.new/nbproject/project.properties
--- AppFramework-1.03/nbproject/project.properties	2007-09-20 17:29:34.000000000 +0400
+++ AppFramework-1.03.new/nbproject/project.properties	2008-07-15 21:18:28.000000000 +0400
@@ -16,9 +16,15 @@
 dist.dir=dist
 dist.jar=${dist.dir}/AppFramework.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.swing-worker.jar=lib/swing-worker.jar
+# As of Java 6, SwingWorker is included in the JRE. 
+# file.reference.swing-worker.jar=lib/swing-worker.jar
+# The SwingWorker class isn't accessible in OpenJDK until rt.jur is added to classpath.
+file.reference.swing-worker.jar=/usr/lib/jvm/java/jre/lib/rt.jar
 osx.jnlp.classpath=/Applications/Utilities/Java/Java\ Web\ Start.app/Contents/MacOS/javaws.jar
-jnlp.classpath=${java.home}/lib/javaws.jar
+# In OpenJDK (java-1.6.0-openjdk-1.6.0.0-0.10.b09.fc9) the classes of the javaws.jar are placed into rt.jar.
+# jnlp.classpath=${java.home}/lib/javaws.jar
+# The classes of the javax.jnlp package aren't accessible in OpenJDK until rt.jar is added to classpath.
+jnlp.classpath=/usr/lib/jvm/java/jre/lib/rt.jar
 jar.compress=false
 javac.classpath=\
     ${jnlp.classpath}:\
diff -Nur AppFramework-1.03/src/org/jdesktop/application/Task.java AppFramework-1.03.new/src/org/jdesktop/application/Task.java
--- AppFramework-1.03/src/org/jdesktop/application/Task.java	2007-10-31 16:04:48.000000000 +0300
+++ AppFramework-1.03.new/src/org/jdesktop/application/Task.java	2008-07-16 01:02:49.000000000 +0400
@@ -15,8 +15,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.jdesktop.swingworker.SwingWorker;
-import org.jdesktop.swingworker.SwingWorker.StateValue;
+import javax.swing.SwingWorker;
+import javax.swing.SwingWorker.StateValue;
 
 
 /**
diff -Nur AppFramework-1.03/src/org/jdesktop/application/TaskMonitor.java AppFramework-1.03.new/src/org/jdesktop/application/TaskMonitor.java
--- AppFramework-1.03/src/org/jdesktop/application/TaskMonitor.java	2007-09-20 17:29:36.000000000 +0400
+++ AppFramework-1.03.new/src/org/jdesktop/application/TaskMonitor.java	2008-07-16 01:01:10.000000000 +0400
@@ -9,7 +9,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import org.jdesktop.swingworker.SwingWorker.StateValue;
+import javax.swing.SwingWorker.StateValue;
 
 
 /**