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

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/projection

Files:

• Projections.java (modified) (2 diffs)
• datum/NTV2GridShiftFileWrapper.java (modified) (2 diffs)
• proj/ClassProjFactory.java (modified) (2 diffs)
• proj/SwissObliqueMercator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -147 +148 @@
             pds = loadProjectionDefinitions("resource://data/projection/custom-epsg");
         } catch (IOException ex) {
-            throw new RuntimeException(ex);
+            throw new JosmRuntimeException(ex);
         }
         inits = new LinkedHashMap<>();

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -57 +58 @@
                 instance.loadGridShiftFile(is, false);
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new JosmRuntimeException(e);
             }
         }

trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.projection.proj;
+
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -23 +25 @@
             proj = projClass.getConstructor().newInstance();
         } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
+            throw new JosmRuntimeException(e);
         }
         return proj;

trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.projection.Ellipsoid;
 import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 // CHECKSTYLE.OFF: LineLength
@@ -108 +109 @@
         while (abs(phi - prevPhi) > EPSILON) {
             if (++iteration > 30)
-                throw new RuntimeException("Two many iterations");
+                throw new JosmRuntimeException("Two many iterations");
             prevPhi = phi;
             double s = 1 / alpha * (log(tan(PI / 4 + b / 2)) - k) + ellps.e