Changeset 14588 in josm for trunk/src

Timestamp:

2018-12-22T19:03:47+01:00 (6 years ago)

Author:

GerdP

Message:

fix findbugs, remove redundant code

One small side effect: test "self-crossing" is now "self-crossing ways" in the progress monitor

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (5 diffs)

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

@@ -224 +224 @@
 
         @Override
-        MessageHelper createMessage(Way w1, Way w2) {
-            return new MessageHelper(tr("Crossing boundaries"), CROSSING_BOUNDARIES);
-        }
-
-        @Override
         public void visit(Relation r) {
             for (Way w : r.getMemberPrimitives(Way.class)) {
@@ -260 +255 @@
         }
 
-        @Override
-        MessageHelper createMessage(Way w1, Way w2) {
-            return new MessageHelper(tr("Crossing barriers"), CROSSING_BARRIERS);
-        }
     }
 
@@ -281 +272 @@
          */
         public SelfCrossing() {
-            super(tr("Self crossing"), CROSSING_SELF);
+            super(tr("Self crossing ways"), CROSSING_SELF);
         }
 
@@ -293 +284 @@
         boolean ignoreWaySegmentCombination(Way w1, Way w2) {
             return w1 != w2; // should not happen
-        }
-
-        @Override
-        MessageHelper createMessage(Way w1, Way w2) {
-            return new MessageHelper(tr("Self-crossing ways"), CROSSING_SELF);
         }
     }
@@ -351 +337 @@
     abstract boolean ignoreWaySegmentCombination(Way w1, Way w2);
 
-    abstract MessageHelper createMessage(Way w1, Way w2);
+    MessageHelper createMessage(Way w1, Way w2) {
+        return new MessageHelper(this.name, this.code);
+    }
 
     @Override