Changeset 4115 in josm


Ignore:
Timestamp:
2011-06-04T23:33:08+02:00 (10 years ago)
Author:
stoecker
Message:

fix #4564 - conflict manager: highlight conflict on properties

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

    r3362 r4115  
    146146        setChanged();
    147147        notifyObservers();
    148         fireCompletelyResolved();
     148        /* call fire directly, to allow null as old value, otherwise the call can be
     149           optimized away when resolvedCompletely is false. */
     150        support.firePropertyChange(RESOLVED_COMPLETELY_PROP, null, resolvedCompletely);
     151        //fireCompletelyResolved();
    149152    }
    150153
Note: See TracChangeset for help on using the changeset viewer.