Changeset 4116 in josm


Ignore:
Timestamp:
2011-06-05T10:13:09+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

    r4115 r4116  
    5454    private MergeDecisionType deletedMergeDecision;
    5555    private final PropertyChangeSupport support;
    56     private boolean resolvedCompletely;
     56    private Boolean resolvedCompletely;
    5757
    5858    public void addPropertyChangeListener(PropertyChangeListener listener) {
     
    6565
    6666    public void fireCompletelyResolved() {
    67         boolean oldValue = resolvedCompletely;
     67        Boolean oldValue = resolvedCompletely;
    6868        resolvedCompletely = isResolvedCompletely();
    6969        support.firePropertyChange(RESOLVED_COMPLETELY_PROP, oldValue, resolvedCompletely);
     
    7474        deletedMergeDecision = UNDECIDED;
    7575        support = new PropertyChangeSupport(this);
    76         resolvedCompletely = false;
     76        resolvedCompletely = null;
    7777    }
    7878
     
    146146        setChanged();
    147147        notifyObservers();
    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();
     148        fireCompletelyResolved();
    152149    }
    153150
Note: See TracChangeset for help on using the changeset viewer.