From 784ccd37d051e8b88ef1b150ccb4e89103675b3e Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 17 Jul 2019 11:38:43 -0700 Subject: [PATCH] altoslib: Stop using deprecated Java functionality new Double(x) -> Double.valueOf(x) c.newInstance() -> c.getDeclaredConstructor().newInstance() Signed-off-by: Keith Packard --- altoslib/AltosFrequency.java | 2 +- altoslib/AltosJson.java | 5 +++-- altoslib/AltosLatLon.java | 2 +- altoslib/AltosPointDouble.java | 2 +- altoslib/AltosUnits.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java index 58f503c5..85e7dbf8 100644 --- 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 b981c365..8f6897bb 100644 --- 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 cd7015e3..277858ff 100644 --- 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 59e2f76c..f775738a 100644 --- 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 9295b8e8..6e492149 100644 --- 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); -- 2.30.2