Changeset 6717 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-01-17T21:33:44+01:00 (9 years ago)

Author:

Don-vip

Message:

where applicable, replace System.arraycopy by Arrays.copyOf

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• CopyList.java (modified) (2 diffs)
• Utils.java (modified) (1 diff)

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

@@ -3 +3 @@
 
 import java.util.AbstractList;
+import java.util.Arrays;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
@@ -129 +130 @@
     }
 
-    @SuppressWarnings("unchecked")
     private void ensureCapacity(int target) {
         modCount++;
         if (target > array.length) {
-            E[] old = array;
-
             int newCapacity = Math.max(target, (array.length * 3)/2 + 1);
-            array = (E[]) new Object[newCapacity];
-            System.arraycopy(old, 0, array, 0, size);
+            array = Arrays.copyOf(array, newCapacity);
             pristine = false;
         }

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

@@ -952 +952 @@
         return result;
     }
+    
+    /**
+     * Adds the given item at the end of a new copy of given array.
+     * @param array The source array
+     * @param item The item to add
+     * @return An extended copy of {@code array} containing {@code item} as additional last element
+     * @since 6717
+     */
+    public static <T> T[] addInArrayCopy(T[] array, T item) {
+        T[] biggerCopy = Arrays.copyOf(array, array.length + 1);
+        biggerCopy[array.length] = item;
+        return biggerCopy;
+    }
 }