Remove a bunch of Integer boxing (thanks, #8)

replicatorg · Aug 21, 2015 · 7ac2b82 · 7ac2b82
1 parent 9fb54f8
commit 7ac2b82
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/org/j3d/loaders/stl/STLASCIIParser.java b/src/main/java/org/j3d/loaders/stl/STLASCIIParser.java
@@ -196,7 +196,7 @@ private boolean parse( final BufferedReader reader )
       }
       // watch order of if: solid contained also in endsolid
       else if( line.indexOf( "endsolid" ) >= 0 ) {
-        facetsPerObject.add( new Integer( numOfFacets ) );
+        facetsPerObject.add(numOfFacets);
         numOfFacets = 0;
         numOfObjects ++;
       } else if( line.indexOf( "solid" ) >= 0 ) {
@@ -279,4 +279,4 @@ private void skipObjectName( final StreamTokenizer tokenizer )
     }
     itsTokenizer.eolIsSignificant( false );
   }
-}
+}
diff --git a/src/main/java/replicatorg/app/ui/MainWindow.java b/src/main/java/replicatorg/app/ui/MainWindow.java
@@ -2822,7 +2822,7 @@ protected void checkModified(int checkModifiedMode) {
       // option
       // away from the others at the lefthand side
       pane.putClientProperty("Quaqua.OptionPane.destructiveOption",
-                             new Integer(2));
+                             2);
 
       JDialog dialog = pane.createDialog(this, null);
       dialog.setVisible(true);

