Changeset 4115 in josm for trunk/src

Timestamp:

2011-06-04T23:33:08+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) (1 diff)

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

@@ -146 +146 @@
         setChanged();
         notifyObservers();
-        fireCompletelyResolved();
+        /* 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();
     }