Changeset 7436 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-08-20T14:36:08+02:00 (10 years ago)

Author:

Don-vip

Message:

global use of Utils.copyArray()

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/SequenceCommand.java (modified) (3 diffs)
• data/osm/Storage.java (modified) (3 diffs)
• data/validation/OsmValidator.java (modified) (1 diff)
• gui/mappaint/MapPaintStyles.java (modified) (2 diffs)
• gui/preferences/projection/PuwgProjectionChoice.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -69 +70 @@
         return sequence[sequence.length-1];
     }
-    
+
     protected final void undoCommands(int start) {
         // We probably aborted this halfway though the
@@ -114 +115 @@
         return prims;
     }
-    
+
     protected final void setSequence(Command[] sequence) {
-        this.sequence = Arrays.copyOf(sequence, sequence.length);
+        this.sequence = Utils.copyArray(sequence);
     }
-    
+
     protected final void setSequenceComplete(boolean sequenceComplete) {
         this.sequenceComplete = sequenceComplete;

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -3 +3 @@
 
 import java.util.AbstractSet;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -10 +9 @@
 import java.util.NoSuchElementException;
 import java.util.Set;
+
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -148 +149 @@
     private void copyArray() {
         if (arrayCopyNecessary) {
-            data = Arrays.copyOf(data, data.length);
+            data = Utils.copyArray(data);
             arrayCopyNecessary = false;
         }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -270 +270 @@
      */
     public static Class<Test>[] getAllAvailableTests() {
-        return Arrays.copyOf(allAvailableTests, allAvailableTests.length);
+        return Utils.copyArray(allAvailableTests);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -342 +342 @@
         if (!canMoveStyles(sel, delta))
             return;
-        int[] selSorted = Arrays.copyOf(sel, sel.length);
+        int[] selSorted = Utils.copyArray(sel);
         Arrays.sort(selSorted);
         List<StyleSource> data = new ArrayList<>(styles.getStyleSources());
@@ -361 +361 @@
         if (sel.length == 0)
             return false;
-        int[] selSorted = Arrays.copyOf(sel, sel.length);
+        int[] selSorted = Utils.copyArray(sel);
         Arrays.sort(selSorted);
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+
+import org.openstreetmap.josm.tools.Utils;
 
 public class PuwgProjectionChoice extends ListProjectionChoice {
@@ -46 +47 @@
     @Override
     public String[] allCodes() {
-        return Arrays.copyOf(CODES, CODES.length);
+        return Utils.copyArray(CODES);
     }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -311 +311 @@
 
     /**
+     * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+     * @param array The array to copy
+     * @return A copy of the original array, or {@code null} if {@code array} is null
+     * @since 7436
+     */
+    public static int[] copyArray(int[] array) {
+        if (array != null) {
+            return Arrays.copyOf(array, array.length);
+        }
+        return null;
+    }
+
+    /**
      * Simple file copy function that will overwrite the target file.<br>
      * @param in The source file