Changeset 10332 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java
- Timestamp:
- 2016-06-07T08:22:39+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapView.java
r10304 r10332 396 396 LayerChangeAdapter adapter = new LayerChangeAdapter(listener, initialFire); 397 397 Main.getLayerManager().addLayerChangeListener(adapter, false); 398 Main.getLayerManager().addActiveLayerChangeListener(adapter, initialFire); 398 if (initialFire) { 399 Main.getLayerManager().addAndFireActiveLayerChangeListener(adapter); 400 } else { 401 Main.getLayerManager().addActiveLayerChangeListener(adapter); 402 } 399 403 adapter.receiveOneInitialFire = false; 400 404 } … … 414 418 public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) { 415 419 if (listener != null) { 416 Main.getLayerManager().addActiveLayerChangeListener(new EditLayerChangeAdapter(listener), 417 initialFire && Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null); 420 boolean doFire = initialFire && Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null; 421 if (doFire) { 422 Main.getLayerManager().addAndFireActiveLayerChangeListener(new EditLayerChangeAdapter(listener)); 423 } else { 424 Main.getLayerManager().addActiveLayerChangeListener(new EditLayerChangeAdapter(listener)); 425 } 418 426 } 419 427 } … … 484 492 initialViewport = viewportData; 485 493 layerManager.addLayerChangeListener(this); 486 layerManager.addActiveLayerChangeListener(this , false);494 layerManager.addActiveLayerChangeListener(this); 487 495 Main.pref.addPreferenceChangeListener(this); 488 496
Note:
See TracChangeset
for help on using the changeset viewer.