Changeset 3078 in josm


Ignore:
Timestamp:
2010-03-04T14:14:15+01:00 (11 years ago)
Author:
bastiK
Message:

fixed #4593 - conflict list and header not updated right away after undo/redo

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r3010 r3078  
    111111    }
    112112
     113    /**
     114     * Adds a edit layer change listener
     115     *
     116     * @param listener the listener. Ignored if null or already registered.
     117     * @param initialFire Fire an edit-layer-changed-event right after adding the listener.
     118     */
     119    public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) {
     120        addEditLayerChangeListener(listener);
     121        if (initialFire) {
     122            if (Main.map != null && Main.map.mapView != null && Main.map.mapView.getEditLayer() != null) {
     123                fireEditLayerChanged(null, Main.map.mapView.getEditLayer());
     124            }
     125        }
     126    }
     127
    113128    public static void addEditLayerChangeListener(EditLayerChangeListener listener) {
    114129        if (listener != null) {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r3058 r3078  
    122122    public void showNotify() {
    123123        DataSet.selListeners.add(this);
    124         MapView.addEditLayerChangeListener(this);
     124        MapView.addEditLayerChangeListener(this, true);
    125125        refreshView();
    126126    }
     
    151151        lstConflicts.setSelectedIndex(index);
    152152
    153         refreshView();
    154153        Main.map.mapView.repaint();
    155154    }
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r2985 r3078  
    389389                    ht("/Concepts/Conflict#WarningAboutDetectedConflicts")
    390390            );
     391            Main.map.conflictDialog.unfurlDialog();
     392            Main.map.repaint();
    391393        }
    392394    }
Note: See TracChangeset for help on using the changeset viewer.