Changeset 11746 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

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

Author:

Don-vip

Message:

PMD - Strict Exceptions

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• DialogsPanel.java (modified) (2 diffs)
• changeset/ChangesetContentPanel.java (modified) (2 diffs)
• relation/MemberTableModel.java (modified) (2 diffs)
• relation/sort/WayConnectionTypeCalculator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -17 +17 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -325 +326 @@
             try {
                 t.destroy();
-            } catch (RuntimeException e) {
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 throw BugReport.intercept(e).put("dialog", t).put("dialog-class", t.getClass());
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -54 +54 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
@@ -235 +236 @@
                         GuiHelper.runInEDT(() -> HistoryBrowserDialogManager.getInstance().show(h));
                     }
-                } catch (final RuntimeException e) {
+                } catch (final JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                     GuiHelper.runInEDT(() -> BugReportExceptionHandler.handleException(e));
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -808 +809 @@
             }
             return connectionType.get(i);
-        } catch (RuntimeException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("i", i).put("members", members).put("relation", relation);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -44 +45 @@
             try {
                 lastWct = updateLinksFor(con, lastWct, i);
-            } catch (RuntimeException e) {
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
                 int index = i;
                 throw BugReport.intercept(e).put("i", i).put("member", () -> members.get(index)).put("con", con);