Changeset 13637 in josm for trunk/src/org

Timestamp:

2018-04-15T19:14:17+02:00 (7 years ago)

Author:

Don-vip

Message:

minor fixes

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/AbstractPrimitive.java (modified) (1 diff)
• osm/OsmUtils.java (modified) (1 diff)
• validation/tests/DuplicateRelation.java (modified) (1 diff)
• validation/tests/RelationChecker.java (modified) (1 diff)

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

@@ -21 +21 @@
 
 /**
-* Abstract class to represent common features of the datatypes primitives.
-*
-* @since 4099
-*/
+ * Abstract class to represent common features of the datatypes primitives.
+ *
+ * @since 4099
+ */
 public abstract class AbstractPrimitive implements IPrimitive {
 

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

@@ -147 +147 @@
      * @return the value of "layer" key, or null if absent or set to 0 (default value)
      * @since 12986
+     * @since 13637 (signature)
      */
-    public static String getLayer(OsmPrimitive w) {
+    public static String getLayer(IPrimitive w) {
         String layer1 = w.get("layer");
         if ("0".equals(layer1)) {

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

@@ -280 +280 @@
 
         // Fix relations.
-        if (relationWithRelations != null && relationToKeep != relationWithRelations) {
+        if (relationWithRelations != null && relRef != null && relationToKeep != relationWithRelations) {
             for (Relation rel : relRef) {
                 Relation newRel = new Relation(rel);

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

@@ -339 +339 @@
     @Override
     public Command fixError(TestError testError) {
-        if (isFixable(testError) && !testError.getPrimitives().iterator().next().isDeleted()) {
-            return new DeleteCommand(testError.getPrimitives());
+        Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
+        if (isFixable(testError) && !primitives.iterator().next().isDeleted()) {
+            return new DeleteCommand(primitives);
         }
         return null;