Changeset 2658 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
- Timestamp:
- 2009-12-19T14:06:51+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r2657 r2658 71 71 import org.openstreetmap.josm.gui.dialogs.ToggleDialog; 72 72 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; 73 import org.openstreetmap.josm.gui.layer.Layer;74 73 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 75 74 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference; … … 97 96 * @author imi 98 97 */ 99 public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView. LayerChangeListener {98 public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener { 100 99 /** 101 100 * Watches for double clicks and from editing or new property, depending on the … … 145 144 public void showNotify() { 146 145 DatasetEventManager.getInstance().addDatasetListener(listOfUsedTags, false); 146 listOfUsedTags.rebuildNecessary(); 147 DataSet.selListeners.add(this); 148 updateSelection(); 147 149 } 148 150 … … 150 152 public void hideNotify() { 151 153 DatasetEventManager.getInstance().removeDatasetListener(listOfUsedTags); 154 DataSet.selListeners.remove(this); 152 155 } 153 156 … … 568 571 add(buttonPanel, BorderLayout.SOUTH); 569 572 570 DataSet.selListeners.add(this); 571 MapView.addLayerChangeListener(this); 573 MapView.addEditLayerChangeListener(this); 572 574 } 573 575 574 576 @Override 575 577 public void tearDown() { 576 MapView.remove LayerChangeListener(this);578 MapView.removeEditLayerChangeListener(this); 577 579 } 578 580 … … 776 778 } 777 779 780 private void updateSelection() { 781 if (Main.main.getCurrentDataSet() == null) { 782 selectionChanged(Collections.<OsmPrimitive>emptyList()); 783 } else { 784 selectionChanged(Main.main.getCurrentDataSet().getSelected()); 785 } 786 } 787 778 788 /* ---------------------------------------------------------------------------------- */ 779 /* LayerChangeListener */789 /* EditLayerChangeListener */ 780 790 /* ---------------------------------------------------------------------------------- */ 781 public void activeLayerChange(Layer oldLayer, Layer newLayer) { 782 if (newLayer instanceof OsmDataLayer) { 783 OsmDataLayer dataLayer = (OsmDataLayer)newLayer; 784 selectionChanged(dataLayer.data.getSelected()); 785 } else { 786 List<OsmPrimitive> selection = Collections.emptyList(); 787 selectionChanged(selection); 788 } 789 } 790 791 public void layerAdded(Layer newLayer) { 792 // do nothing 793 } 794 795 public void layerRemoved(Layer oldLayer) { 796 // do nothing 791 public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { 792 updateSelection(); 797 793 } 798 794
Note:
See TracChangeset
for help on using the changeset viewer.