Replace new Double/Long/Integer/Float by valueof

Author: jburel

src/main/java/omero/gateway/model/DataObject.java

@@ -278,7 +278,7 @@ protected void setVersion(int version) {
         if (value instanceof IMutable) {
             IMutable m = (IMutable) value;
             setDirty(true);
-            m.setVersion(new Integer(version));
+            m.setVersion(Integer.valueOf(version));
         }
     }
 

src/main/java/omero/gateway/model/DatasetData.java

@@ -311,14 +311,14 @@ public void setAnnotations(Set newValue) {
         while (m.moreDeletions()) {
             setDirty(true);
             asDataset().unlinkAnnotation(m.nextDeletion().asAnnotation());
-            annotationCount = annotationCount == null ? null : new Long(
+            annotationCount = annotationCount == null ? null : Long.valueOf(
                     annotationCount.longValue() - 1);
         }
 
         while (m.moreAdditions()) {
             setDirty(true);
             asDataset().linkAnnotation(m.nextAddition().asAnnotation());
-            annotationCount = annotationCount == null ? null : new Long(
+            annotationCount = annotationCount == null ? null : Long.valueOf(
                     annotationCount.longValue() + 1);
         }
 

src/main/java/omero/gateway/model/ImageData.java

@@ -505,14 +505,14 @@ public void setAnnotations(Set newValue) {
         while (m.moreDeletions()) {
             setDirty(true);
             asImage().unlinkAnnotation(m.nextDeletion().asAnnotation());
-            annotationCount = annotationCount == null ? null : new Long(
+            annotationCount = annotationCount == null ? null : Long.valueOf(
                     annotationCount.longValue() - 1);
         }
 
         while (m.moreAdditions()) {
             setDirty(true);
             asImage().linkAnnotation(m.nextAddition().asAnnotation());
-            annotationCount = annotationCount == null ? null : new Long(
+            annotationCount = annotationCount == null ? null : Long.valueOf(
                     annotationCount.longValue() + 1);
         }
 

src/main/java/omero/gateway/model/ShapeData.java

@@ -113,7 +113,7 @@ protected List<Point2D.Double> parsePointsToPoint2DList(String str)
             n = t.countTokens()/2;
             for (int j = 0; j < n; j++) {
                 points.add(
-                        new Point2D.Double(new Double(t.nextToken()), new Double(
+                        new Point2D.Double(Double.valueOf(t.nextToken()), Double.valueOf(
                                 t.nextToken())));
             }
         }

src/main/java/omero/gateway/model/ShapeSettingsData.java

@@ -273,7 +273,7 @@ public double[] getStrokeDashArray()
         String[] values = v.split("\\s*,\\s*");
         double[] dashes = new double[values.length];
         for (int i = 0; i < values.length; i++) 
-            dashes[i] = new Double(values[i]);
+            dashes[i] = Double.valueOf(values[i]);
         return dashes;
     }