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

Timestamp:

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

Author:

Don-vip

Message:

where applicable, replace System.arraycopy by Arrays.copyOf

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/GpxLayer.java (modified) (2 diffs)
• layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• preferences/projection/PuwgProjectionChoice.java (modified) (2 diffs)

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