Changeset 13925 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2018-06-13T00:05:31+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r13647 r13925 17 17 import org.openstreetmap.josm.Main; 18 18 import org.openstreetmap.josm.command.Command; 19 import org.openstreetmap.josm.data. SelectionChangedListener;19 import org.openstreetmap.josm.data.osm.DataSelectionListener; 20 20 import org.openstreetmap.josm.data.osm.DataSet; 21 21 import org.openstreetmap.josm.data.osm.OsmPrimitive; 22 22 import org.openstreetmap.josm.data.osm.OsmUtils; 23 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;24 23 import org.openstreetmap.josm.data.osm.event.SelectionEventManager; 25 24 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; … … 46 45 * layer/selection listeners that call {@link #updateEnabledState()} whenever the global context is changed. 47 46 * 48 * A JosmAction can register a {@link LayerChangeListener} and a {@link SelectionChangedListener}. Upon47 * A JosmAction can register a {@link LayerChangeListener} and a {@link DataSelectionListener}. Upon 49 48 * a layer change event or a selection change event it invokes {@link #updateEnabledState()}. 50 49 * Subclasses can override {@link #updateEnabledState()} in order to update the {@link #isEnabled()}-state … … 203 202 if (listenToSelectionChange()) { 204 203 selectionChangeAdapter = new SelectionChangeAdapter(); 205 SelectionEventManager.getInstance() 206 .addSelectionListener(selectionChangeAdapter, FireMode.IN_EDT_CONSOLIDATED); 204 SelectionEventManager.getInstance().addSelectionListenerForEdt(selectionChangeAdapter); 207 205 } 208 206 initEnabledState(); … … 220 218 /** 221 219 * Overwrite this if {@link #updateEnabledState()} should be called when the selection changed. Default is true. 222 * @return <code>true</code> if a {@link SelectionChangedListener} should be registered.220 * @return <code>true</code> if a {@link DataSelectionListener} should be registered. 223 221 * @since 10353 224 222 */ … … 237 235 } 238 236 if (selectionChangeAdapter != null) { 239 DataSet.removeSelectionListener(selectionChangeAdapter);237 SelectionEventManager.getInstance().removeSelectionListener(selectionChangeAdapter); 240 238 } 241 239 } … … 417 415 * Adapter for selection change events. Runs updateEnabledState() whenever the selection changed. 418 416 */ 419 protected class SelectionChangeAdapter implements SelectionChangedListener {420 @Override 421 public void selectionChanged( Collection<? extends OsmPrimitive> newSelection) {422 updateEnabledState( newSelection);417 protected class SelectionChangeAdapter implements DataSelectionListener { 418 @Override 419 public void selectionChanged(SelectionChangeEvent event) { 420 updateEnabledState(event.getSelection()); 423 421 } 424 422 -
trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
r13512 r13925 29 29 import org.openstreetmap.josm.command.SequenceCommand; 30 30 import org.openstreetmap.josm.data.Bounds; 31 import org.openstreetmap.josm.data.SelectionChangedListener;32 31 import org.openstreetmap.josm.data.coor.EastNorth; 32 import org.openstreetmap.josm.data.osm.DataSelectionListener; 33 33 import org.openstreetmap.josm.data.osm.DataSet; 34 34 import org.openstreetmap.josm.data.osm.Node; … … 36 36 import org.openstreetmap.josm.data.osm.Way; 37 37 import org.openstreetmap.josm.data.osm.WaySegment; 38 import org.openstreetmap.josm.data.osm.event.SelectionEventManager; 38 39 import org.openstreetmap.josm.data.preferences.CachingProperty; 39 40 import org.openstreetmap.josm.data.preferences.IntegerProperty; … … 59 60 * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011 60 61 */ 61 public class ImproveWayAccuracyAction extends MapMode implements 62 SelectionChangedListener, ModifierExListener { 62 public class ImproveWayAccuracyAction extends MapMode implements DataSelectionListener, ModifierExListener { 63 63 64 64 private static final String CROSSHAIR = /* ICON(cursor/)*/ "crosshair"; … … 154 154 map.mapView.addMouseMotionListener(this); 155 155 map.mapView.addTemporaryLayer(temporaryLayer); 156 DataSet.addSelectionListener(this);156 SelectionEventManager.getInstance().addSelectionListener(this); 157 157 158 158 map.keyDetector.addModifierExListener(this); … … 172 172 map.mapView.removeMouseMotionListener(this); 173 173 map.mapView.removeTemporaryLayer(temporaryLayer); 174 DataSet.removeSelectionListener(this);174 SelectionEventManager.getInstance().removeSelectionListener(this); 175 175 176 176 map.keyDetector.removeModifierExListener(this); … … 368 368 369 369 @Override 370 public void selectionChanged( Collection<? extends OsmPrimitive> newSelection) {370 public void selectionChanged(SelectionChangeEvent event) { 371 371 if (selectionChangedBlocked) { 372 372 return; -
trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java
r13611 r13925 13 13 import org.openstreetmap.josm.command.Command; 14 14 import org.openstreetmap.josm.command.SequenceCommand; 15 import org.openstreetmap.josm.data. SelectionChangedListener;15 import org.openstreetmap.josm.data.osm.DataSelectionListener; 16 16 import org.openstreetmap.josm.data.osm.DataSet; 17 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 28 28 * @since 5799 29 29 */ 30 public class AddSelectionToRelations extends AbstractRelationAction implements SelectionChangedListener {30 public class AddSelectionToRelations extends AbstractRelationAction implements DataSelectionListener { 31 31 /** 32 32 * Constructs a new <code>AddSelectionToRelation</code>. … … 69 69 } 70 70 71 @Override 72 public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) { 71 private void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) { 73 72 GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty() 74 73 && OsmUtils.isOsmCollectionEditable(relations))); 75 74 } 75 76 @Override 77 public void selectionChanged(SelectionChangeEvent event) { 78 selectionChanged(event.getSelection()); 79 } 76 80 }
Note:
See TracChangeset
for help on using the changeset viewer.