Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r12630 r12636 155 155 @Override 156 156 public void showNotify() { 157 Main .getLayerManager().addAndFireActiveLayerChangeListener(this);157 MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this); 158 158 } 159 159 160 160 @Override 161 161 public void hideNotify() { 162 Main .getLayerManager().removeActiveLayerChangeListener(this);163 removeEditLayerListeners(Main .getLayerManager().getEditLayer());162 MainApplication.getLayerManager().removeActiveLayerChangeListener(this); 163 removeEditLayerListeners(MainApplication.getLayerManager().getEditLayer()); 164 164 } 165 165 … … 218 218 */ 219 219 public void refreshView() { 220 OsmDataLayer editLayer = Main .getLayerManager().getEditLayer();220 OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer(); 221 221 synchronized (this) { 222 222 conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts(); … … 483 483 } 484 484 } 485 DataSet ds = Main .getLayerManager().getEditDataSet();485 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 486 486 if (ds != null) { // Can't see how it is possible but it happened in #7942 487 487 ds.setSelected(sel);
Note:
See TracChangeset
for help on using the changeset viewer.