Changeset 2979 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2010-02-14T13:07:03+01:00 (11 years ago)

Author:

Gubaer

Message:

fixed #4386: "There are unsolved conflicts in layer X" holds up any uploading from the layer

File:

• trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -3 +3 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 
 /**
@@ -42 +43 @@
     }
 
+    /**
+     * Replies true if the primitive <code>primitive</code> is participating
+     * in this conflict
+     * 
+     * @param primitive the primitive
+     * @return true if the primitive <code>primitive</code> is participating
+     * in this conflict
+     */
+    public boolean isParticipating(OsmPrimitive primitive) {
+        if (primitive == null) return false;
+        return primitive.getPrimitiveId().equals(my.getPrimitiveId())
+        || primitive.getPrimitiveId().equals(their.getPrimitiveId());
+    }
+
+    /**
+     * Replies true if the primitive with id <code>id</code> is participating
+     * in this conflict
+     * 
+     * @param id the primitive id
+     * @return true if the primitive <code>primitive</code> is participating
+     * in this conflict
+     */
+    public boolean isParticipating(PrimitiveId id) {
+        if (id == null) return false;
+        return id.equals(my.getPrimitiveId())
+        || id.equals(their.getPrimitiveId());
+    }
+
     @Override
     public int hashCode() {