This is an automated email from the ASF dual-hosted git repository. bwalker pushed a commit to branch cleanup_long_double_object_creation in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 234e3d8ce11ccdb9fe5b26420f62d86f51017d35 Author: BradWalker <[email protected]> AuthorDate: Sat Apr 30 22:54:40 2022 -0600 Cleanup the use of Double primitive wrapper. As of Java 9, the VM can do a better job of handling the coversion from a Double primitive to a Double Object or vice versa. This is an extension of the work done in #2498. No tests have been touched as those expressly need to manage the conversion. A couple of places I also cleaned up the Float. --- .../j2ee/sun/validation/constraints/NumberConstraint.java | 2 +- .../j2ee/sun/validation/constraints/RangeConstraint.java | 10 +++++----- .../javaee/project/api/ant/ui/wizard/ImportBuildfile.java | 2 +- .../src/org/netbeans/api/debugger/Properties.java | 2 +- .../modules/bugtracking/issuetable/NodeTableModel.java | 10 +++++----- .../netbeans/modules/db/dataview/util/DBReadWriteHelper.java | 2 +- ide/db/libsrc/org/netbeans/lib/ddl/util/PListReader.java | 2 +- .../netbeans/modules/db/explorer/dlg/CreateTableDialog.java | 2 +- .../modules/editor/completion/PatchedHtmlRenderer.java | 10 +++++----- .../src/org/netbeans/modules/schema2beans/Common.java | 2 +- .../src/org/netbeans/modules/schema2beans/GraphManager.java | 2 +- .../src/org/netbeans/modules/classfile/CPDoubleInfo.java | 2 +- .../netbeans/modules/form/layoutdesign/LayoutDesigner.java | 12 ++++++------ .../test/unit/src/org/netbeans/test/stub/api/Stub.java | 4 ++-- .../java/j2seproject/ui/wizards/ImportFoldersPanel.java | 2 +- .../SwingInterop/src/swinginterop/SampleTableModel.java | 6 +++--- .../src/org/netbeans/upgrade/systemoptions/SerParser.java | 6 +++--- .../netbeans/swing/tabcontrol/plaf/BaseTabLayoutModel.java | 2 +- platform/openide.awt/src/org/openide/awt/HtmlRenderer.java | 8 ++++---- .../explorer/propertysheet/IndexedPropertyEditor.java | 4 ++-- .../src/org/openide/explorer/view/NodeTableModel.java | 10 +++++----- .../src/org/openide/filesystems/XMLMapAttr.java | 2 +- .../modules/profiler/heapwalk/ClassesListController.java | 2 +- .../modules/websvc/saas/codegen/model/ParameterInfo.java | 2 +- 24 files changed, 54 insertions(+), 54 deletions(-) diff --git a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/NumberConstraint.java b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/NumberConstraint.java index 04909c25c4..32721afa83 100644 --- a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/NumberConstraint.java +++ b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/NumberConstraint.java @@ -63,7 +63,7 @@ public class NumberConstraint extends ConstraintUtils ArrayList failed_constrained_list = new ArrayList(); if(null != value){ try { - new Double(value); + Double.valueOf(value); return failed_constrained_list; } catch(NumberFormatException e) { String failureMessage = formatFailureMessage(toString(), value, diff --git a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/RangeConstraint.java b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/RangeConstraint.java index b5a8cbbfa7..5f818fce79 100644 --- a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/RangeConstraint.java +++ b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/constraints/RangeConstraint.java @@ -66,8 +66,8 @@ public class RangeConstraint extends ConstraintUtils /** Creates a new instance of <code>RangeConstraint</code>. */ public RangeConstraint(String startValue, String endValue) { try { - this.startValue = new Double(startValue); - this.endValue = new Double(endValue); + this.startValue = Double.valueOf(startValue); + this.endValue = Double.valueOf(endValue); } catch(NumberFormatException e) { String format = BundleReader.getValue("Error_failed_to_create"); //NOI18N @@ -102,7 +102,7 @@ public class RangeConstraint extends ConstraintUtils if((value != null) && (value.length() != 0)){ try { - Double val = new Double(value); + Double val = Double.valueOf(value); if((val.compareTo(startValue) < 0) || (val.compareTo(endValue) > 0)){ addFailure(failed_constrained_list, name, value); @@ -122,7 +122,7 @@ public class RangeConstraint extends ConstraintUtils */ public void setRangeStart(String value){ try { - startValue = new Double(value); + startValue = Double.valueOf(value); } catch(NumberFormatException e) { String format = BundleReader.getValue("Error_failed_to_set"); //NOI18N @@ -142,7 +142,7 @@ public class RangeConstraint extends ConstraintUtils */ public void setRangeEnd(String value){ try { - endValue = new Double(value); + endValue = Double.valueOf(value); } catch(NumberFormatException e) { String format = BundleReader.getValue("Error_failed_to_set"); //NOI18N diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ImportBuildfile.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ImportBuildfile.java index 7ccdefc84e..4df890d53e 100644 --- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ImportBuildfile.java +++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ImportBuildfile.java @@ -52,7 +52,7 @@ final class ImportBuildfile extends javax.swing.JPanel implements DocumentListen } private void resize() { - int width = (new Double(jLabelDesc.getFontMetrics(jLabelDesc.getFont()).getStringBounds(jLabelDesc.getText(), getGraphics()).getWidth() / 2.7)).intValue() + 40; + int width = Double.valueOf(jLabelDesc.getFontMetrics(jLabelDesc.getFont()).getStringBounds(jLabelDesc.getText(), getGraphics()).getWidth() / 2.7).intValue() + 40; int height = (jLabelDesc.getFont().getSize() * 5) + 100; if (width < 400) width = 400; diff --git a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java index 3f8c7c5822..3f5fc8f7bd 100644 --- a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java +++ b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java @@ -1480,7 +1480,7 @@ public abstract class Properties { } else if (classNames[6].equals(className)) { return properties.getFloat(propertyName, 0f); } else if (classNames[7].equals(className)) { - return new Double(properties.getDouble(propertyName, 0d)); + return properties.getDouble(propertyName, 0D); } throw new IllegalArgumentException("Class = '"+className+"'."); } diff --git a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/NodeTableModel.java b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/NodeTableModel.java index eaed0b845e..7503a07548 100644 --- a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/NodeTableModel.java +++ b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/NodeTableModel.java @@ -175,10 +175,10 @@ class NodeTableModel extends AbstractTableModel { Object o = props[i].getValue(ATTR_ORDER_NUMBER); - if (o instanceof Integer) { - sort.put(new Double(((Integer) o).doubleValue()), Integer.valueOf(ia)); + if ((o != null) && o instanceof Integer) { + sort.put(Double.valueOf(((Integer) o).doubleValue()), ia); } else { - sort.put(new Double(ia + 0.1), Integer.valueOf(ia)); + sort.put((ia + 0.1), ia); } } else { allPropertyColumns[ia].setVisibleIndex(-1); @@ -231,9 +231,9 @@ class NodeTableModel extends AbstractTableModel { int vi = allPropertyColumns[i].getVisibleIndex(); if (vi == -1) { - sort.put(new Double(i - 0.1), Integer.valueOf(i)); + sort.put((i - 0.1), i); } else { - sort.put(new Double(vi), Integer.valueOf(i)); + sort.put((double)vi, i); } } diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java index 761ee3f61e..f41644c664 100644 --- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java +++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DBReadWriteHelper.java @@ -441,7 +441,7 @@ public class DBReadWriteHelper { } case Types.DOUBLE: - return valueObj instanceof Double ? valueObj : new Double(valueObj.toString()); + return valueObj instanceof Double ? valueObj : Double.valueOf(valueObj.toString()); case Types.FLOAT: case Types.REAL: diff --git a/ide/db/libsrc/org/netbeans/lib/ddl/util/PListReader.java b/ide/db/libsrc/org/netbeans/lib/ddl/util/PListReader.java index 85108d3b29..4abfcc9cd4 100644 --- a/ide/db/libsrc/org/netbeans/lib/ddl/util/PListReader.java +++ b/ide/db/libsrc/org/netbeans/lib/ddl/util/PListReader.java @@ -185,7 +185,7 @@ public class PListReader { tokenizer.pushBack(); double d = Math.rint(tokenizer.nval); if(d == tokenizer.nval) return Integer.valueOf((int)d); - return new Double(tokenizer.nval); + return Double.valueOf(tokenizer.nval); } } diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/CreateTableDialog.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/CreateTableDialog.java index 93f869ca10..25512ca18c 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/CreateTableDialog.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/CreateTableDialog.java @@ -471,7 +471,7 @@ public class CreateTableDialog { Map cmap = ColumnItem.getColumnProperty(i); col.setIdentifier(cmap.get("name")); //NOI18N columnName = NbBundle.getMessage (CreateTableDialog.class, "CreateTable_" + i); //NOI18N - columnWidth = (new Double(getFontMetrics(getFont()).getStringBounds(columnName, getGraphics()).getWidth())).intValue() + 20; + columnWidth = Double.valueOf(getFontMetrics(getFont()).getStringBounds(columnName, getGraphics()).getWidth()).intValue() + 20; if (cmap.containsKey("width")) { // NOI18N if (((Integer)cmap.get("width")).intValue() < columnWidth) col.setPreferredWidth(columnWidth); diff --git a/ide/editor.completion/src/org/netbeans/modules/editor/completion/PatchedHtmlRenderer.java b/ide/editor.completion/src/org/netbeans/modules/editor/completion/PatchedHtmlRenderer.java index dc4680f948..c1d6cffbc1 100644 --- a/ide/editor.completion/src/org/netbeans/modules/editor/completion/PatchedHtmlRenderer.java +++ b/ide/editor.completion/src/org/netbeans/modules/editor/completion/PatchedHtmlRenderer.java @@ -176,7 +176,7 @@ public final class PatchedHtmlRenderer { } double chWidth = wid / chars.length; - int estCharsToPaint = new Double(w / chWidth).intValue(); + int estCharsToPaint = Double.valueOf(w / chWidth).intValue(); if( estCharsToPaint > chars.length ) estCharsToPaint = chars.length; //let's correct the estimate now @@ -841,7 +841,7 @@ public final class PatchedHtmlRenderer { //Word wrap mode goToNextRow = true; - int lastChar = new Double(nextTag - estCharsOver).intValue(); + int lastChar = Double.valueOf(nextTag - estCharsOver).intValue(); //Unlike Swing's word wrap, which does not wrap on tag boundaries correctly, if we're out of space, //we're out of space @@ -892,7 +892,7 @@ public final class PatchedHtmlRenderer { } } else if (brutalWrap) { //wrap without checking word boundaries - length = (new Double((w - widthPainted) / chWidth)).intValue(); + length = Double.valueOf((w - widthPainted) / chWidth).intValue(); if ((pos + length) > nextTag) { length = (nextTag - pos); @@ -911,7 +911,7 @@ public final class PatchedHtmlRenderer { if (strikethrough || underline) { LineMetrics lm = fm.getLineMetrics(chars, pos, length - 1, g); - int lineWidth = new Double(x + r.getWidth()).intValue(); + int lineWidth = Double.valueOf(x + r.getWidth()).intValue(); if (paint) { if (strikethrough) { @@ -930,7 +930,7 @@ public final class PatchedHtmlRenderer { //PENDING - worth supporting with g.setStroke()? A one pixel line is most likely //good enough - //int stThick = new Float (lm.getUnderlineThickness()).intValue(); + //int stThick = Float.valueOf(lm.getUnderlineThickness()).intValue(); g.drawLine(x, y + stPos, lineWidth, y + stPos); } } diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java index 408a0535d1..fff2741d48 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java @@ -387,7 +387,7 @@ public class Common { case Common.TYPE_FLOAT: return 0.0F; case Common.TYPE_DOUBLE: - return new Double(0.0); + return 0.0D; default: throw new IllegalArgumentException(Common.getMessage( "UnknownType_msg", Integer.valueOf(type))); diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java index 88f3666ee5..8b28cbf8cd 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java @@ -900,7 +900,7 @@ public class GraphManager extends Object { case Common.TYPE_FLOAT: return 0.0F; case Common.TYPE_DOUBLE: - return new Double(0.0); + return 0.0D; default: throw new IllegalArgumentException(Common.getMessage("UnknownType", type)); } diff --git a/java/classfile/src/org/netbeans/modules/classfile/CPDoubleInfo.java b/java/classfile/src/org/netbeans/modules/classfile/CPDoubleInfo.java index 47540cf7f4..0130a5e113 100644 --- a/java/classfile/src/org/netbeans/modules/classfile/CPDoubleInfo.java +++ b/java/classfile/src/org/netbeans/modules/classfile/CPDoubleInfo.java @@ -32,7 +32,7 @@ public final class CPDoubleInfo extends CPEntry { CPDoubleInfo(ConstantPool pool, double v) { super(pool); - value = new Double(v); + value = v; } /* The VM doesn't allow the next constant pool slot to be used diff --git a/java/form/src/org/netbeans/modules/form/layoutdesign/LayoutDesigner.java b/java/form/src/org/netbeans/modules/form/layoutdesign/LayoutDesigner.java index c869fcc565..e4d5038455 100644 --- a/java/form/src/org/netbeans/modules/form/layoutdesign/LayoutDesigner.java +++ b/java/form/src/org/netbeans/modules/form/layoutdesign/LayoutDesigner.java @@ -437,8 +437,8 @@ public final class LayoutDesigner implements LayoutConstants { LayoutTestUtils.writeLayoutComponentArray(testCode, "comps", "lc"); //NOI18N LayoutTestUtils.writeRectangleArray(testCode, "bounds", bounds); //NOI18N LayoutTestUtils.writeString(testCode, "defaultContId", defaultContId); //NOI18N - testCode.add("Point hotspot = new Point(" + new Double(hotspot.getX()).intValue() + "," + //NOI18N - new Double(hotspot.getY()).intValue() + ");"); //NOI18N + testCode.add("Point hotspot = new Point(" + Double.valueOf(hotspot.getX()).intValue() + "," + //NOI18N + Double.valueOf(hotspot.getY()).intValue() + ");"); //NOI18N testCode.add("ld.startAdding(comps, bounds, hotspot, defaultContId);"); //NOI18N testCode.add("}"); //NOI18N } @@ -465,8 +465,8 @@ public final class LayoutDesigner implements LayoutConstants { testCode.add("{"); //NOI18N LayoutTestUtils.writeStringArray(testCode, "compIds", compIds); //NOI18N LayoutTestUtils.writeRectangleArray(testCode, "bounds", bounds); //NOI18N - testCode.add("Point hotspot = new Point(" + new Double(hotspot.getX()).intValue() + "," + //NOI18N - new Double(hotspot.getY()).intValue() + ");"); //NOI18N + testCode.add("Point hotspot = new Point(" + Double.valueOf(hotspot.getX()).intValue() + "," + //NOI18N + Double.valueOf(hotspot.getY()).intValue() + ");"); //NOI18N testCode.add("ld.startMoving(compIds, bounds, hotspot);"); //NOI18N testCode.add("}"); //NOI18N } @@ -519,8 +519,8 @@ public final class LayoutDesigner implements LayoutConstants { testCode.add("{"); //NOI18N LayoutTestUtils.writeStringArray(testCode, "compIds", compIds); //NOI18N LayoutTestUtils.writeRectangleArray(testCode, "bounds", bounds); //NOI18N - testCode.add("Point hotspot = new Point(" + new Double(hotspot.getX()).intValue() + "," + //NOI18N - new Double(hotspot.getY()).intValue() + ");"); //NOI18N + testCode.add("Point hotspot = new Point(" + Double.valueOf(hotspot.getX()).intValue() + "," + //NOI18N + Double.valueOf(hotspot.getY()).intValue() + ");"); //NOI18N LayoutTestUtils.writeIntArray(testCode, "resizeEdges", resizeEdges); //NOI18N testCode.add("boolean inLayout = " + inLayout + ";"); // NOI18N testCode.add("ld.startResizing(compIds, bounds, hotspot, resizeEdges, inLayout);"); //NOI18N diff --git a/java/j2ee.persistence/test/unit/src/org/netbeans/test/stub/api/Stub.java b/java/j2ee.persistence/test/unit/src/org/netbeans/test/stub/api/Stub.java index c0815f5d65..89ec17ca25 100644 --- a/java/j2ee.persistence/test/unit/src/org/netbeans/test/stub/api/Stub.java +++ b/java/j2ee.persistence/test/unit/src/org/netbeans/test/stub/api/Stub.java @@ -157,9 +157,9 @@ public final class Stub { } else if (retClass == Long.TYPE) { return 0L; } else if (retClass == Float.TYPE) { - return Float.valueOf(0); + return 0F; } else if (retClass == Double.TYPE) { - return 0.0; + return 0D; } else if (retClass == Character.TYPE) { return '\0'; } else if (retClass == Boolean.TYPE) { diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/ImportFoldersPanel.java b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/ImportFoldersPanel.java index cb46343c60..2e677a2b6c 100644 --- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/ImportFoldersPanel.java +++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/wizards/ImportFoldersPanel.java @@ -86,7 +86,7 @@ class ImportFoldersPanel extends javax.swing.JPanel { } private void resize() { - int width = (new Double(message.getFontMetrics(message.getFont()).getStringBounds(message.getText(), getGraphics()).getWidth() / 2.7)).intValue() + 40; + int width = Double.valueOf(message.getFontMetrics(message.getFont()).getStringBounds(message.getText(), getGraphics()).getWidth() / 2.7).intValue() + 40; int height = (message.getFont().getSize() * 5) + 100; if (width < 400) width = 400; diff --git a/javafx/javafx2.samples/SwingInterop/src/swinginterop/SampleTableModel.java b/javafx/javafx2.samples/SwingInterop/src/swinginterop/SampleTableModel.java index 98296f5630..380adac2be 100644 --- a/javafx/javafx2.samples/SwingInterop/src/swinginterop/SampleTableModel.java +++ b/javafx/javafx2.samples/SwingInterop/src/swinginterop/SampleTableModel.java @@ -37,9 +37,9 @@ public class SampleTableModel extends AbstractTableModel { private final String[] names = {"2007", "2008", "2009"}; private Object[][] data = { - {new Double(567), new Double(956), new Double(1154)}, - {new Double(1292), new Double(1665), new Double(1927)}, - {new Double(1292), new Double(2559), new Double(2774)} + {Double.valueOf(567D), Double.valueOf(956D), Double.valueOf(1154D)}, + {Double.valueOf(1292D), Double.valueOf(1665D), Double.valueOf(1927D)}, + {Double.valueOf(1292D), Double.valueOf(2559D), Double.valueOf(2774D)} }; public double getTickUnit() { diff --git a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java index 0d0cecf63d..790468a23f 100644 --- a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java +++ b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SerParser.java @@ -491,7 +491,7 @@ public final class SerParser implements ObjectStreamConstants { makeRef(aw); int size = readInt(); if (size < 0) throw new NotImplementedException(); - aw.values = new ArrayList<Object>(size); + aw.values = new ArrayList<>(size); for (int i = 0; i < size; i++) { if (aw.classdesc.name.equals("[B")) { // NOI18N aw.values.add(readByte()); @@ -504,7 +504,7 @@ public final class SerParser implements ObjectStreamConstants { } else if (aw.classdesc.name.equals("[F")) { // NOI18N aw.values.add(Float.intBitsToFloat(readInt())); } else if (aw.classdesc.name.equals("[D")) { // NOI18N - aw.values.add(new Double(Double.longBitsToDouble(readLong()))); + aw.values.add(Double.longBitsToDouble(readLong())); } else if (aw.classdesc.name.equals("[C")) { // NOI18N aw.values.add(new Character((char)readShort())); } else if (aw.classdesc.name.equals("[Z")) { // NOI18N @@ -568,7 +568,7 @@ public final class SerParser implements ObjectStreamConstants { } else if (fd.type.equals("F")) { // NOI18N values.add(new NameValue(fd, Float.intBitsToFloat(readInt()))); } else if (fd.type.equals("D")) { // NOI18N - values.add(new NameValue(fd, new Double(Double.longBitsToDouble(readLong())))); + values.add(new NameValue(fd, Double.longBitsToDouble(readLong()))); } else if (fd.type.equals("C")) { // NOI18N values.add(new NameValue(fd, new Character((char)readShort()))); } else if (fd.type.equals("Z")) { // NOI18N diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BaseTabLayoutModel.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BaseTabLayoutModel.java index 44c5a256d4..ddf627447a 100644 --- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BaseTabLayoutModel.java +++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BaseTabLayoutModel.java @@ -123,7 +123,7 @@ class BaseTabLayoutModel implements TabLayoutModel { //No need to calculate for every string String testStr = "Zgj"; //NOI18N Font f = getFont(); - textHeight = new Double(f.getStringBounds(testStr, + textHeight = Double.valueOf(f.getStringBounds(testStr, BasicScrollingTabDisplayerUI.getOffscreenGraphics(component).getFontRenderContext()).getWidth()).intValue() + 2; } return textHeight; diff --git a/platform/openide.awt/src/org/openide/awt/HtmlRenderer.java b/platform/openide.awt/src/org/openide/awt/HtmlRenderer.java index d7b668c6ab..81e483cc46 100644 --- a/platform/openide.awt/src/org/openide/awt/HtmlRenderer.java +++ b/platform/openide.awt/src/org/openide/awt/HtmlRenderer.java @@ -352,7 +352,7 @@ public final class HtmlRenderer { } double chWidth = wid / chars.length; - int estCharsToPaint = new Double(w / chWidth).intValue(); + int estCharsToPaint = Double.valueOf(w / chWidth).intValue(); if( estCharsToPaint > chars.length ) estCharsToPaint = chars.length; //let's correct the estimate now @@ -1057,7 +1057,7 @@ public final class HtmlRenderer { //Word wrap mode goToNextRow = true; - int lastChar = new Double(nextTag - estCharsOver).intValue(); + int lastChar = Double.valueOf(nextTag - estCharsOver).intValue(); //Unlike Swing's word wrap, which does not wrap on tag boundaries correctly, if we're out of space, //we're out of space @@ -1108,7 +1108,7 @@ public final class HtmlRenderer { } } else if (brutalWrap) { //wrap without checking word boundaries - length = (new Double((w - widthPainted) / chWidth)).intValue(); + length = Double.valueOf((w - widthPainted) / chWidth).intValue(); if ((pos + length) > nextTag) { length = (nextTag - pos); @@ -1127,7 +1127,7 @@ public final class HtmlRenderer { if (strikethrough || underline || link) { LineMetrics lm = fm.getLineMetrics(chars, pos, length - 1, g); - int lineWidth = new Double(x + r.getWidth()).intValue(); + int lineWidth = Double.valueOf(x + r.getWidth()).intValue(); if (paint) { if (strikethrough) { diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java index 160c17355f..6e2ae38043 100644 --- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java +++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java @@ -360,11 +360,11 @@ class IndexedPropertyEditor extends Object implements ExPropertyEditor { } if (getConvertedType().equals(Double.class)) { - value = new Double(0d); + value = 0D; } if (getConvertedType().equals(Float.class)) { - value = 0f; + value = 0F; } if (getConvertedType().equals(Long.class)) { diff --git a/platform/openide.explorer/src/org/openide/explorer/view/NodeTableModel.java b/platform/openide.explorer/src/org/openide/explorer/view/NodeTableModel.java index ddbb06b47b..63e9799fc3 100644 --- a/platform/openide.explorer/src/org/openide/explorer/view/NodeTableModel.java +++ b/platform/openide.explorer/src/org/openide/explorer/view/NodeTableModel.java @@ -162,10 +162,10 @@ public class NodeTableModel extends AbstractTableModel { Object o = props[i].getValue(ATTR_ORDER_NUMBER); - if (o instanceof Integer) { - sort.put(new Double(((Integer) o).doubleValue()), Integer.valueOf(ia)); + if ((o != null) && o instanceof Integer) { + sort.put(Double.valueOf(((Integer) o).doubleValue()), Integer.valueOf(ia)); } else { - sort.put(new Double(ia + 0.1), new Integer(ia)); + sort.put(Double.valueOf(ia + 0.1), new Integer(ia)); } } else { allPropertyColumns[ia].setVisibleIndex(-1); @@ -218,9 +218,9 @@ public class NodeTableModel extends AbstractTableModel { int vi = allPropertyColumns[i].getVisibleIndex(); if (vi == -1) { - sort.put(new Double(i - 0.1), Integer.valueOf(i)); + sort.put(Double.valueOf(i - 0.1), Integer.valueOf(i)); } else { - sort.put(new Double(vi), Integer.valueOf(i)); + sort.put(Double.valueOf(vi), Integer.valueOf(i)); } } diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java index 713470671f..86c93f052e 100644 --- a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java +++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java @@ -928,7 +928,7 @@ final class XMLMapAttr implements Map { case 4: return Float.valueOf(value); case 5: - return new Double(value); + return Double.valueOf(value); case 6: return Boolean.valueOf(value); case 7: diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java index beb2573681..0b14e8453c 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ClassesListController.java @@ -164,7 +164,7 @@ public class ClassesListController extends AbstractController { else data[i][4] = (retainedSizeByClass > 0 ? "+" : "") + numberFormat.format(retainedSizeByClass); // NOI18N } } else { - data[i][1] = new Double((double) instancesCount / + data[i][1] = Double.valueOf((double) instancesCount / (double) totalLiveInstances * 100); data[i][2] = numberFormat.format(instancesCount) + " (" // NOI18N + percentFormat.format((double) instancesCount / diff --git a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java index bbc6d122cb..996f80e39f 100644 --- a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java +++ b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java @@ -185,7 +185,7 @@ public class ParameterInfo { } else if (type == Float.class || type == Float.TYPE) { return 0F; } else if (type == Double.class || type == Double.TYPE) { - return new Double(0); + return 0D; } else if (type == Boolean.class || type == Boolean.TYPE) { return Boolean.FALSE; } else if (type == Character.class || type == Character.TYPE) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
