Changeset 6228 in josm

Timestamp:

2013-09-11T00:14:06+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar - replace array copy loops by more efficient calls to System.arraycopy

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

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

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

@@ -818 +818 @@
         final int m = Math.min(l, back.length);
         trackVisibility = new boolean[l];
-        for(int i=0; i < m; i++) {
-            trackVisibility[i] = back[i];
-        }
+        System.arraycopy(back, 0, trackVisibility, 0, m);
         for(int i=m; i < l; i++) {
             trackVisibility[i] = true;

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

@@ -47 +47 @@
     JTable table;
 
+    /**
+     * Constructs a new {@code ChooseTrackVisibilityAction}.
+     * @param layer The associated GPX layer
+     */
     public ChooseTrackVisibilityAction(final GpxLayer layer) {
         super(tr("Choose visible tracks"), ImageProvider.get("dialogs/filter"));
@@ -217 +221 @@
         // cancel for unknown buttons and copy back original settings
         if (v != 1 && v != 2) {
-            for (int i = 0; i < layer.trackVisibility.length; i++) {
-                layer.trackVisibility[i] = trackVisibilityBackup[i];
-            }
+            System.arraycopy(trackVisibilityBackup, 0, layer.trackVisibility, 0, layer.trackVisibility.length);
             Main.map.repaint();
             return;

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

@@ -24 +24 @@
     };
 
+    /**
+     * Constructs a new {@code PuwgProjectionChoice}.
+     */
     public PuwgProjectionChoice() {
         super(tr("PUWG (Poland)"), "core:puwg", NAMES, tr("PUWG Zone"));
@@ -42 +45 @@
     public String[] allCodes() {
         String[] zones = new String[CODES.length];
-        for (int idx = 0; idx < CODES.length; idx++) {
-            zones[idx] = CODES[idx];
-        }
+        System.arraycopy(CODES, 0, zones, 0, CODES.length);
         return zones;
     }