Changeset 4116 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2011-06-05T10:13:09+02:00 (13 years ago)

Author:

stoecker

Message:

fix #4564 - conflict manager: highlight conflict on properties

File:

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

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

@@ -54 +54 @@
     private MergeDecisionType deletedMergeDecision;
     private final PropertyChangeSupport support;
-    private boolean resolvedCompletely;
+    private Boolean resolvedCompletely;
 
     public void addPropertyChangeListener(PropertyChangeListener listener) {
@@ -65 +65 @@
 
     public void fireCompletelyResolved() {
-        boolean oldValue = resolvedCompletely;
+        Boolean oldValue = resolvedCompletely;
         resolvedCompletely = isResolvedCompletely();
         support.firePropertyChange(RESOLVED_COMPLETELY_PROP, oldValue, resolvedCompletely);
@@ -74 +74 @@
         deletedMergeDecision = UNDECIDED;
         support = new PropertyChangeSupport(this);
-        resolvedCompletely = false;
+        resolvedCompletely = null;
     }
 
@@ -146 +146 @@
         setChanged();
         notifyObservers();
-        /* call fire directly, to allow null as old value, otherwise the call can be
-           optimized away when resolvedCompletely is false. */
-        support.firePropertyChange(RESOLVED_COMPLETELY_PROP, null, resolvedCompletely);
-        //fireCompletelyResolved();
+        fireCompletelyResolved();
     }