[5/5][ide, javafx, misc] Remove deprecated Integer constructor usage.

mbien · mbien · commit 5496ae97225d · 2025-04-08T21:13:07.000+02:00
diff --git a/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java b/apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/wizard/BasicInfoVisualPanel.java
@@ -260,7 +260,7 @@ private void setProjectName(String formater, int counter) {
     
     // stolen (then adjusted) from j2seproject
     private String validFreeModuleName(String formater, int index) {
-        String name = MessageFormat.format(formater, new Object[]{ new Integer(index) });
+        String name = MessageFormat.format(formater, index);
         File file = new File(getLocationValue(), name);
         return file.exists() ? null : name;
     }
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/GrailsArtifactWizardIterator.java
@@ -265,7 +265,7 @@ public void initialize(WizardDescriptor wiz) {
             if (c instanceof JComponent) { // assume Swing components
                 JComponent jc = (JComponent) c;
                 // Step #.
-                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer(i));
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, i);
                 // Step name (actually the whole list for reference).
                 jc.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps);
             }
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/FeatureOnDemandWizardIterator.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/newproject/FeatureOnDemandWizardIterator.java
@@ -116,7 +116,7 @@ private List<WizardDescriptor.Panel<WizardDescriptor>> getPanels () {
                 if (c instanceof JComponent) { // assume Swing components
                     JComponent jc = (JComponent) c;
                     // Sets step number of a component
-                    jc.putClientProperty ("WizardPanel_contentSelectedIndex", new Integer (i));
+                    jc.putClientProperty ("WizardPanel_contentSelectedIndex", i);
                     // Sets steps names for a panel
                     jc.putClientProperty ("WizardPanel_contentData", steps);
                 }
@@ -148,7 +148,7 @@ private void createPanelsForEnable () {
                 if (c instanceof JComponent) { // assume Swing components
                     JComponent jc = (JComponent) c;
                     // Sets step number of a component
-                    jc.putClientProperty ("WizardPanel_contentSelectedIndex", new Integer (i));
+                    jc.putClientProperty ("WizardPanel_contentSelectedIndex", i);
                     // Sets steps names for a panel
                     jc.putClientProperty ("WizardPanel_contentData", steps);
                 }
diff --git a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/gjdemo/GroovyJavaDemoWizardIterator.java
@@ -119,7 +119,7 @@ public void initialize(WizardDescriptor wiz) {
                 JComponent jc = (JComponent) c;
                 // Step #.
                 // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));
+                jc.putClientProperty("WizardPanel_contentSelectedIndex", i);
                 // Step name (actually the whole list for reference).
                 jc.putClientProperty("WizardPanel_contentData", steps);
             }
@@ -134,8 +134,7 @@ public void uninitialize(WizardDescriptor wiz) {
     }
 
     public String name() {
-        return MessageFormat.format("{0} of {1}",
-                new Object[]{new Integer(index + 1), new Integer(panels.length)});
+        return MessageFormat.format("{0} of {1}", index + 1, panels.length);
     }
 
     public boolean hasNext() {
diff --git a/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java b/groovy/groovy.samples/src/org/netbeans/modules/groovy/samples/nbprojectgen/NBProjectGeneratorsWizardIterator.java
@@ -119,7 +119,7 @@ public void initialize(WizardDescriptor wiz) {
                 JComponent jc = (JComponent) c;
                 // Step #.
                 // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));
+                jc.putClientProperty("WizardPanel_contentSelectedIndex", i);
                 // Step name (actually the whole list for reference).
                 jc.putClientProperty("WizardPanel_contentData", steps);
             }
@@ -134,8 +134,7 @@ public void uninitialize(WizardDescriptor wiz) {
     }
 
     public String name() {
-        return MessageFormat.format("{0} of {1}",
-                new Object[]{new Integer(index + 1), new Integer(panels.length)});
+        return MessageFormat.format("{0} of {1}", index + 1, panels.length);
     }
 
     public boolean hasNext() {
diff --git a/harness/o.n.insane/src/org/netbeans/insane/model/XmlHeapModel.java b/harness/o.n.insane/src/org/netbeans/insane/model/XmlHeapModel.java
@@ -66,7 +66,7 @@ public Item getObjectAt(String staticRefName) {
     }
     
     public Item getItem(int id) {
-        Item itm = items.get(new java.lang.Integer(id));
+        Item itm = items.get(id);
         if (itm == null) throw new IllegalArgumentException("Bad ID");
         return itm;
     }
diff --git a/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java b/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java
@@ -765,7 +765,8 @@ private void putDimensionForPrinting() {
         if (isMouseOverCycleButton(e) && annos.getNumberOfAnnotations(line) > 1) {
             return java.text.MessageFormat.format (
                 NbBundle.getBundle(BaseKit.class).getString ("cycling-glyph_tooltip"), //NOI18N
-                new Object[] { new Integer (annos.getNumberOfAnnotations(line)) });
+                annos.getNumberOfAnnotations(line)
+            );
         }
         else if (isMouseOverGlyph(e)) {
             AnnotationDesc activeAnnotation = annos.getActiveAnnotation(line);
diff --git a/ide/languages/src/org/netbeans/api/languages/ASTItem.java b/ide/languages/src/org/netbeans/api/languages/ASTItem.java
@@ -212,7 +212,7 @@ ASTPath findPath (List<ASTItem> path, int offset) {
 
     private ASTPath findPath2 (List<ASTItem> path, int offset) {
         TreeMap<Integer,ASTItem> childrenMap = getChildrenMap ();
-        SortedMap<Integer,ASTItem> headMap = childrenMap.headMap (new Integer (offset + 1));
+        SortedMap<Integer,ASTItem> headMap = childrenMap.headMap(offset + 1);
         if (headMap.isEmpty ())
             return ASTPath.create (path);
         Integer key = headMap.lastKey ();
@@ -231,7 +231,7 @@ private TreeMap<Integer,ASTItem> getChildrenMap () {
             Iterator<ASTItem> it = getChildren ().iterator ();
             while (it.hasNext ()) {
                 ASTItem item = it.next ();
-                childrenMap.put (new Integer (item.getOffset ()), item);
+                childrenMap.put(item.getOffset(), item);
             }
         }
         return childrenMap;
diff --git a/ide/languages/src/org/netbeans/modules/languages/dataobject/MimeLookupInitializerImpl.java b/ide/languages/src/org/netbeans/modules/languages/dataobject/MimeLookupInitializerImpl.java
@@ -107,14 +107,10 @@ private Lookup _lookup () {
             if (LanguagesManager.getDefault ().isSupported (mimeTypes [0])) {
                 lookup = Lookups.fixed (
                     new Integer[] {
-                        new Integer (1), 
-                        new Integer (2), 
-//                        new Integer (3), 
-//                        new Integer (4),
-                        new Integer (5),
-                        new Integer (6),
-                        new Integer (7)
-                    },
+                        1, 2,
+//                        3,
+//                        4,
+                        5, 6, 7},
                     new InstanceContent.Convertor<Integer,Object> () {
                         public Object convert (Integer i) {
                             switch (i.intValue ()) {
diff --git a/ide/languages/src/org/netbeans/modules/languages/lexer/SLexer.java b/ide/languages/src/org/netbeans/modules/languages/lexer/SLexer.java
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import org.netbeans.api.languages.CharInput;
-import org.netbeans.api.languages.ASTToken;
 import org.netbeans.api.lexer.PartType;
 import org.netbeans.api.languages.ParseException;
 import org.netbeans.api.lexer.Token;
@@ -170,7 +169,7 @@ public int getState () {
     }
 
     public void setState (int state) {
-        this.state = new Integer (state);
+        this.state = state;
     }
 
     public void setProperties (Feature tokenProperties) {
@@ -327,8 +326,8 @@ static class TokenProperties implements TokenPropertyProvider {
         
         public Object getValue (Token token, Object key) {
             if ("type".equals (key)) return type;
-            if ("startSkipLength".equals (key)) return new Integer (startSkipLength);
-            if ("endSkipLength".equals (key)) return new Integer (endSkipLength);
+            if ("startSkipLength".equals (key)) return startSkipLength;
+            if ("endSkipLength".equals (key)) return endSkipLength;
             return null;
         }
 
diff --git a/ide/languages/src/org/netbeans/modules/languages/parser/First.java b/ide/languages/src/org/netbeans/modules/languages/parser/First.java
@@ -76,7 +76,7 @@ private void compute () throws ParseException {
                 l = new ArrayList<Integer> ();
                 ntToIndexes.put (nt, l);
             }
-            l.add (new Integer (i));
+            l.add(i);
             language.getNTID (nt);
         }
 //        follow = new Fl [language.getNTCount ()];
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/NewProjectWizard.java b/ide/projectui/src/org/netbeans/modules/project/ui/NewProjectWizard.java
@@ -81,7 +81,7 @@ protected WizardDescriptor.Panel<WizardDescriptor> createTemplateChooser() {
         jc.setName (NbBundle.getBundle (NewProjectWizard.class).getString ("LBL_NewProjectWizard_Name")); // NOI18N
         jc.getAccessibleContext ().setAccessibleName (NbBundle.getBundle (NewProjectWizard.class).getString ("ACSN_NewProjectWizard")); // NOI18N
         jc.getAccessibleContext ().setAccessibleDescription (NbBundle.getBundle (NewProjectWizard.class).getString ("ACSD_NewProjectWizard")); // NOI18N
-        jc.putClientProperty (WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer (0));
+        jc.putClientProperty (WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, 0);
         jc.putClientProperty (WizardDescriptor.PROP_CONTENT_DATA, new String[] {
                 NbBundle.getBundle (NewProjectWizard.class).getString ("LBL_NewProjectWizard_Name"), // NOI18N
                 NbBundle.getBundle (NewProjectWizard.class).getString ("LBL_NewProjectWizard_Dots")}); // NOI18N
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTemplatePanel.java b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTemplatePanel.java
@@ -62,7 +62,7 @@ public void readSettings(WizardDescriptor settings) {
         this.wizard = settings;
         panel.setWizardDescriptor(wizard);
         TemplateWizard wd = (TemplateWizard) settings;
-        wd.putProperty (WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer (0));
+        wd.putProperty (WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, 0);
         wd.putProperty (WizardDescriptor.PROP_CONTENT_DATA, new String[] {
                 NbBundle.getBundle (ProjectTemplatePanel.class).getString ("LBL_TemplatesPanel_Name"), // NOI18N
                 NbBundle.getBundle (ProjectTemplatePanel.class).getString ("LBL_TemplatesPanel_Dots")}); // NOI18N
diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/FXMLTemplateWizardIterator.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/fxml/FXMLTemplateWizardIterator.java
@@ -576,7 +576,7 @@ public File createNewFolder(File containingDir) throws IOException {
             int i = 2;
             while (newFolder.exists() && (i < 100)) {
                 newFolder = createFileObject(containingDir, MessageFormat.format(
-                        win ? newFolderNextStringWin : newFolderNextString, new Object[]{new Integer(i)}));
+                        win ? newFolderNextStringWin : newFolderNextString, new Object[]{i}));
                 i++;
             }
 
diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXPreloaderChooserWizardIterator.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXPreloaderChooserWizardIterator.java
@@ -49,7 +49,7 @@ private WizardDescriptor.Panel getPanel(int index) {
                 JComponent jc = (JComponent) c;
                 // Sets step number of a component
                 // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(index));
+                jc.putClientProperty("WizardPanel_contentSelectedIndex", index);
                 // Sets steps names for a panel
                 jc.putClientProperty("WizardPanel_contentData", steps);
                 // Turn on subtitle creation on each step
diff --git a/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXPreloaderChooserWizardPanel2.java b/javafx/javafx2.project/src/org/netbeans/modules/javafx2/project/ui/JFXPreloaderChooserWizardPanel2.java
@@ -89,8 +89,7 @@ public Component getComponent() {
 
                 // wizard API: set the caption and index of this panel
                 projectChooser.setName(NbBundle.getMessage (JFXPreloaderChooserWizardPanel2.class, "CTL_SelectProject_Caption")); // NOI18N
-                projectChooser.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, // NOI18N
-                                                 new Integer(1));
+                projectChooser.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, 1);
 
                 if (lastProjectDirectoryUsed != null)
                     projectChooser.setCurrentDirectory(new File(lastProjectDirectoryUsed));
@@ -118,8 +117,7 @@ public void propertyChange(PropertyChangeEvent ev) {
 
                 // wizard API: set the caption and index of this panel
                 jarFileChooser.setName(NbBundle.getMessage (JFXPreloaderChooserWizardPanel2.class, "CTL_SelectJAR_Caption")); // NOI18N
-                jarFileChooser.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, // NOI18N
-                                              new Integer(1));
+                jarFileChooser.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, 1);
 
                 jarFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
                 jarFileChooser.setAcceptAllFileFilterUsed(true);
diff --git a/javafx/javafx2.samples/src/org/netbeans/modules/javafx2/samples/JavaFXSampleProjectIterator.java b/javafx/javafx2.samples/src/org/netbeans/modules/javafx2/samples/JavaFXSampleProjectIterator.java
@@ -167,7 +167,7 @@ void updateStepsList() {
             NbBundle.getMessage(PanelConfigureProject.class, "LBL_NWP1_ProjectTitleName"), // NOI18N
         };
         component.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, list); // NOI18N
-        component.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer(currentIndex)); // NOI18N
+        component.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, currentIndex); // NOI18N
     }
     
     private void warnIssue204880(final String msg) {
diff --git a/javafx/javafx2.samples/src/org/netbeans/modules/javafx2/samples/PanelProjectLocationVisual.java b/javafx/javafx2.samples/src/org/netbeans/modules/javafx2/samples/PanelProjectLocationVisual.java
@@ -226,7 +226,7 @@ void read (WizardDescriptor settings) {
     // End of variables declaration//GEN-END:variables
         
     private String validFreeProjectName(final File parentFolder, final String formater, final int index) {
-        String name = MessageFormat.format(formater, new Object[] {new Integer (index)});                
+        String name = MessageFormat.format(formater, index);
         File file = new File(parentFolder, name);
         return file.exists() ? null : name;
     }
diff --git a/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplateWizardIterator.java b/rust/rust.project/src/org/netbeans/modules/rust/project/templates/RustProjectTemplateWizardIterator.java
@@ -181,7 +181,7 @@ public void initialize(WizardDescriptor wiz) {
                 JComponent jc = (JComponent) c;
                 // Step #.
                 // TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));
+                jc.putClientProperty("WizardPanel_contentSelectedIndex", Integer.valueOf(i));
                 // Step name (actually the whole list for reference).
                 jc.putClientProperty("WizardPanel_contentData", steps);
             }
@@ -197,7 +197,7 @@ public void uninitialize(WizardDescriptor wiz) {
 
     public String name() {
         return MessageFormat.format("{0} of {1}",
-                new Object[]{new Integer(index + 1), new Integer(panels.length)});
+                new Object[]{Integer.valueOf(index + 1), Integer.valueOf(panels.length)});
     }
 
     public boolean hasNext() {

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ private void setProjectName(String formater, int counter) {`
`260`	`260`
`261`	`261`	`// stolen (then adjusted) from j2seproject`
`262`	`262`	`private String validFreeModuleName(String formater, int index) {`
`263`		`- String name = MessageFormat.format(formater, new Object[]{ new Integer(index) });`
	`263`	`+ String name = MessageFormat.format(formater, index);`
`264`	`264`	`File file = new File(getLocationValue(), name);`
`265`	`265`	`return file.exists() ? null : name;`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public void initialize(WizardDescriptor wiz) {`
`265`	`265`	`if (c instanceof JComponent) { // assume Swing components`
`266`	`266`	`JComponent jc = (JComponent) c;`
`267`	`267`	`// Step #.`
`268`		`- jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer(i));`
	`268`	`+ jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, i);`
`269`	`269`	`// Step name (actually the whole list for reference).`
`270`	`270`	`jc.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps);`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public void initialize(WizardDescriptor wiz) {`
`119`	`119`	`JComponent jc = (JComponent) c;`
`120`	`120`	`// Step #.`
`121`	`121`	`// TODO if using org.openide.dialogs >= 7.8, can use WizardDescriptor.PROP_*:`
`122`		`- jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));`
	`122`	`+ jc.putClientProperty("WizardPanel_contentSelectedIndex", i);`
`123`	`123`	`// Step name (actually the whole list for reference).`
`124`	`124`	`jc.putClientProperty("WizardPanel_contentData", steps);`
`125`	`125`	`}`
`@@ -134,8 +134,7 @@ public void uninitialize(WizardDescriptor wiz) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`public String name() {`
`137`		`- return MessageFormat.format("{0} of {1}",`
`138`		`- new Object[]{new Integer(index + 1), new Integer(panels.length)});`
	`137`	`+ return MessageFormat.format("{0} of {1}", index + 1, panels.length);`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`public boolean hasNext() {`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public Item getObjectAt(String staticRefName) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public Item getItem(int id) {`
`69`		`- Item itm = items.get(new java.lang.Integer(id));`
	`69`	`+ Item itm = items.get(id);`
`70`	`70`	`if (itm == null) throw new IllegalArgumentException("Bad ID");`
`71`	`71`	`return itm;`
`72`	`72`	`}`