From a68c478dd5467ae62e8981f2cc2a5309d66f4e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Sat, 25 May 2024 17:15:48 +0200 Subject: [PATCH] Replace new Double() with Double.valueOf() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tobi Schäfer --- src/main/java/helma/objectmodel/TransientProperty.java | 2 +- src/main/java/helma/objectmodel/db/Property.java | 4 ++-- src/main/java/helma/objectmodel/dom/XmlDatabaseReader.java | 2 +- src/main/java/helma/objectmodel/dom/XmlReader.java | 2 +- src/main/java/helma/scripting/rhino/RhinoCore.java | 2 +- .../java/helma/scripting/rhino/extensions/DatabaseObject.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/helma/objectmodel/TransientProperty.java b/src/main/java/helma/objectmodel/TransientProperty.java index 79f7b615..0ba21330 100644 --- a/src/main/java/helma/objectmodel/TransientProperty.java +++ b/src/main/java/helma/objectmodel/TransientProperty.java @@ -82,7 +82,7 @@ public final class TransientProperty implements IProperty, Serializable { return Long.valueOf(lvalue); case FLOAT: - return new Double(dvalue); + return Double.valueOf(dvalue); case DATE: return new Date(lvalue); diff --git a/src/main/java/helma/objectmodel/db/Property.java b/src/main/java/helma/objectmodel/db/Property.java index 199e2b0f..9bcf326b 100644 --- a/src/main/java/helma/objectmodel/db/Property.java +++ b/src/main/java/helma/objectmodel/db/Property.java @@ -103,7 +103,7 @@ public final class Property implements IProperty, Serializable, Cloneable, Compa break; case FLOAT: - value = new Double(in.readDouble()); + value = Double.valueOf(in.readDouble()); break; @@ -242,7 +242,7 @@ public final class Property implements IProperty, Serializable, Cloneable, Compa */ public void setFloatValue(double d) { type = FLOAT; - value = new Double(d); + value = Double.valueOf(d); dirty = true; } diff --git a/src/main/java/helma/objectmodel/dom/XmlDatabaseReader.java b/src/main/java/helma/objectmodel/dom/XmlDatabaseReader.java index d4b98dca..35ee1724 100644 --- a/src/main/java/helma/objectmodel/dom/XmlDatabaseReader.java +++ b/src/main/java/helma/objectmodel/dom/XmlDatabaseReader.java @@ -225,7 +225,7 @@ public final class XmlDatabaseReader extends DefaultHandler implements XmlConsta prop.setStringValue(charValue); } } else if ("float".equals(elementType)) { - prop.setFloatValue((new Double(charValue)).doubleValue()); + prop.setFloatValue((Double.valueOf(charValue)).doubleValue()); } else if ("integer".equals(elementType)) { prop.setIntegerValue((Long.valueOf(charValue)).longValue()); } else { diff --git a/src/main/java/helma/objectmodel/dom/XmlReader.java b/src/main/java/helma/objectmodel/dom/XmlReader.java index b711d9b0..caa41799 100644 --- a/src/main/java/helma/objectmodel/dom/XmlReader.java +++ b/src/main/java/helma/objectmodel/dom/XmlReader.java @@ -299,7 +299,7 @@ public final class XmlReader extends DefaultHandler implements XmlConstants { currentNode.setString(elementName, charValue); } } else if ("float".equals(elementType)) { - currentNode.setFloat(elementName, (new Double(charValue)).doubleValue()); + currentNode.setFloat(elementName, (Double.valueOf(charValue)).doubleValue()); } else if ("integer".equals(elementType)) { currentNode.setInteger(elementName, (Long.valueOf(charValue)).longValue()); } else { diff --git a/src/main/java/helma/scripting/rhino/RhinoCore.java b/src/main/java/helma/scripting/rhino/RhinoCore.java index 0e47ca48..fe2285cc 100644 --- a/src/main/java/helma/scripting/rhino/RhinoCore.java +++ b/src/main/java/helma/scripting/rhino/RhinoCore.java @@ -618,7 +618,7 @@ public final class RhinoCore implements ScopeProvider { } else if (arg instanceof Number) { Number n = (Number) arg; if (arg instanceof Float || arg instanceof Long) { - return new Double(n.doubleValue()); + return Double.valueOf(n.doubleValue()); } else if (!(arg instanceof Double)) { return new Integer(n.intValue()); } diff --git a/src/main/java/helma/scripting/rhino/extensions/DatabaseObject.java b/src/main/java/helma/scripting/rhino/extensions/DatabaseObject.java index 7f64745f..05025191 100644 --- a/src/main/java/helma/scripting/rhino/extensions/DatabaseObject.java +++ b/src/main/java/helma/scripting/rhino/extensions/DatabaseObject.java @@ -520,7 +520,7 @@ public class DatabaseObject { case Types.REAL: case Types.FLOAT: case Types.DOUBLE: - return new Double(resultSet.getDouble(index)); + return Double.valueOf(resultSet.getDouble(index)); case Types.DECIMAL: case Types.NUMERIC: @@ -530,7 +530,7 @@ public class DatabaseObject { } if (num.scale() > 0) { - return new Double(num.doubleValue()); + return Double.valueOf(num.doubleValue()); } else { return Long.valueOf(num.longValue()); }