Build fixes

NASAWorldWind · Oct 16, 2019 · 347001b · 347001b
1 parent cce1239
commit 347001b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
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/worldwindx/examples/MeasureToolPanel.java b/src/gov/nasa/worldwindx/examples/MeasureToolPanel.java
@@ -116,7 +116,7 @@ private void makePanel(Dimension size) {
         JPanel shapePanel = new JPanel(new GridLayout(1, 2, 5, 5));
         shapePanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
         shapePanel.add(new JLabel("Shape:"));
-        shapeCombo = new JComboBox(new String[]{"Line", "Path", "Polygon", "Circle", "Ellipse", "Square", "Rectangle"});
+        shapeCombo = new JComboBox<>(new String[]{"Line", "Path", "Polygon", "Circle", "Ellipse", "Square", "Rectangle"});
         shapeCombo.addActionListener((ActionEvent event) -> {
             String item = (String) ((JComboBox) event.getSource()).getSelectedItem();
             switch (item) {
@@ -151,7 +151,7 @@ private void makePanel(Dimension size) {
         JPanel pathTypePanel = new JPanel(new GridLayout(1, 2, 5, 5));
         pathTypePanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
         pathTypePanel.add(new JLabel("Path type:"));
-        pathTypeCombo = new JComboBox(new String[]{"Linear", "Rhumb", "Great circle"});
+        pathTypeCombo = new JComboBox<>(new String[]{"Linear", "Rhumb", "Great circle"});
         pathTypeCombo.setSelectedIndex(2);
         pathTypeCombo.addActionListener((ActionEvent event) -> {
             String item = (String) ((JComboBox) event.getSource()).getSelectedItem();
@@ -175,7 +175,7 @@ private void makePanel(Dimension size) {
         JPanel unitsPanel = new JPanel(new GridLayout(1, 2, 5, 5));
         unitsPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
         unitsPanel.add(new JLabel("Units:"));
-        unitsCombo = new JComboBox(new String[]{"M/M\u00b2", "KM/KM\u00b2", "KM/Hectare", "Feet/Feet\u00b2",
+        unitsCombo = new JComboBox<>(new String[]{"M/M\u00b2", "KM/KM\u00b2", "KM/Hectare", "Feet/Feet\u00b2",
             "Miles/Miles\u00b2", "Nm/Miles\u00b2", "Yards/Acres"});
         unitsCombo.setSelectedItem("KM/KM\u00b2");
         unitsCombo.addActionListener((ActionEvent event) -> {
@@ -219,7 +219,7 @@ private void makePanel(Dimension size) {
         JPanel anglesPanel = new JPanel(new GridLayout(1, 2, 5, 5));
         anglesPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
         anglesPanel.add(new JLabel("Angle Format:"));
-        anglesCombo = new JComboBox(new String[]{"DD", "DMS"});
+        anglesCombo = new JComboBox<>(new String[]{"DD", "DMS"});
         anglesCombo.setSelectedItem("DD");
         anglesCombo.addActionListener((ActionEvent event) -> {
             String item = (String) ((JComboBox) event.getSource()).getSelectedItem();