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

Timestamp:

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

Author:

Don-vip

Message:

PMD - Strict Exceptions

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (2 diffs)
• NameFinder.java (modified) (1 diff)
• NmeaReader.java (modified) (1 diff)
• remotecontrol/handler/ImportHandler.java (modified) (1 diff)
• remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.xml.sax.SAXException;
 
@@ -114 +115 @@
         } catch (OsmTransferException e) {
             throw e;
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalStateException e) {
             if (cancel)
                 return null;

trunk/src/org/openstreetmap/josm/io/NameFinder.java

@@ -241 +241 @@
                 Main.error(ex); // SAXException does not chain correctly
                 throw new SAXException(ex.getMessage(), ex);
-            } catch (NullPointerException ex) {
+            } catch (NullPointerException ex) { // NOPMD
                 Main.error(ex); // SAXException does not chain correctly
                 throw new SAXException(tr("Null pointer exception, possibly some missing tags."), ex);

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -415 +415 @@
             return true;
 
-        } catch (RuntimeException ex) {
+        } catch (IllegalArgumentException | IndexOutOfBoundsException ex) {
             // out of bounds and such
             Main.debug(ex);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -47 +47 @@
                 }
             }
-        } catch (RuntimeException ex) {
+        } catch (RuntimeException ex) { // NOPMD
             Main.warn("RemoteControl: Error parsing import remote control request:");
             Main.error(ex);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -146 +146 @@
                 }
             }
-        } catch (RuntimeException ex) {
+        } catch (RuntimeException ex) { // NOPMD
             Main.warn("RemoteControl: Error parsing load_and_zoom remote control request:");
             Main.error(ex);