- Timestamp:
- 2010-03-04T14:14:15+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapView.java
r3010 r3078 111 111 } 112 112 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 113 128 public static void addEditLayerChangeListener(EditLayerChangeListener listener) { 114 129 if (listener != null) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r3058 r3078 122 122 public void showNotify() { 123 123 DataSet.selListeners.add(this); 124 MapView.addEditLayerChangeListener(this );124 MapView.addEditLayerChangeListener(this, true); 125 125 refreshView(); 126 126 } … … 151 151 lstConflicts.setSelectedIndex(index); 152 152 153 refreshView();154 153 Main.map.mapView.repaint(); 155 154 } -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r2985 r3078 389 389 ht("/Concepts/Conflict#WarningAboutDetectedConflicts") 390 390 ); 391 Main.map.conflictDialog.unfurlDialog(); 392 Main.map.repaint(); 391 393 } 392 394 }
Note:
See TracChangeset
for help on using the changeset viewer.