Merge pull request #182 from NASAWorldWind/deprecations

Deprecations
NASAWorldWind · Oct 25, 2019 · ebdc81b · ebdc81b
2 parents 41cf5c6 + dfd8e0b
commit ebdc81b
Show file tree

Hide file tree

Showing 155 changed files with 6,852 additions and 8,903 deletions.
diff --git a/nbproject/configs/AirspaceBuilder.properties b/nbproject/configs/AirspaceBuilder.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.AirspaceBuilder
diff --git a/nbproject/configs/Balloons.properties b/nbproject/configs/Balloons.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.Balloons
diff --git a/nbproject/configs/ContextMenusOnShapes.properties b/nbproject/configs/ContextMenusOnShapes.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ContextMenusOnShapes
diff --git a/nbproject/configs/ContourLines.properties b/nbproject/configs/ContourLines.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ContourLines
diff --git a/nbproject/configs/DataInstallerApp.properties b/nbproject/configs/DataInstallerApp.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.applications.dataimporter.DataInstallerApp
diff --git a/nbproject/configs/DebuggingGLErrors.properties b/nbproject/configs/DebuggingGLErrors.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.DebuggingGLErrors
diff --git a/nbproject/configs/ExtrudedShapes.properties b/nbproject/configs/ExtrudedShapes.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ExtrudedShapes
diff --git a/nbproject/configs/FlatWorld.properties b/nbproject/configs/FlatWorld.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.FlatWorld
diff --git a/nbproject/configs/GeoRSS.properties b/nbproject/configs/GeoRSS.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.GeoRSS
diff --git a/nbproject/configs/GetBestElevations.properties b/nbproject/configs/GetBestElevations.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.GetBestElevations
diff --git a/nbproject/configs/GliderTestApp.properties b/nbproject/configs/GliderTestApp.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.applications.glider.GliderTestApp
diff --git a/nbproject/configs/Graticule.properties b/nbproject/configs/Graticule.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.Graticule
diff --git a/nbproject/configs/ImportImagery.properties b/nbproject/configs/ImportImagery.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.dataimport.ImportImagery
diff --git a/nbproject/configs/KeepObjectsInView.properties b/nbproject/configs/KeepObjectsInView.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.KeepingObjectsInView
diff --git a/nbproject/configs/LayerManagerApp.properties b/nbproject/configs/LayerManagerApp.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.layermanager.LayerManagerApp
diff --git a/nbproject/configs/LineBackground.properties b/nbproject/configs/LineBackground.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.LineBackground
diff --git a/nbproject/configs/LinesOfSight.properties b/nbproject/configs/LinesOfSight.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.lineofsight.LinesOfSight
diff --git a/nbproject/configs/LoggingControl.properties b/nbproject/configs/LoggingControl.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.LoggingControl
diff --git a/nbproject/configs/MeasureToolUsage.properties b/nbproject/configs/MeasureToolUsage.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.MeasureToolUsage
diff --git a/nbproject/configs/MultiResPath.properties b/nbproject/configs/MultiResPath.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.MultiResPath
diff --git a/nbproject/configs/Paths.properties b/nbproject/configs/Paths.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.Paths
diff --git a/nbproject/configs/SARApp.properties b/nbproject/configs/SARApp.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.applications.sar.SARApp
diff --git a/nbproject/configs/SurfaceImages.properties b/nbproject/configs/SurfaceImages.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.SurfaceImages
diff --git a/nbproject/configs/TerrainIntersections.properties b/nbproject/configs/TerrainIntersections.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.TerrainIntersections
diff --git a/nbproject/configs/TerrainProfiler.properties b/nbproject/configs/TerrainProfiler.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.TerrainProfiler
diff --git a/nbproject/configs/ViewControls.properties b/nbproject/configs/ViewControls.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ViewControls
diff --git a/nbproject/configs/ViewLookAround.properties b/nbproject/configs/ViewLookAround.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.ViewLookAround
diff --git a/nbproject/configs/WorldWindDiagnostics.properties b/nbproject/configs/WorldWindDiagnostics.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.examples.WorldWindDiagnostics
diff --git a/nbproject/configs/WorldWindow.properties b/nbproject/configs/WorldWindow.properties
@@ -0,0 +1 @@
+main.class=gov.nasa.worldwindx.applications.worldwindow.WorldWindow
diff --git a/build.macros.xml → release-build.macros.xml b/build.macros.xml → release-build.macros.xml
diff --git a/build.properties → release-build.properties b/build.properties → release-build.properties
@@ -16,7 +16,7 @@ worldwind.classes.dir=${worldwind.build.dir}/classes
 worldwind.doc.dir=${worldwind.build.dir}/doc
 worldwind.jar.dir=${worldwind.build.dir}/jar
 worldwind.test.results.dir=${worldwind.build.dir}/test-results
