Changeset 6623 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-04T06:39:00+01:00 (10 years ago)

Author:

Don-vip

Message:

fix Sonar issues

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• CrossingWays.java (modified) (6 diffs)
• OpeningHourTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -33 +33 @@
 public abstract class CrossingWays extends Test {
     protected static final int CROSSING_WAYS = 601;
+    
+    private static final String HIGHWAY = "highway";
+    private static final String RAILWAY = "railway";
+    private static final String WATERWAY = "waterway";
 
     /** All way segments, grouped by cells */
@@ -47 +51 @@
             return super.isPrimitiveUsable(w)
                     && !isProposedOrAbandoned(w)
-                    && (w.hasKey("highway")
-                    || w.hasKey("waterway")
-                    || (w.hasKey("railway") && !isSubwayOrTram(w))
+                    && (w.hasKey(HIGHWAY)
+                    || w.hasKey(WATERWAY)
+                    || (w.hasKey(RAILWAY) && !isSubwayOrTram(w))
                     || isCoastline(w)
                     || isBuilding(w));
@@ -59 +63 @@
                 return true;
             }
-            if (w1.hasKey("highway") && w2.hasKey("highway") && !Utils.equal(w1.get("level"), w2.get("level"))) {
+            if (w1.hasKey(HIGHWAY) && w2.hasKey(HIGHWAY) && !Utils.equal(w1.get("level"), w2.get("level"))) {
                 return true;
             }
@@ -68 +72 @@
                 return true;
             }
-            if ((w1.hasTag("waterway", "river") && w2.hasTag("waterway", "riverbank"))
-                    || (w2.hasTag("waterway", "river") && w1.hasTag("waterway", "riverbank"))) {
+            if ((w1.hasTag(WATERWAY, "river") && w2.hasTag(WATERWAY, "riverbank"))
+                    || (w2.hasTag(WATERWAY, "river") && w1.hasTag(WATERWAY, "riverbank"))) {
                 return true;
             }
@@ -82 +86 @@
             if (isBuilding(w1)) {
                 return ("Crossing buildings");
-            } else if (w1.hasKey("waterway") && w2.hasKey("waterway")) {
+            } else if (w1.hasKey(WATERWAY) && w2.hasKey(WATERWAY)) {
                 return tr("Crossing waterways");
-            } else if ((w1.hasKey("highway") && w2.hasKey("waterway"))
-                    || (w2.hasKey("highway") && w1.hasKey("waterway"))) {
+            } else if ((w1.hasKey(HIGHWAY) && w2.hasKey(WATERWAY))
+                    || (w2.hasKey(HIGHWAY) && w1.hasKey(WATERWAY))) {
                 return tr("Crossing waterway/highway");
             } else {
@@ -207 +211 @@
 
     static boolean isSubwayOrTram(OsmPrimitive w) {
-        return w.hasTag("railway", "subway", "tram");
+        return w.hasTag(RAILWAY, "subway", "tram");
     }
 
     static boolean isProposedOrAbandoned(OsmPrimitive w) {
-        return w.hasTag("highway", "proposed") || w.hasTag("railway", "proposed", "abandoned");
+        return w.hasTag(HIGHWAY, "proposed") || w.hasTag(RAILWAY, "proposed", "abandoned");
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.FixableTestError;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -194 +191 @@
             return Collections.emptyList();
         }
+        final List<OpeningHoursTestError> errors = new ArrayList<OpeningHoursTestError>();
         try {
             final Object r = parse(value, mode);
-            final List<OpeningHoursTestError> errors = new ArrayList<OpeningHoursTestError>();
             String prettifiedValue = null;
             try {
@@ -212 +209 @@
                 errors.add(new OpeningHoursTestError(tr("opening_hours value can be prettified"), Severity.OTHER, prettifiedValue));
             }
-            return errors;
-        } catch (final Exception ex) {
-            throw new RuntimeException(ex);
-        }
+        } catch (ScriptException ex) {
+            Main.error(ex);
+        } catch (NoSuchMethodException ex) {
+            Main.error(ex);
+        }
+        return errors;
     }