Changeset 6104 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2013-08-03T00:12:29+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - Small performance enhancements / coding style (patch by shinigami):

• while -> foreach
• for -> for each

plus:

• cleanup of FileDrop class to make it more integrated into JOSM core + remove warnings

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• WMSLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• gpx/ImportAudioAction.java (modified) (3 diffs)

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

@@ -274 +274 @@
         images = new GeorefImage[dax][day];
         if (old != null) {
-            for (int i=0; i<old.length; i++) {
-                for (int k=0; k<old[i].length; k++) {
-                    GeorefImage o = old[i][k];
-                    images[modulo(o.getXIndex(),dax)][modulo(o.getYIndex(),day)] = old[i][k];
+            for (GeorefImage[] row : old) {
+                for (GeorefImage image : row) {
+                    images[modulo(image.getXIndex(), dax)][modulo(image.getYIndex(), day)] = image;
                 }
             }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -34 +34 @@
 import java.util.Date;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
@@ -452 +451 @@
         Collection<Layer> layerLst = Main.map.mapView.getAllLayers();
         GpxDataWrapper defaultItem = null;
-        Iterator<Layer> iterLayer = layerLst.iterator();
-        while (iterLayer.hasNext()) {
-            Layer cur = iterLayer.next();
+        for (Layer cur : layerLst) {
             if (cur instanceof GpxLayer) {
                 GpxLayer curGpx = (GpxLayer) cur;

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

@@ -91 +91 @@
             }
             String names = null;
-            for (int i = 0; i < sel.length; i++) {
+            for (File file : sel) {
                 if (names == null) {
                     names = " (";
@@ -97 +97 @@
                     names += ", ";
                 }
-                names += sel[i].getName();
+                names += file.getName();
             }
             if (names != null) {
@@ -107 +107 @@
             double firstStartTime = sel[0].lastModified() / 1000.0 - AudioUtil.getCalibratedDuration(sel[0]);
             Markers m = new Markers();
-            for (int i = 0; i < sel.length; i++) {
-                importAudio(sel[i], ml, firstStartTime, m);
+            for (File file : sel) {
+                importAudio(file, ml, firstStartTime, m);
             }
             Main.main.addLayer(ml);