-worldwind.jdk=1.8
+worldwind.jdk=11
 #worldwind.exclude.jackson=true
 
 # MIL-STD-2525 package build properties
@@ -26,9 +26,3 @@ milstd2525.png.dir=${milstd2525.out.dir}/png
 milstd2525.png.width=128
 milstd2525.png.height=128
 
-# WebStart package build properties
-webstart.src.dir=${basedir}/webstart
-webstart.out.dir=${worldwind.build.dir}/webstart
-webstart.unsigned.dir=${webstart.out.dir}/jar-unsigned
-webstart.jar.dir=${webstart.out.dir}/jar
-webstart.jnlp.dir=${webstart.out.dir}/jnlp
diff --git a/release-build.xml b/release-build.xml
@@ -13,8 +13,8 @@
 
     <!-- Import the ANT build properties and project ANT macros. -->
 
-    <property file="build.properties"/>
-    <import file="build.macros.xml"/>
+    <property file="release-build.properties"/>
+    <import file="release-build.macros.xml"/>
 
     <!-- Main build targets. Provides generic targets that compile the Java sources, bundle JAR libraries, assemble API
          documentation, test the Java sources, and clean up the build output. -->

diff --git a/src/gov/nasa/worldwind/Version.java b/src/gov/nasa/worldwind/Version.java
@@ -3,48 +3,41 @@
  * National Aeronautics and Space Administration.
  * All Rights Reserved.
  */
-
 package gov.nasa.worldwind;
 
 /**
  * @author tag
  * @version $Id: Version.java 1171 2013-02-11 21:45:02Z dcollins $
  */
-public class Version
-{
+public class Version {
+
     private static final String MAJOR_VALUE = "2";
-    private static final String MINOR_VALUE = "1";
+    private static final String MINOR_VALUE = "2";
     private static final String DOT_VALUE = "0";
     private static final String versionNumber = "v" + MAJOR_VALUE + "." + MINOR_VALUE + "." + DOT_VALUE;
     private static final String versionName = "NASA WorldWind Java";
 
-    public static String getVersion()
-    {
+    public static String getVersion() {
         return versionName + " " + versionNumber;
     }
 
-    public static String getVersionName()
-    {
+    public static String getVersionName() {
         return versionName;
     }
 
-    public static String getVersionNumber()
-    {
+    public static String getVersionNumber() {
         return versionNumber;
     }
 
-    public static String getVersionMajorNumber()
-    {
+    public static String getVersionMajorNumber() {
         return MAJOR_VALUE;
     }
 
-    public static String getVersionMinorNumber()
-    {
+    public static String getVersionMinorNumber() {
         return MINOR_VALUE;
     }
 
-    public static String getVersionDotNumber()
-    {
+    public static String getVersionDotNumber() {
         return DOT_VALUE;
     }
 }
diff --git a/src/gov/nasa/worldwind/WorldWind.java b/src/gov/nasa/worldwind/WorldWind.java
@@ -211,8 +211,8 @@ public static Object createComponent(String className) throws WWRuntimeException
 
         try
         {
-            Class c = Class.forName(className.trim());
-            return c.newInstance();
+            Class<?> c = Class.forName(className.trim());
+            return c.getConstructor().newInstance();
         }
         catch (Exception e)
         {