replace deprecated constructors like new Double(double) with valueOf

Author: s-u

jri/RFactor.java

@@ -39,7 +39,7 @@ public RFactor(int[] i, String[] v) {
 		int j;
 		if (i!=null && i.length>0)
 			for(j=0;j<i.length;j++)
-				id.addElement(new Integer(i[j]-base));
+				id.addElement(Integer.valueOf(i[j] - base));
 		if (v!=null && v.length>0)
 			for(j=0;j<v.length;j++)
 				val.addElement(v[j]);
@@ -53,7 +53,7 @@ public void add(String v) {
 	    i=val.size();
 	    val.addElement(v);
 	};
-	id.addElement(new Integer(i));
+	id.addElement(Integer.valueOf(i));
     }
 
     /** returns name for a specific ID 

src/java/RJavaArrayTools.java

@@ -738,23 +738,23 @@ public static Double[] boxDoubles(double[] d) {
 		if (d == null) return null;
 		int i = 0, n = d.length;
 		Double o[] = new Double[i];
-		for (i = 0; i < n; i++) if (!isNA(d[i])) o[i] = new Double(d[i]);
+		for (i = 0; i < n; i++) if (!isNA(d[i])) o[i] = Double.valueOf(d[i]);
 		return o;
 	}
 
 	public static Integer[] boxIntegers(int[] d) {
 		if (d == null) return null;
 		int i = 0, n = d.length;
 		Integer o[] = new Integer[i];
-		for (i = 0; i < n; i++) if (d[i] != NA_INTEGER) o[i] = new Integer(d[i]);
+		for (i = 0; i < n; i++) if (d[i] != NA_INTEGER) o[i] = Integer.valueOf(d[i]);
 		return o;
 	}
 
 	public static Boolean[] boxBooleans(int[] d) {
 		if (d == null) return null;
 		int i = 0, n = d.length;
 		Boolean o[] = new Boolean[i];
-		for (i = 0; i < n; i++) if (d[i] != NA_INTEGER) o[i] = new Boolean((d[i] == 0) ? false : true);
+		for (i = 0; i < n; i++) if (d[i] != NA_INTEGER) o[i] = Boolean.valueOf((d[i] == 0) ? false : true);
 		return o;
 	}
 }

src/java/RJavaArrayTools_Test.java

@@ -237,7 +237,7 @@ private static void getdimlength() throws TestException{
 		System.out.print( "  new Double('10.2') " ) ;
 		boolean ok = false; 
 		try{
-			RJavaArrayTools.getDimensionLength( new Double("10.3") ) ;
+			RJavaArrayTools.getDimensionLength( Double.valueOf(10.3) ) ;
 		} catch( NotAnArrayException e){
 			ok = true ; 
 		}
@@ -505,7 +505,7 @@ private static void getdims() throws TestException{
 		System.out.print( "  new Double('10.2') " ) ;
 		boolean ok = false; 
 		try{
-			res = RJavaArrayTools.getDimensions( new Double("10.3") ) ;
+			res = RJavaArrayTools.getDimensions( Double.valueOf(10.3) ) ;
 		} catch( NotAnArrayException e){
 			ok = true ; 
 		}
@@ -736,7 +736,7 @@ private static void gettruelength() throws TestException{
 		System.out.print( "  new Double('10.2') " ) ;
 		boolean ok = false; 
 		try{
-			res = RJavaArrayTools.getTrueLength( new Double("10.3") ) ;
+			res = RJavaArrayTools.getTrueLength( Double.valueOf(10.3) ) ;
 		} catch( NotAnArrayException e){
 			ok = true ; 
 		}
@@ -1303,7 +1303,7 @@ private static void gettypename() throws TestException {
 		System.out.print( "  new Double('10.2') " ) ;
 		boolean ok = false; 
 		try{
-			res = RJavaArrayTools.getObjectTypeName( new Double("10.3") ) ;
+			res = RJavaArrayTools.getObjectTypeName( Double.valueOf(10.3) ) ;
 		} catch( NotAnArrayException e){
 			ok = true ; 
 		}

src/java/RJavaClassLoader.java

@@ -161,7 +161,6 @@ public URL getResource(String name ){
 				try{
 					urlPrefix = "jar:" + toURL().toString() + "!" ;
 				} catch( java.net.MalformedURLException ex){
-				} catch( java.io.IOException ex){
 				}
 			}
 

src/java/RJavaComparator.java

@@ -28,8 +28,8 @@ public static int compare( Object a, Object b ) throws NotComparableException{
 
 		// treat Number s separately
 		if( a instanceof Number && b instanceof Number && !( a.getClass() == b.getClass() ) ){
-			Double _a = new Double( ((Number)a).doubleValue() );
-			Double _b = new Double( ((Number)b).doubleValue() );
+			Double _a = Double.valueOf( ((Number)a).doubleValue() );
+			Double _b = Double.valueOf( ((Number)b).doubleValue() );
 			return _a.compareTo( _b ); 
 		}