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

Timestamp:

2015-06-21T02:25:56+02:00 (10 years ago)

Author:

Don-vip

Message:

checkstyle: blocks

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (8 diffs)
• ExceptionUtil.java (modified) (2 diffs)
• I18n.java (modified) (2 diffs)
• PlatformHookUnixoid.java (modified) (2 diffs)
• TextTagParser.java (modified) (1 diff)
• Utils.java (modified) (1 diff)
• date/FallbackDateParser.java (modified) (2 diffs)

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

@@ -267 +267 @@
                             int k;
 
-                            for (k = 1; xvec[x - k] == yvec[y - k]; k++)
+                            for (k = 1; xvec[x - k] == yvec[y - k]; k++) {
                                 if (k == SNAKE_LIMIT) {
                                     best = v;
@@ -273 +273 @@
                                     break;
                                 }
+                            }
                         }
                     }
@@ -295 +296 @@
                             int k;
 
-                            for (k = 0; xvec[x + k] == yvec[y + k]; k++)
+                            for (k = 0; xvec[x + k] == yvec[y + k]; k++) {
                                 if (k == SNAKE_LIMIT) {
                                     best = v;
@@ -301 +302 @@
                                     break;
                                 }
+                            }
                         }
                     }
@@ -723 +725 @@
                         /* Cancel any subrun of MINIMUM or more provisionals
                            within the larger run.  */
-                        for (j = 0, consec = 0; j < length; j++)
+                        for (j = 0, consec = 0; j < length; j++) {
                             if (discards[i + j] != 2) {
                                 consec = 0;
@@ -732 +734 @@
                                 discards[i + j] = 0;
                             }
+                        }
 
                         /* Scan from beginning of run
@@ -783 +786 @@
             final int end = bufferedLines;
             int j = 0;
-            for (int i = 0; i < end; ++i)
+            for (int i = 0; i < end; ++i) {
                 if (noDiscards || discards[i] == 0) {
                     undiscarded[j] = equivs[i];
@@ -790 +793 @@
                     changedFlag[1+i] = true;
                 }
+            }
             nondiscardedLines = j;
         }

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

@@ -442 +442 @@
         } catch (MalformedURLException ex) {
             // shouldn't happen
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
 
@@ -602 +605 @@
         } catch (MalformedURLException ex) {
             // shouldn't happen
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
 

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

@@ -482 +482 @@
         } catch (IOException e) {
             // Ignore
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
     }
@@ -511 +514 @@
         } catch (IOException e) {
             // Ignore exception
+            if (Main.isTraceEnabled()) {
+                Main.trace(e.getMessage());
+            }
         }
         return false;

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

@@ -131 +131 @@
     public void initSystemShortcuts() {
         // TODO: Insert system shortcuts here. See Windows and especially OSX to see how to.
-        for (int i = KeyEvent.VK_F1; i <= KeyEvent.VK_F12; ++i)
+        for (int i = KeyEvent.VK_F1; i <= KeyEvent.VK_F12; ++i) {
             Shortcut.registerSystemShortcut("screen:toogle"+i, tr("reserved"),
                     i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
+        }
         Shortcut.registerSystemShortcut("system:reset", tr("reserved"),
                 KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic();
@@ -374 +375 @@
                     } catch (IOException e) {
                         // Ignore
+                        if (Main.isTraceEnabled()) {
+                            Main.trace(e.getMessage());
+                        }
                     }
                 }

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

@@ -62 +62 @@
             while (true) {
                 skipEmpty();
-                if (pos == n) { break; }
+                if (pos == n) {
+                    break;
+                }
                 k = parseString("\n\r\t= ");
-                if (pos == n) { tags.clear();  break; }
+                if (pos == n) {
+                    tags.clear();
+                    break;
+                }
                 skipSign();
-                if (pos == n) { tags.clear();  break; }
+                if (pos == n) {
+                    tags.clear();
+                    break;
+                }
                 v = parseString("\n\r\t ");
                 tags.put(k, v);

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

@@ -1301 +1301 @@
     public static boolean hasExtension(String filename, String ... extensions) {
         String name = filename.toLowerCase(Locale.ENGLISH);
-        for (String ext : extensions)
+        for (String ext : extensions) {
             if (name.endsWith("."+ext.toLowerCase(Locale.ENGLISH)))
                 return true;
+        }
         return false;
     }

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

@@ -8 +8 @@
 import java.util.Date;
 import java.util.List;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -101 +103 @@
             } catch (ParseException pe) {
                 // Ignore parsing errors and try the next pattern.
+                if (Main.isTraceEnabled()) {
+                    Main.trace(pe.getMessage());
+                }
             }
         }