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

Timestamp:

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

Author:

Don-vip

Message:

where applicable, replace System.arraycopy by Arrays.copyOf

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (4 diffs)
• data/osm/Relation.java (modified) (3 diffs)
• data/osm/Storage.java (modified) (2 diffs)
• data/osm/Way.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (2 diffs)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• gui/preferences/projection/PuwgProjectionChoice.java (modified) (2 diffs)
• tools/CopyList.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
 
@@ -924 +925 @@
     /**
      * Add new referrer. If referrer is already included then no action is taken
-     * @param referrer
+     * @param referrer The referrer to add
      */
     protected void addReferrer(OsmPrimitive referrer) {
-        // Based on methods from josm-ng
         if (referrers == null) {
             referrers = referrer;
@@ -939 +939 @@
                     return;
             }
-            OsmPrimitive[] orig = (OsmPrimitive[])referrers;
-            OsmPrimitive[] bigger = new OsmPrimitive[orig.length+1];
-            System.arraycopy(orig, 0, bigger, 0, orig.length);
-            bigger[orig.length] = referrer;
-            referrers = bigger;
+            referrers = Utils.addInArrayCopy((OsmPrimitive[])referrers, referrer);
         }
     }
@@ -949 +945 @@
     /**
      * Remove referrer. No action is taken if referrer is not registered
-     * @param referrer
+     * @param referrer The referrer to remove
      */
     protected void removeReferrer(OsmPrimitive referrer) {
-        // Based on methods from josm-ng
         if (referrers instanceof OsmPrimitive) {
             if (referrers == referrer) {

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

@@ -82 +82 @@
         boolean locked = writeLock();
         try {
-            RelationMember[] newMembers = new RelationMember[members.length + 1];
-            System.arraycopy(members, 0, newMembers, 0, members.length);
-            newMembers[members.length] = member;
-            members = newMembers;
+            members = Utils.addInArrayCopy(members, member);
             member.getMember().addReferrer(this);
             member.getMember().clearCachedStyle();
@@ -480 +477 @@
     }
 
-    private void checkMembers() {
+    private void checkMembers() throws DataIntegrityProblemException {
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
@@ -497 +494 @@
     }
 
-    private void fireMembersChanged() {
+    private void fireMembersChanged() throws DataIntegrityProblemException {
         checkMembers();
         if (getDataSet() != null) {

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;
@@ -147 +148 @@
     private void copyArray() {
         if (arrayCopyNecessary) {
-            @SuppressWarnings("unchecked") T[] newData = (T[]) new Object[data.length];
-            System.arraycopy(data, 0, newData, 0, data.length);
-            data = newData;
+            data = Arrays.copyOf(data, data.length);
             arrayCopyNecessary = false;
         }

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

@@ -17 +17 @@
 import org.openstreetmap.josm.tools.CopyList;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -425 +426 @@
             clearCachedStyle();
             n.addReferrer(this);
-            Node[] newNodes = new Node[nodes.length + 1];
-            System.arraycopy(nodes, 0, newNodes, 0, nodes.length);
-            newNodes[nodes.length] = n;
-            nodes = newNodes;
+            nodes = Utils.addInArrayCopy(nodes, n);
             n.clearCachedStyle();
             fireNodesChanged();

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -17 +17 @@
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -814 +815 @@
     final private void ensureTrackVisibilityLength() {
         final int l = data.tracks.size();
-        if(l == trackVisibility.length)
+        if (l == trackVisibility.length)
             return;
-        final boolean[] back = trackVisibility.clone();
-        final int m = Math.min(l, back.length);
-        trackVisibility = new boolean[l];
-        System.arraycopy(back, 0, trackVisibility, 0, m);
-        for(int i=m; i < l; i++) {
+        final int m = Math.min(l, trackVisibility.length);
+        trackVisibility = Arrays.copyOf(trackVisibility, l);
+        for (int i = m; i < l; i++) {
             trackVisibility[i] = true;
         }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -13 +13 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.util.Arrays;
 import java.util.Map;
 
@@ -221 +222 @@
         // cancel for unknown buttons and copy back original settings
         if (v != 1 && v != 2) {
-            System.arraycopy(trackVisibilityBackup, 0, layer.trackVisibility, 0, layer.trackVisibility.length);
+            layer.trackVisibility = Arrays.copyOf(trackVisibilityBackup, layer.trackVisibility.length);
             Main.map.repaint();
             return;

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;
@@ -44 +45 @@
     @Override
     public String[] allCodes() {
-        String[] zones = new String[CODES.length];
-        System.arraycopy(CODES, 0, zones, 0, CODES.length);
-        return zones;
+        return Arrays.copyOf(CODES, CODES.length);
     }
 

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;
+    }
 }