altoslib: Stop using deprecated Java functionality

new Double(x) -> Double.valueOf(x)
c.newInstance() -> c.getDeclaredConstructor().newInstance()

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index 58f503c565d16db931668c33e8df2b2e4c7c838a..85e7dbf8dc5a513bf09dcc64f2e84d5d5057c05d 100644 (file)
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.java
@@ -27,7 +27,7 @@ public class AltosFrequency {
        public String   description;
 
        public int hashCode() {
-               return new Double(frequency).hashCode();
+               return Double.valueOf(frequency).hashCode();
        }
 
        public boolean equals(Object o) {

diff --git a/altoslib/AltosJson.java b/altoslib/AltosJson.java
index b981c36513939a7de503de3ce111473bf2b13a4e..8f6897bb8efabad56da8a3007b4a081969d75ea6 100644 (file)
--- a/altoslib/AltosJson.java
+++ b/altoslib/AltosJson.java
@@ -623,7 +623,7 @@ public class AltosJson extends JsonUtil {
                        }
                        break;
                case type_long:
-                       result.append(new Long(l_number).toString());
+                       result.append(Long.valueOf(l_number).toString());
                        break;
                case type_string:
                        quote(result, string);
@@ -1036,6 +1036,7 @@ public class AltosJson extends JsonUtil {
         * all inner classes are only members of their immediate outer
         * class
         */
+       @SuppressWarnings("unchecked")
        private Object make(Class c, Class enclosing_class, Object enclosing_object) {
                Object  ret;
                if (c == Boolean.TYPE) {
@@ -1105,7 +1106,7 @@ public class AltosJson extends JsonUtil {
                                        Constructor<?> ctor = ((Class<?>)c).getDeclaredConstructor((Class<?>) enclosing_class);
                                        object = ctor.newInstance(enclosing_object);
                                } else {
-                                       object = c.newInstance();
+                                       object = c.getDeclaredConstructor().newInstance();
                                }
                                for (; c != Object.class; c = c.getSuperclass()) {
                                        for (Field field : c.getDeclaredFields()) {

diff --git a/altoslib/AltosLatLon.java b/altoslib/AltosLatLon.java
index cd7015e3cb363f93cad745a19251803a4afbc0f6..277858ff3b5155c2e1619b6f8f56795136ad20aa 100644 (file)
--- a/altoslib/AltosLatLon.java
+++ b/altoslib/AltosLatLon.java
@@ -23,7 +23,7 @@ public class AltosLatLon {
        public double   lon;
 
        public int hashCode() {
-               return new Double(lat).hashCode() ^ new Double(lon).hashCode();
+               return Double.valueOf(lat).hashCode() ^ Double.valueOf(lon).hashCode();
        }
 
        public boolean equals(Object o) {

diff --git a/altoslib/AltosPointDouble.java b/altoslib/AltosPointDouble.java
index 59e2f76c9fff051508a7f8d246dc3d35b616cca1..f775738a38185a4643892c3923d30e4f56039d1c 100644 (file)
--- a/altoslib/AltosPointDouble.java
+++ b/altoslib/AltosPointDouble.java
@@ -22,7 +22,7 @@ public class AltosPointDouble {
        public double   x, y;
 
        public int hashCode() {
-               return new Double(x).hashCode() ^ new Double(y).hashCode();
+               return Double.valueOf(x).hashCode() ^ Double.valueOf(y).hashCode();
        }
 
        public boolean equals(Object o) {

diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java
index 9295b8e82410d249e0e7d1b42758fabbceaabdee..6e492149b426744ccd03f1fd268533f4b4f0de2f 100644 (file)
--- a/altoslib/AltosUnits.java
+++ b/altoslib/AltosUnits.java
@@ -42,7 +42,7 @@ public abstract class AltosUnits {
        public abstract double inverse(double v, boolean imperial_units);
 
        public String string_value(double v, boolean imperial_units) {
-               return new Double(value(v, imperial_units)).toString();
+               return Double.valueOf(value(v, imperial_units)).toString();
        }
 
        public abstract String show_units(boolean imperial_units);