Changeset 6104 in josm for trunk/src/org/openstreetmap/josm/actions

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/actions

Files:

• FollowLineAction.java (modified) (2 diffs)
• OpenLocationAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -85 +84 @@
 
         Node newPoint = null;
-        Iterator<OsmPrimitive> i = referrers.iterator();
-        while (i.hasNext()) {
-            OsmPrimitive referrer = i.next();
+        for (OsmPrimitive referrer : referrers) {
             if (!referrer.getType().equals(OsmPrimitiveType.WAY)) { // Can't follow points or relations
                 continue;

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -133 +133 @@
     public Collection<DownloadTask> findDownloadTasks(final String url) {
         List<DownloadTask> result = new ArrayList<DownloadTask>();
-        for (int i = 0; i < downloadTasks.size(); i++) {
-            Class<? extends DownloadTask> taskClass = downloadTasks.get(i);
+        for (Class<? extends DownloadTask> taskClass : downloadTasks) {
             if (taskClass != null) {
                 try {

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1670 +1670 @@
         private double getNearestAngle(double angle) {
             double delta,minDelta=1e5, bestAngle=0.0;
-            for (int i=0; i < snapAngles.length; i++) {
-                delta = getAngleDelta(angle,snapAngles[i]);
+            for (double snapAngle : snapAngles) {
+                delta = getAngleDelta(angle, snapAngle);
                 if (delta < minDelta) {
-                    minDelta=delta;
-                    bestAngle=snapAngles[i];
+                    minDelta = delta;
+                    bestAngle = snapAngle;
                 }
             }