Changeset 11374 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-12-09T23:31:13+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S00112 - Generic exceptions should never be thrown: define JosmRuntimeException

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JoinAreasAction.java (modified) (4 diffs)
• OrthogonalizeAction.java (modified) (3 diffs)
• search/PushbackTokenizer.java (modified) (2 diffs)
• search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -1125 +1126 @@
                 WayInPolygon nextWay = traverser.walk();
                 if (nextWay == null)
-                    throw new RuntimeException("Join areas internal error.");
+                    throw new JosmRuntimeException("Join areas internal error.");
                 if (path.get(0) == nextWay) {
                     // path is closed -> stop here
@@ -1180 +1181 @@
                 while ((nextWay = traverser.walk()) != startWay) {
                     if (nextWay == null)
-                        throw new RuntimeException("Join areas internal error.");
+                        throw new JosmRuntimeException("Join areas internal error.");
                     simpleRingWays.add(nextWay);
                 }
@@ -1254 +1255 @@
         //should not happen
         if (joinedWay == null || !joinedWay.isClosed())
-            throw new RuntimeException("Join areas internal error.");
+            throw new JosmRuntimeException("Join areas internal error.");
 
         return joinedWay;

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -294 +295 @@
                     w.calcDirections(Direction.RIGHT.changeBy(directionOffset));
                     if (angleToDirectionChange(refHeading - w.heading, TOLERANCE2) != 0)
-                        throw new RuntimeException();
+                        throw new JosmRuntimeException("orthogonalize error");
                     totSum = EN.sum(totSum, w.segSum);
                 }
@@ -403 +404 @@
                 }
             }
-            if (!s.isEmpty()) throw new RuntimeException();
+            if (!s.isEmpty()) throw new JosmRuntimeException("orthogonalize error");
         }
 

trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 public class PushbackTokenizer {
@@ -74 +75 @@
             c = search.read();
         } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
+            throw new JosmRuntimeException(e.getMessage(), e);
         }
     }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -55 +55 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -229 +230 @@
                             tf.getDocument().insertString(tf.getCaretPosition(), ' ' + insertText, null);
                         } catch (BadLocationException ex) {
-                            throw new RuntimeException(ex.getMessage(), ex);
+                            throw new JosmRuntimeException(ex.getMessage(), ex);
                         }
                     }