diff --git a/src/main/java/replicatorg/app/ui/PreferencesWindow.java b/src/main/java/replicatorg/app/ui/PreferencesWindow.java
@@ -295,7 +295,7 @@ public void propertyChange(PropertyChangeEvent evt) {
       content.add(sfTimeoutLabel,"split, gap unrelated");
       int value = Base.preferences.getInt("replicatorg.skeinforge.timeout", -1);
       JFormattedTextField sfTimeoutField = new JFormattedTextField(Base.getLocalFormat());
-      sfTimeoutField.setValue(new Integer(value));
+      sfTimeoutField.setValue(value);
       content.add(sfTimeoutField,"wrap 10px, growx");
       String sfTimeoutHelp = "<html><small><em>" +
                              "The Skeinforge timeout is the number of seconds that replicatorg will wait while the<br>" +

diff --git a/src/main/java/replicatorg/app/ui/RealtimePanel.java b/src/main/java/replicatorg/app/ui/RealtimePanel.java
@@ -64,13 +64,13 @@ public RealtimePanel(MachineInterface machine2) {
     feedrateControl = new ControlSlider("Feedrate","%",5,800,100,speedPanel);
     //feedrateControl.getSlider().setMajorTickSpacing(10);
     Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
-    labelTable.put( new Integer( 10 ), new JLabel("Slow") );
-    labelTable.put( new Integer( 100 ), new JLabel("") );
-    labelTable.put( new Integer( 300 ), new JLabel("Fast") );
-    labelTable.put( new Integer( 500 ), new JLabel("Insane!") );
+    labelTable.put(10, new JLabel("Slow") );
+    labelTable.put(100, new JLabel("") );
+    labelTable.put(300, new JLabel("Fast") );
+    labelTable.put(500, new JLabel("Insane!") );
     feedrateControl.slider.setLabelTable( labelTable );
 
-//		add(new JLabel("Travel feedrate (no extrusion"),"growx,wrap");
+    //		add(new JLabel("Travel feedrate (no extrusion"),"growx,wrap");
     travelFeedrateControl = new ControlSlider("Travel feedrate","%",5,800,100,speedPanel);
     travelFeedrateControl.slider.setLabelTable( labelTable );
 

diff --git a/src/main/java/replicatorg/app/ui/ToolheadIndexer.java b/src/main/java/replicatorg/app/ui/ToolheadIndexer.java
@@ -37,7 +37,7 @@ public ToolheadIndexer(Frame parent, final Driver d) {
 
     final JFormattedTextField toolIndexField = new JFormattedTextField(NumberFormat.getIntegerInstance());
     toolIndexField.setColumns(4);
-    toolIndexField.setValue(new Integer(0));
+    toolIndexField.setValue(0);
     c.add(toolIndexField);
     JButton cancelButton = new JButton("Cancel");
     cancelButton.addActionListener(new ActionListener() {

diff --git a/src/main/java/replicatorg/app/ui/onboard/MachineOnboardParameters.java b/src/main/java/replicatorg/app/ui/onboard/MachineOnboardParameters.java
@@ -602,7 +602,7 @@ private static final JFormattedTextField PositiveTextFieldInt(NumberFormat nf, S
     Object fmtr = textField.getFormatter();
     if (fmtr instanceof InternationalFormatter) {
       InternationalFormatter ifr = (InternationalFormatter)fmtr;
-      ifr.setMinimum(new Integer(0));
+      ifr.setMinimum(0);
     }
     if (tip != null) textField.setToolTipText(wrap2HTML(defaultToolTipWidth, tip));
     return textField;
@@ -615,8 +615,8 @@ private static final JFormattedTextField PositiveTextFieldInt(NumberFormat nf, i
     Object fmtr = textField.getFormatter();
     if (fmtr instanceof InternationalFormatter) {
       InternationalFormatter ifr = (InternationalFormatter)fmtr;
-      ifr.setMinimum(new Integer(0));
-      ifr.setMaximum(new Integer(max));
+      ifr.setMinimum(0);
+      ifr.setMaximum(max);
     }
     if (tip != null) textField.setToolTipText(wrap2HTML(defaultToolTipWidth, tip, max));
     return textField;

diff --git a/src/main/java/replicatorg/drivers/gen3/MightyBoard.java b/src/main/java/replicatorg/drivers/gen3/MightyBoard.java
@@ -382,7 +382,7 @@ private void getStepperValues() {
       int vRef = getStoredStepperVoltage(i);
       Base.logger.fine("Caching inital Stepper vRef from bot");
       Base.logger.finer("Stepper i = " + i + " vRef =" + vRef);
-      stepperValues.put(new Integer(i), new Integer(vRef) );
+      stepperValues.put(i, vRef);
     }
   }
 
@@ -411,7 +411,7 @@ public void setStepperVoltage(int stepperId, int referenceValue) throws RetryExc
     PacketResponse pr = runCommand(pb.getPacket());
 
     if( pr.isOK() ) {
-      stepperValues.put(new Integer(stepperId), new Integer(referenceValue));
+      stepperValues.put(stepperId, referenceValue);
     }
   }
 

diff --git a/src/main/java/replicatorg/drivers/gen3/Sanguino3GDriver.java b/src/main/java/replicatorg/drivers/gen3/Sanguino3GDriver.java
@@ -297,7 +297,7 @@ public List<Integer> toolheadsWithStoredData() {
     Vector<ToolModel> tools = this.getMachine().getTools();
     Vector<Integer> toolsList = new Vector<Integer>();
     for( ToolModel t : tools ) {
-      toolsList.add(new Integer(t.getIndex()));
+      toolsList.add(t.getIndex());
     }
     return toolsList;
   }

diff --git a/src/main/java/replicatorg/plugin/toolpath/ProgressDialog.java b/src/main/java/replicatorg/plugin/toolpath/ProgressDialog.java
@@ -474,7 +474,7 @@ else if( currentSlicer.startsWith("Miracle"))
             newMessage = doSkeinforge33Update(newMessage);
 
           if(showProgress) {
-            String j = new Integer(layerTotal).toString();
+            String j = Integer.toString(layerTotal);
             double completion =  ((double) layerIndex/layerTotal);
             if((layerIndex>0) && (processName == "")) {
               newMessage += " ("+j+" layers)";//