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

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

Files:

• FallbackDateParser.java (modified) (1 diff)
• Utils.java (modified) (1 diff)
• WindowGeometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java

@@ -43 +43 @@
         // Build a list of candidate date parsers.
         dateParsers = new ArrayList<DateFormat>(formats.length);
-        for (int i = 0; i < formats.length; i++) {
-            dateParsers.add(new SimpleDateFormat(formats[i]));
+        for (String format : formats) {
+            dateParsers.add(new SimpleDateFormat(format));
         }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -281 +281 @@
         if( path.exists() ) {
             File[] files = path.listFiles();
-            for(int i=0; i<files.length; i++) {
-                if(files[i].isDirectory()) {
-                    deleteDirectory(files[i]);
-                }
-                else {
-                    files[i].delete();
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    deleteDirectory(file);
+                } else {
+                    file.delete();
                 }
             }

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -296 +296 @@
                 .getLocalGraphicsEnvironment();
         GraphicsDevice[] gs = ge.getScreenDevices();
-        for (int j = 0; j < gs.length; j++) {
-            GraphicsDevice gd = gs[j];
+        for (GraphicsDevice gd : gs) {
             if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
                 virtualBounds = virtualBounds.union(gd.getDefaultConfiguration().getBounds());
@@ -346 +345 @@
         int intersect = 0;
         Rectangle bounds = null;
-        for (int j = 0; j < gs.length; j++) {
-            GraphicsDevice gd = gs[j];
+        for (GraphicsDevice gd : gs) {
             if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
                 Rectangle b = gd.getDefaultConfiguration().getBounds();
-                if (b.height > 0 && b.width/b.height >= 3) /* multiscreen with wrong definition */
-                {
+                if (b.height > 0 && b.width / b.height >= 3) /* multiscreen with wrong definition */ {
                     b.width /= 2;
                     Rectangle is = b.intersection(g);
-                    int s = is.width*is.height;
-                    if(bounds == null || intersect < s) {
+                    int s = is.width * is.height;
+                    if (bounds == null || intersect < s) {
                         intersect = s;
                         bounds = b;
@@ -362 +359 @@
                     b.x += b.width;
                     is = b.intersection(g);
-                    s = is.width*is.height;
-                    if(bounds == null || intersect < s) {
+                    s = is.width * is.height;
+                    if (bounds == null || intersect < s) {
                         intersect = s;
                         bounds = b;
                     }
-                }
-                else
-                {
+                } else {
                     Rectangle is = b.intersection(g);
-                    int s = is.width*is.height;
-                    if(bounds == null || intersect < s) {
+                    int s = is.width * is.height;
+                    if (bounds == null || intersect < s) {
                         intersect = s;
                         bounds = b;