Changeset 11087 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-10-07T10:20:53+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1141 - Try-catch blocks should not be nested

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1853 +1853 @@
             try {
                 for (final OsmPrimitive osm : input) {
-                    try {
-                        if (osm.isDrawable()) {
-                            osm.accept(this);
-                        }
-                    } catch (RuntimeException e) {
-                        throw BugReport.intercept(e).put("osm", osm);
-                    }
+                    acceptDrawable(osm);
                 }
                 return output;
@@ -1866 +1860 @@
             } finally {
                 MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
+            }
+        }
+
+        private void acceptDrawable(final OsmPrimitive osm) {
+            try {
+                if (osm.isDrawable()) {
+                    osm.accept(this);
+                }
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("osm", osm);
             }
         }
@@ -1966 +1970 @@
 
             for (StyleRecord record : allStyleElems) {
-                try {
-                    record.paintPrimitive(paintSettings, this);
-                } catch (RuntimeException e) {
-                    throw BugReport.intercept(e).put("record", record);
-                }
+                paintRecord(record);
             }
 
@@ -1987 +1987 @@
         }
     }
+
+    private void paintRecord(StyleRecord record) {
+        try {
+            record.paintPrimitive(paintSettings, this);
+        } catch (RuntimeException e) {
+            throw BugReport.intercept(e).put("record", record);
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -311 +311 @@
                         if (ai.key.startsWith("throw")) {
                             try {
-                                final Severity severity = Severity.valueOf(ai.key.substring("throw".length()).toUpperCase(Locale.ENGLISH));
-                                check.errors.put(ai, severity);
+                                check.errors.put(ai, Severity.valueOf(ai.key.substring("throw".length()).toUpperCase(Locale.ENGLISH)));
                             } catch (IllegalArgumentException e) {
                                 Main.warn(e, "Unsupported "+ai.key+" instruction. Allowed instructions are "+POSSIBLE_THROWS+'.');
@@ -753 +752 @@
                 addMapCSS(i);
                 if (Main.pref.getBoolean("validator.auto_reload_local_rules", true) && source.isLocal()) {
-                    try {
-                        Main.fileWatcher.registerValidatorRule(source);
-                    } catch (IOException e) {
-                        Main.error(e);
-                    }
+                    Main.fileWatcher.registerValidatorRule(source);
                 }
             } catch (IOException ex) {