diff --git a/ide/api.debugger/nbproject/project.properties b/ide/api.debugger/nbproject/project.properties index b9b2d61c53f6..9aeb00e66e50 100644 --- a/ide/api.debugger/nbproject/project.properties +++ b/ide/api.debugger/nbproject/project.properties @@ -17,6 +17,6 @@ is.autoload=true javac.compilerargs=-Xlint:unchecked -javac.source=1.8 +javac.release=17 javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml 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 8a9fcf794d71..80e30c1a0224 100644 --- a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java +++ b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java @@ -1454,17 +1454,17 @@ public String[] getSupportedClassNames() { @Override public Object read(String className, Properties properties) { if (classNames[0].equals(className)) { - return Boolean.valueOf(properties.getBoolean(propertyName, false)); + return properties.getBoolean(propertyName, false); } else if (classNames[1].equals(className)) { return properties.getByte(propertyName, (byte)0); } else if (classNames[2].equals(className)) { - return new Character(properties.getChar(propertyName, (char) 0)); + return properties.getChar(propertyName, (char)0); } else if (classNames[3].equals(className)) { return properties.getShort(propertyName, (short)0); } else if (classNames[4].equals(className)) { - return Integer.valueOf(properties.getInt(propertyName, 0)); + return properties.getInt(propertyName, 0); } else if (classNames[5].equals(className)) { - return new Long(properties.getLong(propertyName, 0l)); + return properties.getLong(propertyName, 0l); } else if (classNames[6].equals(className)) { return properties.getFloat(propertyName, 0f); } else if (classNames[7].equals(className)) { @@ -1475,22 +1475,22 @@ public Object read(String className, Properties properties) { @Override public void write(Object object, Properties properties) { - if (object instanceof Boolean) { - properties.setBoolean(propertyName, ((Boolean) object).booleanValue()); - } else if (object instanceof Byte) { - properties.setByte(propertyName, ((Byte) object).byteValue()); - } else if (object instanceof Character) { - properties.setChar(propertyName, ((Character) object).charValue()); - } else if (object instanceof Short) { - properties.setShort(propertyName, ((Short) object).shortValue()); - } else if (object instanceof Integer) { - properties.setInt(propertyName, ((Integer) object).intValue()); - } else if (object instanceof Long) { - properties.setLong(propertyName, ((Long) object).longValue()); - } else if (object instanceof Float) { - properties.setFloat(propertyName, ((Float) object).floatValue()); - } else if (object instanceof Double) { - properties.setDouble(propertyName, ((Double) object).doubleValue()); + if (object instanceof Boolean b) { + properties.setBoolean(propertyName, b); + } else if (object instanceof Byte b) { + properties.setByte(propertyName, b); + } else if (object instanceof Character c) { + properties.setChar(propertyName, c); + } else if (object instanceof Short s) { + properties.setShort(propertyName, s); + } else if (object instanceof Integer i) { + properties.setInt(propertyName, i); + } else if (object instanceof Long l) { + properties.setLong(propertyName, l); + } else if (object instanceof Float f) { + properties.setFloat(propertyName, f); + } else if (object instanceof Double d) { + properties.setDouble(propertyName, d); } } diff --git a/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java b/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java index d8e36eccb687..07523f97f2a6 100644 --- a/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java +++ b/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java @@ -136,8 +136,7 @@ void setIssue(BugzillaIssue issue, } catch (ParseException pex) { Bugzilla.LOG.log(Level.INFO, null, pex); } - sections.add(addSection(layout, - new Long(0), + sections.add(addSection(layout, Long.valueOf(0), issue.getFieldValue(IssueField.DESCRIPTION), issue.getFieldValue(IssueField.REPORTER), issue.getFieldValue(IssueField.REPORTER_NAME), 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 f41644c664ba..c62494a554ec 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 @@ -453,10 +453,10 @@ public static Object validate(Object valueObj, DBColumn col) throws DBException case Types.INTEGER: { long ldata = Long.parseLong(valueObj.toString()); - if(ldata >= ((long) Integer.MIN_VALUE) && ldata <= ((long) Integer.MAX_VALUE)) { - return Integer.valueOf((int) ldata); - } else if ( ldata < maxUnsignedInt ) { - return new Long(ldata); + if (ldata >= ((long) Integer.MIN_VALUE) && ldata <= ((long) Integer.MAX_VALUE)) { + return (int) ldata; + } else if (ldata < maxUnsignedInt) { + return ldata; } else { throw new NumberFormatException("Illegal value for java.sql.Type.Integer"); } @@ -464,9 +464,9 @@ public static Object validate(Object valueObj, DBColumn col) throws DBException case Types.SMALLINT: { int idata = Integer.parseInt(valueObj.toString()); - if(idata >= ((int) Short.MIN_VALUE) && idata <= ((int) Short.MAX_VALUE)) { + if (idata >= ((int) Short.MIN_VALUE) && idata <= ((int) Short.MAX_VALUE)) { return (short) idata; - } else if ( idata < maxUnsignedShort ) { + } else if ( idata < maxUnsignedShort ) { return idata; } else { throw new NumberFormatException("Illegal value for java.sql.Type.SMALLINT"); diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java index fff2741d483d..bf0f7d2cf5e7 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java @@ -377,13 +377,13 @@ public static Object defaultScalarValue(int type) { case Common.TYPE_BYTE: return (byte)0; case Common.TYPE_CHAR: - return new Character('\0'); + return '\0'; case Common.TYPE_SHORT: return (short)0; case Common.TYPE_INT: - return Integer.valueOf(0); + return 0; case Common.TYPE_LONG: - return new Long(0); + return 0L; case Common.TYPE_FLOAT: return 0.0F; case Common.TYPE_DOUBLE: @@ -415,7 +415,7 @@ public static String getMessage(String key, Object p1) { } public static String getMessage(String key, int p1) { - return Common.getMessage(key, new Object[] {Integer.valueOf(p1)}); + return Common.getMessage(key, new Object[] {p1}); } public static String getMessage(String key, Object p1, Object p2) { diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java index 8b28cbf8cd68..24fecb8bf784 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java @@ -890,13 +890,13 @@ public Object defaultScalarValue(int type) { case Common.TYPE_BYTE: return (byte)0; case Common.TYPE_CHAR: - return new Character('\0'); + return '\0'; case Common.TYPE_SHORT: return (short)0; case Common.TYPE_INT: - return Integer.valueOf(0); + return 0; case Common.TYPE_LONG: - return new Long(0); + return 0L; case Common.TYPE_FLOAT: return 0.0F; case Common.TYPE_DOUBLE: diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java index 688e4b65f06f..6209c00b3e44 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/S2bConfig.java @@ -3425,7 +3425,7 @@ public Object fetchPropertyByName(String name) { if ("indent".equals(name)) return getIndent(); if ("indentAmount".equals(name)) - return new java.lang.Integer(getIndentAmount()); + return getIndentAmount(); if ("mddFile".equals(name)) return getMddFile(); if ("mddIn".equals(name)) @@ -3503,7 +3503,7 @@ public Object fetchPropertyByName(String name) { if ("generateHasChanged".equals(name)) return (isGenerateHasChanged() ? java.lang.Boolean.TRUE : java.lang.Boolean.FALSE); if ("newestSourceTime".equals(name)) - return new java.lang.Long(getNewestSourceTime()); + return getNewestSourceTime(); if ("writeBeanGraphFile".equals(name)) return getWriteBeanGraphFile(); if ("readBeanGraphFiles[]".equals(name)) diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java index 9dcecf51a501..f06e694556e0 100644 --- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java +++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java @@ -741,17 +741,17 @@ else if ("double".equals(type)) else if ("boolean".equals(type)) Boolean.valueOf(value).booleanValue(); else if ("java.lang.Double".equals(type)) - new java.lang.Double(value); + Double.valueOf(value); else if ("java.lang.Integer".equals(type)) - new java.lang.Integer(value); + Integer.valueOf(value); else if ("java.lang.Boolean".equals(type)) Boolean.valueOf(value); else if ("java.lang.Float".equals(type)) - new java.lang.Float(value); + Float.valueOf(value); else if ("java.lang.Short".equals(type)) - new java.lang.Short(value); + Short.valueOf(value); else if ("java.lang.Long".equals(type)) - new java.lang.Long(value); + Long.valueOf(value); else if ("java.math.BigDecimal".equals(type)) new java.math.BigDecimal(value); else if ("java.math.BigInteger".equals(type)) diff --git a/ide/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java b/ide/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java index 64f3f17d8a58..9d75740f8a05 100644 --- a/ide/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java +++ b/ide/subversion/src/org/netbeans/modules/subversion/FileStatusCache.java @@ -180,7 +180,8 @@ public void run() { } while (fileToRefresh != null); if (logEnabled) { LOG.log(Level.FINE, "refreshTask lasted {0} ms for {1} files, {2} files refreshed so far", new Object[] { //NOI18N - new Long(System.currentTimeMillis() - startTime), new Long(files), new Long(refreshedFilesCount)}); + Long.valueOf(System.currentTimeMillis() - startTime), Long.valueOf(files), Long.valueOf(refreshedFilesCount)} + ); } } }); diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java index 500c235f7952..ecc6dc765e74 100644 --- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java +++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java @@ -773,11 +773,11 @@ public void run() { if(file.length() > 1024 * 1024) { long size = file.length(); Object[] arr = { - getFilename(), - new Long (size), // bytes - new Long (size / 1024 + 1), // kilobytes - new Long (size / (1024 * 1024)), // megabytes - new Long (size / (1024 * 1024 * 1024)), // gigabytes + getFilename(), + Long.valueOf(size), // bytes + Long.valueOf(size / 1024 + 1), // kilobytes + Long.valueOf(size / (1024 * 1024)), // megabytes + Long.valueOf(size / (1024 * 1024 * 1024)) // gigabytes }; DialogDescriptor c = new DialogDescriptor( NbBundle.getMessage(AttachmentPanel.class, "MSG_ObjectIsTooBig", arr), diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewDataObject.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewDataObject.java index 1bb1e7892fb6..0598ee159d56 100644 --- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewDataObject.java +++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewDataObject.java @@ -434,9 +434,9 @@ public void setData(FileLock lock, String s, boolean modify) throws IOException if (setData(s)) { if (!modified) { saveData(lock); - firePropertyChange(PROPERTY_DATA_UPDATED, new Long(oldTimeStamp), new Long(timeStamp)); + firePropertyChange(PROPERTY_DATA_UPDATED, oldTimeStamp, timeStamp); } else { - firePropertyChange(PROPERTY_DATA_MODIFIED, new Long(oldTimeStamp), new Long(timeStamp)); + firePropertyChange(PROPERTY_DATA_MODIFIED, oldTimeStamp, timeStamp); } } } diff --git a/java/classfile/src/org/netbeans/modules/classfile/CPLongInfo.java b/java/classfile/src/org/netbeans/modules/classfile/CPLongInfo.java index a43574b9448e..802277d9d665 100644 --- a/java/classfile/src/org/netbeans/modules/classfile/CPLongInfo.java +++ b/java/classfile/src/org/netbeans/modules/classfile/CPLongInfo.java @@ -32,7 +32,7 @@ public final class CPLongInfo extends CPEntry { CPLongInfo(ConstantPool pool, long v) { super(pool); - value = new Long(v); + value = v; } /* The VM doesn't allow the next constant pool slot to be used @@ -43,6 +43,7 @@ boolean usesTwoSlots() { return true; } + @Override public final int getTag() { return ConstantPool.CONSTANT_Long; } diff --git a/java/performance/src/org/netbeans/modules/performance/utilities/CommonUtilities.java b/java/performance/src/org/netbeans/modules/performance/utilities/CommonUtilities.java index a809e078bf63..560a778c4d35 100644 --- a/java/performance/src/org/netbeans/modules/performance/utilities/CommonUtilities.java +++ b/java/performance/src/org/netbeans/modules/performance/utilities/CommonUtilities.java @@ -806,7 +806,7 @@ public static void xmlTestResults(String path, String suite, String name, String perfDataTag=allPerfDoc.createElement("PerformanceData"); if (i==1) perfDataTag.setAttribute("runOrder", "1"); else perfDataTag.setAttribute("runOrder", "2"); - perfDataTag.setAttribute("value", new Long(results[i]).toString()); + perfDataTag.setAttribute("value", Long.toString(results[i])); testTag.appendChild(perfDataTag); } } @@ -815,13 +815,13 @@ public static void xmlTestResults(String path, String suite, String name, String testTag.setAttribute("name", name); testTag.setAttribute("unit", unit); testTag.setAttribute("results", pass); - testTag.setAttribute("threshold", new Long(threshold).toString()); + testTag.setAttribute("threshold", Long.toString(threshold)); testTag.setAttribute("classname", classname); for (int i=1;i<=repeat;i++) { perfDataTag=allPerfDoc.createElement("PerformanceData"); if (i==1) perfDataTag.setAttribute("runOrder", "1"); else perfDataTag.setAttribute("runOrder", "2"); - perfDataTag.setAttribute("value", new Long(results[i]).toString()); + perfDataTag.setAttribute("value", Long.toString(results[i])); testTag.appendChild(perfDataTag); } } diff --git a/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java b/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java index 536610eb322f..7b30275f3502 100644 --- a/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java +++ b/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java @@ -479,7 +479,7 @@ protected static HashMap parseMeasuredValues(File measuredFile) th } value = readLine.substring(begin + str.length(), end); - measuredValues.put(str, new Long(value)); + measuredValues.put(str, Long.valueOf(value)); startup_data.remove(str); break; } diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ChicletWrapper.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ChicletWrapper.java index c1ecaa68a394..cfdf338314b6 100644 --- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ChicletWrapper.java +++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ChicletWrapper.java @@ -107,7 +107,7 @@ public Long hash() { result *= 1951; } - return new Long(result); + return result; } private static HashMap cache = new HashMap(); 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 1df6b95f158d..32ee5fc07fcc 100644 --- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java +++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedPropertyEditor.java @@ -344,7 +344,7 @@ private Object defaultValue() { if (indexedProperty.getElementType().isPrimitive()) { if (getConvertedType().equals(Integer.class)) { - value = new Integer(0); + value = 0; } if (getConvertedType().equals(Boolean.class)) { @@ -356,7 +356,7 @@ private Object defaultValue() { } if (getConvertedType().equals(Character.class)) { - value = new Character('\u0000'); + value = '\u0000'; } if (getConvertedType().equals(Double.class)) { @@ -368,7 +368,7 @@ private Object defaultValue() { } if (getConvertedType().equals(Long.class)) { - value = new Long(0L); + value = 0L; } if (getConvertedType().equals(Short.class)) { diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java index 86c93f052ecf..9880f4d56114 100644 --- a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java +++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java @@ -24,7 +24,6 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.PrintWriter; -import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.net.URL; import java.util.AbstractMap; @@ -922,9 +921,9 @@ private Object getObject(Object[] params) throws Exception { case 1: return Short.valueOf(value); case 2: - return new Integer(value); //(objI); + return Integer.valueOf(value); //(objI); case 3: - return new Long(value); + return Long.valueOf(value); case 4: return Float.valueOf(value); case 5: @@ -935,7 +934,7 @@ private Object getObject(Object[] params) throws Exception { if (value.trim().length() != 1) { break; } - return new Character(value.charAt(0)); + return value.charAt(0); case 8: return value; case 9: diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java b/platform/openide.loaders/src/org/openide/loaders/DataNode.java index 1e732815188e..72ae7ab1512d 100644 --- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java +++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java @@ -604,7 +604,7 @@ public SizeProperty() { } public Long getValue() { - return new Long(getDataObject().getPrimaryFile().getSize()); + return getDataObject().getPrimaryFile().getSize(); } } diff --git a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java index 661d5902361f..f83c866f1c6b 100644 --- a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java +++ b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java @@ -1116,11 +1116,11 @@ public ME (long size) { public String getLocalizedMessage () { Object[] arr = { getFileImpl().getPath (), - getFileImpl().getNameExt (), - new Long (size), // bytes - new Long (size / 1024 + 1), // kilobytes - new Long (size / (1024 * 1024)), // megabytes - new Long (size / (1024 * 1024 * 1024)), // gigabytes + getFileImpl().getNameExt (), + Long.valueOf(size), // bytes + Long.valueOf(size / 1024 + 1), // kilobytes + Long.valueOf(size / (1024 * 1024)), // megabytes + Long.valueOf(size / (1024 * 1024 * 1024)) // gigabytes }; return NbBundle.getMessage(DataObject.class, "MSG_ObjectIsTooBig", arr); } diff --git a/platform/uihandler/src/org/netbeans/modules/uihandler/SlownessData.java b/platform/uihandler/src/org/netbeans/modules/uihandler/SlownessData.java index 32267141f8c7..1dcbe3bb0115 100644 --- a/platform/uihandler/src/org/netbeans/modules/uihandler/SlownessData.java +++ b/platform/uihandler/src/org/netbeans/modules/uihandler/SlownessData.java @@ -56,7 +56,7 @@ public byte[] getNpsContent() { public LogRecord getLogRec(){ LogRecord rec = new LogRecord(Level.CONFIG, SLOWNESS_DATA); - rec.setParameters(new Object[]{new Long(time), latestActionName, slownessType}); + rec.setParameters(new Object[]{time, latestActionName, slownessType}); return rec; } diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java index 5a1bf7b20ded..1a2dee0a9c77 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/charts/DateTimeAxisUtils.java @@ -87,11 +87,11 @@ public class DateTimeAxisUtils { TIME_FORMAT_HOURS, TIME_FORMAT_DAYS, TIME_FORMAT_DAYS, TIME_FORMAT_DAYS, TIME_FORMAT_DAYS }; - private static final HashMap timeUnitsToIndex = new HashMap(); + private static final HashMap timeUnitsToIndex = new HashMap<>(); static { for (int i = 0; i < timeUnitsGrid.length; i++) { - timeUnitsToIndex.put(new Long(timeUnitsGrid[i]), Integer.valueOf(i)); + timeUnitsToIndex.put(Long.valueOf(timeUnitsGrid[i]), i); } } @@ -201,12 +201,12 @@ private static int getTimeUnitsFormat(long optimalUnits) { } private static int getUnitsIndex(long optimalUnits) { - Object oTimeUnitsFormatIndex = timeUnitsToIndex.get(new Long(optimalUnits)); + Integer oTimeUnitsFormatIndex = timeUnitsToIndex.get(optimalUnits); if (oTimeUnitsFormatIndex == null) { return -1; } - return ((Integer) oTimeUnitsFormatIndex).intValue(); + return oTimeUnitsFormatIndex; } } diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java index c07225bd7310..a47c0aa70968 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/locks/LockContentionPanel.java @@ -228,12 +228,12 @@ protected void populatePopup(JPopupMenu popup, Object value, Object userValue) { LockContentionRenderer lcRenderer = new LockContentionRenderer(); treeTable.setTreeCellRenderer(lcRenderer); - Number refTime = new Long(123456); + Long refTime = Long.valueOf(123456); NumberPercentRenderer npr = new NumberPercentRenderer(new McsTimeRenderer()); // npr.setValue(refTime, -1); hbrTime = new HideableBarRenderer(npr); - hbrTime.setMaxValue(refTime.longValue()); + hbrTime.setMaxValue(refTime); treeTable.setColumnRenderer(1, hbrTime); treeTable.setDefaultColumnWidth(1, hbrTime.getOptimalWidth()); diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java index 26b1925f335b..e139f1910ff7 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffAllocResultsPanel.java @@ -189,13 +189,13 @@ protected JPopupMenu getPopupMenu() { } protected Object computeValueAt(int row, int col) { - int index = ((Integer) filteredToFullIndexes.get(row)).intValue(); + int index = (Integer) filteredToFullIndexes.get(row); switch (col) { case 0: return sortedClassNames[index]; case 1: - return new Long(totalAllocObjectsSize[index]); + return totalAllocObjectsSize[index]; case 2: return ((totalAllocObjectsSize[index] > 0) ? "+" : "") + intFormat.format(totalAllocObjectsSize[index]) + " B"; // NOI18N case 3: diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java index 23cbb00151bd..03521641c704 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffLivenessResultsPanel.java @@ -93,13 +93,13 @@ protected JPopupMenu getPopupMenu() { } protected Object computeValueAt(int row, int col) { - int index = ((Integer) filteredToFullIndexes.get(row)).intValue(); + int index = (Integer) filteredToFullIndexes.get(row); switch (col) { case 0: return sortedClassNames[index]; case 1: - return new Long(trackedLiveObjectsSize[index]); + return trackedLiveObjectsSize[index]; case 2: return ((trackedLiveObjectsSize[index] > 0) ? "+" : "") + intFormat.format(trackedLiveObjectsSize[index]) + " B"; // NOI18N case 3: diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java index 85af5ec28136..4f9364b3a7d5 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/DiffSampledResultsPanel.java @@ -190,13 +190,13 @@ protected JPopupMenu getPopupMenu() { } protected Object computeValueAt(int row, int col) { - int index = ((Integer) filteredToFullIndexes.get(row)).intValue(); + int index = (Integer) filteredToFullIndexes.get(row); switch (col) { case 0: return sortedClassNames[index]; case 1: - return new Long(totalLiveObjectsSize[index]); + return totalLiveObjectsSize[index]; case 2: return ((totalLiveObjectsSize[index] > 0) ? "+" : "") + intFormat.format(totalLiveObjectsSize[index]) + " B"; // NOI18N case 3: diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java index f0316e8d7647..3031ed48cc2c 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/LiveReverseMemCallGraphPanel.java @@ -26,7 +26,6 @@ import org.netbeans.lib.profiler.results.memory.PresoObjLivenessCCTNode; import org.netbeans.lib.profiler.ui.UIConstants; import org.netbeans.lib.profiler.ui.UIUtils; -import org.netbeans.lib.profiler.ui.components.*; import org.netbeans.lib.profiler.ui.components.JTreeTable; import org.netbeans.lib.profiler.ui.components.table.CustomBarCellRenderer; import org.netbeans.lib.profiler.ui.components.treetable.AbstractTreeTableModel; @@ -120,7 +119,7 @@ public Object getValueAt(Object node, int column) { case 0: return pNode.toString(); case 1: - return new Long(pNode.totalObjSize); + return pNode.totalObjSize; case 2: value = ((PresoObjLivenessCCTNode) root).totalObjSize; @@ -147,7 +146,7 @@ public Object getValueAt(Object node, int column) { case 0: return pNode.getNodeName(); case 1: - return new Long(pNode.totalObjSize); + return pNode.totalObjSize; case 2: value = ((PresoObjAllocCCTNode) root).totalObjSize; diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java index 599f5a300a32..e78a082cd7a4 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/memory/SnapshotReverseMemCallGraphPanel.java @@ -277,7 +277,7 @@ public Object getValueAt(Object node, int column) { case 0: return pNode; case 1: - return new Long(pNode.totalObjSize); + return pNode.totalObjSize; case 2: value = ((PresoObjLivenessCCTNode) root).totalObjSize; @@ -304,7 +304,7 @@ public Object getValueAt(Object node, int column) { case 0: return pNode; case 1: - return new Long(pNode.totalObjSize); + return pNode.totalObjSize; case 2: value = ((PresoObjAllocCCTNode) root).totalObjSize; diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java index 38935fcbb50b..4d6b8b153c80 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/threads/ThreadsPanel.java @@ -311,10 +311,10 @@ protected void fireActionPerformed(ActionEvent e) { TableCellRenderer headerRenderer = header.getDefaultRenderer(); header.setDefaultRenderer(new TimelineHeaderRenderer(headerRenderer, 2, viewManager)); - Number refTime = new Long(1234567); + Long refTime = Long.valueOf(1234567); timeRelRenderer = new ThreadTimeRelRenderer(dataManager); - timeRelRenderer.setMaxValue(refTime.longValue()); + timeRelRenderer.setMaxValue(refTime); threadsTable.setDefaultColumnWidth(timeRelRenderer.getNoBarWidth()); threadsTable.setDefaultRenderer(Long.class, timeRelRenderer); diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java index d6d0c843d7dc..0e27bc7d933b 100644 --- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java +++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/StackTraceSegment.java @@ -63,7 +63,7 @@ StackTrace getStackTraceBySerialNumber(long stackTraceSerialNumber) { initSerialNumToFrame(); initialOffset = (Long) serialNumToStackTrace.get(stackTraceSerialNumber / SERIALNUM_DIV); if (initialOffset == null) { - initialOffset = new Long(startOffset); + initialOffset = Long.valueOf(startOffset); } offset = new long[] {initialOffset}; while (offset[0] < endOffset) { diff --git a/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java index e55db054088b..08e6e2919bc9 100644 --- a/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java +++ b/profiler/lib.profiler/test/qa-functional/src/org/netbeans/lib/profiler/tests/jfluid/monitor/MonitorTestCase.java @@ -243,7 +243,7 @@ protected void startMonitorTest(ProfilerEngineSettings settings, int times, long assertTrue("Error in threadData.clearStates", (td.size() == 0)); names.add(td.getName()); threads.put(n, states); - timestamps.put(n, new Long(td.getFirstTimeStamp())); + timestamps.put(n, td.getFirstTimeStamp()); } } 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 dbb3b25b50b4..06ad75195ada 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 @@ -156,7 +156,7 @@ public Object[][] getData(String[] filterStrings, int filterType, boolean showZe if (diff) { minDiff = Math.min(minDiff, instancesCount); maxDiff = Math.max(maxDiff, instancesCount); - data[i][1] = new Long(instancesCount); + data[i][1] = Long.valueOf(instancesCount); data[i][2] = (instancesCount > 0 ? "+" : "") + numberFormat.format(instancesCount); // NOI18N data[i][3] = (allInstancesSize > 0 ? "+" : "") + numberFormat.format(allInstancesSize); // NOI18N if (retained) { diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java index 4f0eba3600b8..fcb690f6fca2 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java @@ -225,11 +225,11 @@ private String getDetailsStringImpl(String className, Instance instance, Heap he private Long getUniqueInstanceId(Heap heap, Instance instance) { long id = instance.getInstanceId()^System.identityHashCode(heap); - return new Long(id); + return id; } private String getFileSeparator(Heap heap) { - Long id = new Long(System.identityHashCode(heap)); + Long id = Long.valueOf(System.identityHashCode(heap)); String sep = cache.get(id); if (sep == null) { sep = heap.getSystemProperties().getProperty("file.separator","/"); // NOI18N diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java index 3bc86b51c1c6..0957ec6209e1 100644 --- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java +++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java @@ -59,7 +59,7 @@ public void load() throws IOException { } public LogRecord getRecordFor(long time) { - Map.Entry entry = recordList.floorEntry(new Long(time)); + Map.Entry entry = recordList.floorEntry(time); if (entry != null) { return entry.getValue(); @@ -79,7 +79,7 @@ public void publish(LogRecord record) { // System.out.println("Time: "+(record.getMillis()-startTime)); // } // System.out.println(record.getMessage()); - recordList.put(new Long(record.getMillis()), record); + recordList.put(record.getMillis(), record); } @Override 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 996f80e39f0b..398a23e3292a 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 @@ -177,11 +177,11 @@ public boolean isFixed() { private Object generateDefaultValue() { if (type == Integer.class || type == Integer.TYPE) { - return new Integer(0); + return 0; } else if (type == Short.class || type == Short.TYPE) { return (short)0; } else if (type == Long.class || type == Long.TYPE) { - return new Long(0); + return 0L; } else if (type == Float.class || type == Float.TYPE) { return 0F; } else if (type == Double.class || type == Double.TYPE) { @@ -189,7 +189,7 @@ private Object generateDefaultValue() { } else if (type == Boolean.class || type == Boolean.TYPE) { return Boolean.FALSE; } else if (type == Character.class || type == Character.TYPE) { - return new Character('\0'); + return '\0'; } return null;