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

Timestamp:

2017-03-19T02:26:34+01:00 (7 years ago)

Author:

Don-vip

Message:

PMD - Strict Exceptions

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• AutosaveTask.java (modified) (1 diff)
• Preferences.java (modified) (1 diff)
• cache/JCSCacheManager.java (modified) (1 diff)
• osm/DatasetConsistencyTest.java (modified) (2 diffs)
• osm/visitor/paint/StyledMapRenderer.java (modified) (5 diffs)
• preferences/PreferencesWriter.java (modified) (4 diffs)
• projection/CustomProjection.java (modified) (2 diffs)
• projection/Projections.java (modified) (1 diff)
• validation/OsmValidator.java (modified) (1 diff)
• validation/tests/TagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -233 +233 @@
                     GuiHelper.runInEDT(this::displayNotification);
                 }
-            } catch (RuntimeException t) {
+            } catch (RuntimeException t) { // NOPMD
                 // Don't let exception stop time thread
                 Main.error("Autosave failed:");

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1420 +1420 @@
                 Utils.setObjectsAccessible(field);
                 field.set(null, ResourceBundle.getBundle("sun.awt.resources.awt"));
-            } catch (ReflectiveOperationException | RuntimeException e) {
+            } catch (ReflectiveOperationException | RuntimeException e) { // NOPMD
+                // Catch RuntimeException in order to catch InaccessibleObjectException, new in Java 9
                 Main.warn(e);
             }

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -182 +182 @@
             } catch (IOException e) {
                 throw e;
-            } catch (Exception e) {
+            } catch (Exception e) { // NOPMD
                 throw new IOException(e);
             }

trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -212 +213 @@
             }
 
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             writer.println("Exception during dataset integrity test:");
             e.printStackTrace(writer);

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

@@ -86 +86 @@
 import org.openstreetmap.josm.tools.Geometry.AreaAndPerimeter;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -1735 +1736 @@
                 }
                 return output;
-            } catch (RuntimeException e) {
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
             } finally {
@@ -1747 +1748 @@
                     osm.accept(this);
                 }
-            } catch (RuntimeException e) {
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 throw BugReport.intercept(e).put("osm", osm);
             }
@@ -1855 +1856 @@
 
             benchmark.renderDone();
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e)
                     .put("data", data)
@@ -1870 +1871 @@
         try {
             record.paintPrimitive(paintSettings, this);
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("record", record);
         }

trunk/src/org/openstreetmap/josm/data/preferences/PreferencesWriter.java

@@ -88 +88 @@
             addDefaults();
         } else {
-            throw new NullPointerException();
+            throw new IllegalArgumentException(setting.toString());
         }
     }
@@ -105 +105 @@
             addDefaults();
         } else {
-            throw new NullPointerException();
+            throw new IllegalArgumentException(setting.toString());
         }
     }
@@ -126 +126 @@
             addDefaults();
         } else {
-            throw new NullPointerException();
+            throw new IllegalArgumentException(setting.toString());
         }
     }
@@ -147 +147 @@
             addDefaults();
         } else {
-            throw new NullPointerException();
+            throw new IllegalArgumentException(setting.toString());
         }
     }

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.projection.proj.Proj;
 import org.openstreetmap.josm.data.projection.proj.ProjParameters;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -831 +832 @@
                         }
                     }
-                } catch (RuntimeException e) {
+                } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                     Main.error(e);
                 }

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -338 +338 @@
             try {
                 proj = pc.getProjection();
-            } catch (RuntimeException e) {
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 Main.warn(e, "Unable to get projection "+code+" with "+pc+':');
             }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -333 +333 @@
                     test.initialize();
                 }
-            } catch (Exception e) {
+            } catch (Exception e) { // NOPMD
                 Main.error(e);
                 if (!GraphicsEnvironment.isHeadless()) {

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

@@ -271 +271 @@
                 for (TaggingPresetItem i : p.data) {
                     if (i instanceof KeyedItem) {
-                        addPresetValue(p, (KeyedItem) i);
+                        addPresetValue((KeyedItem) i);
                     } else if (i instanceof CheckGroup) {
                         for (Check c : ((CheckGroup) i).checks) {
-                            addPresetValue(p, c);
+                            addPresetValue(c);
                         }
                     }
@@ -282 +282 @@
     }
 
-    private static void addPresetValue(TaggingPreset p, KeyedItem ky) {
+    private static void addPresetValue(KeyedItem ky) {
         Collection<String> values = ky.getValues();
         if (ky.key != null && values != null) {
-            try {
-                presetsValueData.putAll(ky.key, values);
-                harmonizedKeys.put(harmonizeKey(ky.key), ky.key);
-            } catch (NullPointerException e) {
-                Main.error(e, p+": Unable to initialize "+ky+'.');
-            }
+            presetsValueData.putAll(ky.key, values);
+            harmonizedKeys.put(harmonizeKey(ky.key), ky.key);
         }
     }
@@ -543 +539 @@
 
     private static String harmonizeKey(String key) {
-        key = key.toLowerCase(Locale.ENGLISH).replace('-', '_').replace(':', '_').replace(' ', '_');
-        return Utils.strip(key, "-_;:,");
+        return Utils.strip(key.toLowerCase(Locale.ENGLISH).replace('-', '_').replace(':', '_').replace(' ', '_'), "-_;:,");
     }
 
     private static String harmonizeValue(String value) {
-        value = value.toLowerCase(Locale.ENGLISH).replace('-', '_').replace(' ', '_');
-        return Utils.strip(value, "-_;:,");
+        return Utils.strip(value.toLowerCase(Locale.ENGLISH).replace('-', '_').replace(' ', '_'), "-_;:,");
     }