Changeset 11374 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm

Files:

• DataSet.java (modified) (5 diffs)
• DataSetMerger.java (modified) (3 diffs)

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

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -516 +517 @@
             }
             if (!success)
-                throw new RuntimeException("failed to add primitive: "+primitive);
+                throw new JosmRuntimeException("failed to add primitive: "+primitive);
             firePrimitivesAdded(Collections.singletonList(primitive), false);
         } finally {
@@ -547 +548 @@
             }
             if (!success)
-                throw new RuntimeException("failed to remove primitive: "+primitive);
+                throw new JosmRuntimeException("failed to remove primitive: "+primitive);
             synchronized (selectionLock) {
                 selectedPrimitives.remove(primitive);
@@ -1063 +1064 @@
     private void reindexNode(Node node, LatLon newCoor, EastNorth eastNorth) {
         if (!nodes.remove(node))
-            throw new RuntimeException("Reindexing node failed to remove");
+            throw new JosmRuntimeException("Reindexing node failed to remove");
         node.setCoorInternal(newCoor, eastNorth);
         if (!nodes.add(node))
-            throw new RuntimeException("Reindexing node failed to add");
+            throw new JosmRuntimeException("Reindexing node failed to add");
         for (OsmPrimitive primitive: node.getReferrers()) {
             if (primitive instanceof Way) {
@@ -1079 +1080 @@
         BBox before = way.getBBox();
         if (!ways.remove(way))
-            throw new RuntimeException("Reindexing way failed to remove");
+            throw new JosmRuntimeException("Reindexing way failed to remove");
         way.updatePosition();
         if (!ways.add(way))
-            throw new RuntimeException("Reindexing way failed to add");
+            throw new JosmRuntimeException("Reindexing way failed to add");
         if (!way.getBBox().equals(before)) {
             for (OsmPrimitive primitive: way.getReferrers()) {

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

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -143 +144 @@
         Way myWay = (Way) getMergeTarget(other);
         if (myWay == null)
-            throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
+            throw new JosmRuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
     }
 
@@ -178 +179 @@
                 OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
                 if (source == null)
-                    throw new RuntimeException(
+                    throw new JosmRuntimeException(
                             tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
                             target.getType(), target.getUniqueId()));