Changeset 2940 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

Timestamp:

05.02.2010 01:34:07 (2 years ago)

Author:

mjulius

Message:

display list of referrers in ConflictResolutionDialog

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -65 +65 @@
     private boolean myVisibleState;
     private boolean theirVisibleState;
+    private List<OsmPrimitive> myReferrers;
+    private List<OsmPrimitive> theirReferrers;
     private MergeDecisionType deletedMergeDecision;
     private MergeDecisionType visibleMergeDecision;
@@ -175 +177 @@
         theirVisibleState = their.isVisible();
 
+        myReferrers = my.getReferrers();
+        theirReferrers = their.getReferrers();
+
         coordMergeDecision = UNDECIDED;
         deletedMergeDecision = UNDECIDED;
@@ -270 +275 @@
     public  Boolean getTheirVisibleState() {
         return theirVisibleState;
+    }
+
+    /**
+     * returns my referrers,
+     * @return my referrers
+     */
+    public List<OsmPrimitive> getMyReferrers() {
+        return myReferrers;
+    }
+
+    /**
+     * returns their referrers,
+     * @return their referrers
+     */
+    public List<OsmPrimitive> getTheirReferrers() {
+        return theirReferrers;
     }