Cleanup deprecated boxing (#124)

rbuch · web-flow · commit 899530c834d9 · 2021-06-28T19:19:02.000Z
These boxed primitive constructors have been marked for removal in future versions of Java, see https://www.oracle.com/java/technologies/javase/9-deprecated-features.html#JDK-8065614.
diff --git a/src/projections/Tools/CommunicationPerPE/ThreadedFileReader.java b/src/projections/Tools/CommunicationPerPE/ThreadedFileReader.java
@@ -93,7 +93,7 @@ public void run() {
 					sentMsgCount[pIdx][EPid]++;
 					sentByteCount[pIdx][EPid] += 
 						logdata.msglen;
-					localHistogram.add(new Integer(logdata.msglen));
+					localHistogram.add(logdata.msglen);
 				} else if ((logdata.type == ProjDefs.CREATION_BCAST) ||
 						(logdata.type == 
 							ProjDefs.CREATION_MULTICAST)) {
diff --git a/src/projections/Tools/NoiseMiner/NoiseMiner.java b/src/projections/Tools/NoiseMiner/NoiseMiner.java
@@ -185,7 +185,7 @@ private Duration period(){
 		protected NoiseResult(Duration d, long o, int pe, EventWindow ew){
 			pes = new TreeSet<Integer>();
 			this.ew = ew;
-			pes.add(new Integer(pe));
+			pes.add(pe);
 			duration = d;
 			occurrences = o;
 		}
diff --git a/src/projections/Tools/Streaming/MultiSeriesHandler.java b/src/projections/Tools/Streaming/MultiSeriesHandler.java
@@ -481,7 +481,7 @@ private void updateDetailedPlot(){
 				return;
 
 			if(b==0)
-				addKnownCategories(new Integer(b), newDataset);
+				addKnownCategories(b, newDataset);
 
 
 			// Read the number of entries for this bin
@@ -502,7 +502,7 @@ private void updateDetailedPlot(){
 				if(u > 0.0){
 					// add datapoint to plot
 					String epName = getName(ep,1000);
-					newDataset.addValue(u, epName, new Integer(b));
+					newDataset.addValue(u, epName, Integer.valueOf(b));
 				}
 
 			}
@@ -519,7 +519,7 @@ private void updateStreamingPlot(){
 		//		TreeMap<Integer, TreeMap<String, Double> > plotData;
 
 		Iterator<Integer> stepIter = streamingData.keySet().iterator();
-		Integer xValue = new Integer(0);
+		Integer xValue = 0;
 
 		boolean firstTime = true;
 
diff --git a/src/projections/Tools/Streaming/SingleSeriesHandler.java b/src/projections/Tools/Streaming/SingleSeriesHandler.java
@@ -74,7 +74,7 @@ public void handleReply(byte[] data){
 
 				numData = data.length / 1;
 				for(int i=0; i<numData; i++){
-					Float v = new Float(ByteParser.unsignedByteToInt(data[i]));
+					float v = (float) ByteParser.unsignedByteToInt(data[i]);
 
 					// Range of values supplied by this ccs handler is 0 to 200. Convert to percentages.
 					v /= 2.0f;
diff --git a/src/projections/Tools/Streaming/StartupDialogBox.java b/src/projections/Tools/Streaming/StartupDialogBox.java
@@ -137,7 +137,7 @@ public void actionPerformed(ActionEvent e) {
 			String hostname = hostnameTextField.getText();	
 			String portString = portTextField.getText();
 			String stsFilename = stsFilenameTextField.getText();
-			int port = new Integer(portString);
+			int port = Integer.parseInt(portString);
 			String ccsHandler = (String) handlerComboBox.getSelectedItem();
 
 			boolean saveReplies = saveRepliesCheckBox.isSelected();
diff --git a/src/projections/Tools/UserStatsOverTime/UserStatsTimeWindow.java b/src/projections/Tools/UserStatsOverTime/UserStatsTimeWindow.java
@@ -265,7 +265,7 @@ public void tableChanged(TableModelEvent e){
 							if(model.getRowCount()==0) return;
 							for(int row = e.getFirstRow(); row<=e.getLastRow();row++){
 								if(row<0) continue;
-								if(model.getValueAt(row,numColumns -1).equals(new Boolean(true))) {
+								if(model.getValueAt(row,numColumns -1).equals(Boolean.TRUE)) {
 									/*If dataset at row is marked Visible, Set the dataset
 								   	For that row to be the XYSeriesCollection meant for that row */
 									plot.setDataset(row,graphedData.get(row));
diff --git a/src/projections/analysis/Analysis.java b/src/projections/analysis/Analysis.java
@@ -256,7 +256,7 @@ private void findEndTime() {
 	  totalTime = temp;
 	}
       }
-      rcReader.setValue("RC_GLOBAL_END_TIME", new Long(totalTime));
+      rcReader.setValue("RC_GLOBAL_END_TIME", totalTime);
     }
     
     // Find Pose End Time Data
@@ -273,8 +273,8 @@ public Object doInBackground() {
     				return null;
     			}
     			public void done() {
-    				rcReader.setValue("RC_POSE_REAL_TIME", new Long(poseTotalTime));
-    				rcReader.setValue("RC_POSE_VIRT_TIME", new Long(poseTotalVirtualTime));	    }
+    				rcReader.setValue("RC_POSE_REAL_TIME", poseTotalTime);
+    				rcReader.setValue("RC_POSE_VIRT_TIME", poseTotalVirtualTime);	    }
     		};
     		worker.execute();
     	}
diff --git a/src/projections/analysis/GenericLogReader.java b/src/projections/analysis/GenericLogReader.java
@@ -201,7 +201,7 @@ public LogEntry nextEvent(LogEntry data) throws InputMismatchException, IOExcept
 			data.pe = (int) sc.nextLong();
 			break;
 		case USER_SUPPLIED:
-			data.userSupplied = new Integer((int) sc.nextLong());
+			data.userSupplied = (int) sc.nextLong();
 			break;
 		case USER_SUPPLIED_NOTE:
 			data.time = sc.nextLong() + shiftAmount;
diff --git a/src/projections/analysis/LogLoaderBeginEventThread.java b/src/projections/analysis/LogLoaderBeginEventThread.java
@@ -10,12 +10,12 @@
 /** This thread's run() method will lookup the begin computation time for an input log file */
 class LogLoaderBeginEventThread  implements Runnable {
 
-	protected Long result;
+	protected long result;
 	private int myRun = 0;
 	private int pe;
 
 	protected LogLoaderBeginEventThread(int pe) {
-		result = new Long(Long.MAX_VALUE);
+		result = Long.MAX_VALUE;
 		this.pe = pe;
 	}
 
diff --git a/src/projections/analysis/LogLoaderEndEventThread.java b/src/projections/analysis/LogLoaderEndEventThread.java
@@ -10,12 +10,12 @@
 /** This thread's run() method will lookup the end computation time for an input log file */
 class LogLoaderEndEventThread  implements Runnable {
 
-	protected Long result;
+	protected long result;
 	private int myRun = 0;
 	private int pe;
 
 	protected LogLoaderEndEventThread(int pe) {
-		result = new Long(Long.MIN_VALUE);
+		result = Long.MIN_VALUE;
 		this.pe = pe;
 	}
 
diff --git a/src/projections/analysis/LogLoaderEndTimeThread.java b/src/projections/analysis/LogLoaderEndTimeThread.java
@@ -9,12 +9,12 @@
 /** This thread's run() method will lookup the endtime for an input log file */
 class LogLoaderEndTimeThread  implements Runnable {
 
-	protected Long result;
+	protected long result;
 	private int myRun = 0;
 	private int pe;
 
 	protected LogLoaderEndTimeThread(int pe) {
-		result = new Long(0);
+		result = 0L;
 		this.pe = pe;
 	}
 
diff --git a/src/projections/analysis/MultiRunDataAnalyzer.java b/src/projections/analysis/MultiRunDataAnalyzer.java
@@ -360,9 +360,9 @@ public Object getTableValueAt(int dataType, int categoryIndex,
 	} else {
 	    // if extra info, use different array.
 	    if (epIndex >= numEPs) {
-		return new Double(extraTable[dataType][col-1][numEPs-epIndex]);
+		return extraTable[dataType][col - 1][numEPs - epIndex];
 	    } else {
-		return new Double(dataTable[dataType][col-1][epIndex]);
+		return dataTable[dataType][col - 1][epIndex];
 	    }
 	}
     }
diff --git a/src/projections/analysis/ProjectionsConfigurationReader.java b/src/projections/analysis/ProjectionsConfigurationReader.java
@@ -33,10 +33,10 @@ public class ProjectionsConfigurationReader
   // For convenience of coding, these are static. This will have to
   // be changed once multiple runs are supported generically in
   // Projections.
-  public Long RC_GLOBAL_END_TIME = new Long(-1);
-  public Long RC_POSE_REAL_TIME = new Long(-1);
-  public Long RC_POSE_VIRT_TIME = new Long(-1);    
-  public Boolean RC_OUTLIER_FILTERED = Boolean.valueOf(false);
+  public Long RC_GLOBAL_END_TIME = (long) -1;
+  public Long RC_POSE_REAL_TIME = (long) -1;
+  public Long RC_POSE_VIRT_TIME = (long) -1;
+  public Boolean RC_OUTLIER_FILTERED = Boolean.FALSE;
   
   public ProjectionsConfigurationReader(FileUtils fileNameHandler)
   {
diff --git a/src/projections/analysis/RangeHistory.java b/src/projections/analysis/RangeHistory.java
@@ -56,7 +56,7 @@ public RangeHistory(String logDirectory)
 			historyStringVector.add(historyString);
 		}
 	    } catch (IOException e) {
-		System.err.println("Error: " + e.toString());
+		System.err.println("Error: " + e);
 	    }
 	}
     }
@@ -140,10 +140,10 @@ public void add(long start, long end, String name, String procs) {
 	}
 	// added in reverse order starting from the front of the vector.
 	if (rangeName == null) rangeName = new ArrayList<String>();
-	rangeName.add(0, new String(name));
-	rangeSet.add(0, new Long(end));
-	rangeSet.add(0, new Long(start));
-	rangeProcs.add(0, new String(procs));
+	rangeName.add(0, name);
+	rangeSet.add(0, end);
+	rangeSet.add(0, start);
+	rangeProcs.add(0, procs);
 	numEntries++;
     }
 
diff --git a/src/projections/analysis/StsReader.java b/src/projections/analysis/StsReader.java
@@ -234,32 +234,30 @@ public StsReader(String FileName)
 		    int Size  = Integer.parseInt(st.nextToken());
 		    MsgTable[ID] = Size;
 		} else if (s1.equals("EVENT")) {
-		    Integer key = new Integer(st.nextToken());
+		    int key = Integer.parseInt(st.nextToken());
 		    if (!userEvents.containsKey(key)) {
 			String eventName = "";
 			while (st.hasMoreTokens()) {
 			    eventName = eventName + st.nextToken() + " ";
 			}
 			userEvents.put(key, eventName);
 			userEventNames[userEventIndex] = eventName;
-			userEventIndices.put(key, 
-					     new Integer(userEventIndex++));
+			userEventIndices.put(key, userEventIndex++);
 		    }
 		} else if (s1.equals("TOTAL_EVENTS")) {
 		    // restored by Chee Wai - 7/29/2002
 		    userEventNames = 
 			new String[Integer.parseInt(st.nextToken())];
 		} else if (s1.equals("STAT")) {
-		    Integer key = new Integer(st.nextToken());
+		    int key = Integer.parseInt(st.nextToken());
 		    if (!userStats.containsKey(key)) {
 			String statName = "";
 			while (st.hasMoreTokens()) {
 			    statName = statName + st.nextToken() + " ";
 			}
 			userStats.put(key, statName);
 			userStatNames[userStatIndex] = statName;
-			userStatIndices.put(key,
-					     new Integer(userStatIndex++));
+			userStatIndices.put(key, userStatIndex++);
 		    }
 		//Read in number of stats
 		} else if (s1.equals("TOTAL_STATS")) {
@@ -416,8 +414,7 @@ public Integer getUserEventIndex(int eventID) {
     }
 
     public String getUserEventName(int eventID) { 
-	Integer key = new Integer(eventID);
-	return userEvents.get(key);
+		return userEvents.get(eventID);
     }
 
     public String[] getUserEventNames() {
@@ -444,8 +441,7 @@ public Integer getUserStatIndex(int eventID) {
     }
 
     public String getUserStatName(int eventID) {
-	Integer key = new Integer(eventID);
-	return userStats.get(key);
+		return userStats.get(eventID);
     }
 
     public String[] getUserStatNames() {
diff --git a/src/projections/ccs/CcsServer.java b/src/projections/ccs/CcsServer.java
@@ -97,8 +97,8 @@ public CcsServer(String init,byte[] secretKey)
    	if (ip_int<0) ip_int+=(1L<<32); //Make unsigned
    	String ip_dot="";
    	for (int b=3;b>=0;b--) {
-   		Long l=new Long(0xff&(ip_int>>(8*b)));
-		ip_dot=ip_dot+l.toString();
+		long l = 0xff & (ip_int >> (8 * b));
+		ip_dot = ip_dot + l;
 		if (b>0) ip_dot=ip_dot+".";
 	}
    	
diff --git a/src/projections/gui/ProfileWindow.java b/src/projections/gui/ProfileWindow.java
@@ -503,7 +503,7 @@ private void createDisplayDataSource(){
 	for (int i=0; i<numEPs; i++) {
 	    // anything greater than 5% is "significant"
 	    if (avg[0][i]+avg[1][i] > 1.0) {
-		sigElements.add(new Integer(i));
+		sigElements.add(i);
 	    }
 	}
 	// copy to an array for Color assignment (maybe that should be

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ private Duration period(){`
`185`	`185`	`protected NoiseResult(Duration d, long o, int pe, EventWindow ew){`
`186`	`186`	`pes = new TreeSet<Integer>();`
`187`	`187`	`this.ew = ew;`
`188`		`- pes.add(new Integer(pe));`
	`188`	`+ pes.add(pe);`
`189`	`189`	`duration = d;`
`190`	`190`	`occurrences = o;`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ private void findEndTime() {`
`256`	`256`	`totalTime = temp;`
`257`	`257`	`}`
`258`	`258`	`}`
`259`		`- rcReader.setValue("RC_GLOBAL_END_TIME", new Long(totalTime));`
	`259`	`+ rcReader.setValue("RC_GLOBAL_END_TIME", totalTime);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`// Find Pose End Time Data`
`@@ -273,8 +273,8 @@ public Object doInBackground() {`
`273`	`273`	`return null;`
`274`	`274`	`}`
`275`	`275`	`public void done() {`
`276`		`- rcReader.setValue("RC_POSE_REAL_TIME", new Long(poseTotalTime));`
`277`		`- rcReader.setValue("RC_POSE_VIRT_TIME", new Long(poseTotalVirtualTime)); }`
	`276`	`+ rcReader.setValue("RC_POSE_REAL_TIME", poseTotalTime);`
	`277`	`+ rcReader.setValue("RC_POSE_VIRT_TIME", poseTotalVirtualTime); }`
`278`	`278`	`};`
`279`	`279`	`worker.execute();`
`280`	`280`	`}`