Merge pull request #1 from nbbrooks/update-worldwind

Update to WorldWind 2.2.0 and Java 11 to re-enable satellite imagery

nbproject-template/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=30dafd33
+build.xml.data.CRC32=6856b85d
 build.xml.script.CRC32=282518f4
-build.xml.stylesheet.CRC32=8064a381@1.68.1.46
+build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=30dafd33
-nbproject/build-impl.xml.script.CRC32=d6cc8aee
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.data.CRC32=6856b85d
+nbproject/build-impl.xml.script.CRC32=b97d974c
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.102.0.48

nbproject-template/project.properties

@@ -19,8 +19,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/sami-crw.jar
@@ -43,6 +47,7 @@ file.reference.PercjPlanningCommon.jar=lib/perc/PercjPlanningCommon.jar
 file.reference.percjutils.jar=lib/perc/percjutils.jar
 file.reference.robotutils.jar=lib/crwlib/robotutils.jar
 file.reference.sami-crw-src=src
+file.reference.swing-layout-1.0.4.jar=../sami-core/lib/swing-layout-1.0.4.jar
 file.reference.worldwind.jar=lib/worldwind/worldwind.jar
 file.reference.worldwindx.jar=lib/worldwind/worldwindx.jar
 includes=**
@@ -68,22 +73,28 @@ javac.classpath=\
     ${file.reference.jung-api-2.0.jar}:\
     ${file.reference.jung-graph-impl-2.0.jar}:\
     ${file.reference.jung-visualization-2.0.jar}:\
-    ${libs.swing-layout.classpath}
+    ${file.reference.swing-layout-1.0.4.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.6
 javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -92,6 +103,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jlink.launcher=false
+jlink.launcher.name=sami-crw
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -106,7 +119,7 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 no.dependencies=true
-platform.active=default_platform
+platform.active=JDK_11
 project.sami-core=../sami-core
 project.sami-dreaam=../sami-dreaam
 reference.sami-core.jar=${project.sami-core}/dist/sami-core.jar
@@ -119,8 +132,12 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=-Djava.util.logging.config.file="logging.properties" -Djava.library.path=lib/input
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=${file.reference.sami-crw-src}

nbproject-template/project.xml

@@ -4,6 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>sami-crw</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

src/crw/ui/queue/text/QueueFrame.java

@@ -1,6 +1,5 @@
 package crw.ui.queue.text;
 
-import static com.sun.glass.ui.Cursor.setVisible;
 import crw.ui.queue.QueueContent;
 import crw.ui.queue.QueueDatabase;
 import java.awt.BorderLayout;