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

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

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (3 diffs)

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()));