Ignore:
Timestamp:
2018-06-13T00:05:31+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #13467 - use DataSelectionListener everywhere. Deprecate SelectionChangedListener

Location:
trunk/src/org/openstreetmap/josm/gui/dialogs
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r13852 r13925  
    6161import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
    6262import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
     63import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
    6364import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
    6465import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
    … …  
    239240        newAction.updateEnabledState();
    240241        DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT);
    241         DataSet.addSelectionListener(addSelectionToRelations);
     242        SelectionEventManager.getInstance().addSelectionListener(addSelectionToRelations);
    242243        dataChanged(null);
    243244        ExpertToggleAction.addExpertModeChangeListener(this);
    … …  
    251252        MapView.removeZoomChangeListener(this);
    252253        DatasetEventManager.getInstance().removeDatasetListener(this);
    253         DataSet.removeSelectionListener(addSelectionToRelations);
     254        SelectionEventManager.getInstance().removeSelectionListener(addSelectionToRelations);
    254255        ExpertToggleAction.removeExpertModeChangeListener(this);
    255256    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r13564 r13925  
    4242import org.openstreetmap.josm.actions.relation.EditRelationAction;
    4343import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
    44 import org.openstreetmap.josm.data.SelectionChangedListener;
     44import org.openstreetmap.josm.data.osm.DataSelectionListener;
    4545import org.openstreetmap.josm.data.osm.DataSet;
    4646import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    … …  
    6565import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
    6666import org.openstreetmap.josm.gui.MainApplication;
     67import org.openstreetmap.josm.gui.PopupMenuHandler;
    6768import org.openstreetmap.josm.gui.PrimitiveRenderer;
    68 import org.openstreetmap.josm.gui.PopupMenuHandler;
    6969import org.openstreetmap.josm.gui.SideButton;
    7070import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
    … …  
    165165    @Override
    166166    public void showNotify() {
    167         SelectionEventManager.getInstance().addSelectionListener(actShowHistory, FireMode.IN_EDT_CONSOLIDATED);
    168         SelectionEventManager.getInstance().addSelectionListener(model, FireMode.IN_EDT_CONSOLIDATED);
     167        SelectionEventManager.getInstance().addSelectionListenerForEdt(actShowHistory);
     168        SelectionEventManager.getInstance().addSelectionListenerForEdt(model);
    169169        DatasetEventManager.getInstance().addDatasetListener(model, FireMode.IN_EDT);
    170170        MainApplication.getLayerManager().addActiveLayerChangeListener(actSearch);
    … …  
    339339     * The action for showing history information of the current history item.
    340340     */
    341     class ShowHistoryAction extends AbstractAction implements ListSelectionListener, SelectionChangedListener {
     341    class ShowHistoryAction extends AbstractAction implements ListSelectionListener, DataSelectionListener {
    342342        /**
    343343         * Constructs a new {@code ShowHistoryAction}.
    … …  
    372372
    373373        @Override
    374         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    375             updateEnabledState(newSelection.size());
     374        public void selectionChanged(SelectionChangeEvent event) {
     375            updateEnabledState(event.getSelection().size());
    376376        }
    377377    }
    … …  
    461461     */
    462462    static class SelectionListModel extends AbstractListModel<OsmPrimitive>
    463     implements ActiveLayerChangeListener, SelectionChangedListener, DataSetListener {
     463    implements ActiveLayerChangeListener, DataSelectionListener, DataSetListener {
    464464
    465465        private static final int SELECTION_HISTORY_SIZE = 10;
    … …  
    673673
    674674        /* ------------------------------------------------------------------------ */
    675         /* interface SelectionChangedListener                                       */
     675        /* interface DataSelectionListener                                          */
    676676        /* ------------------------------------------------------------------------ */
    677677        @Override
    678         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    679             setJOSMSelection(newSelection);
     678        public void selectionChanged(SelectionChangeEvent event) {
     679            setJOSMSelection(event.getSelection());
    680680        }
    681681

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r13905 r13925  
    3434import org.openstreetmap.josm.actions.relation.EditRelationAction;
    3535import org.openstreetmap.josm.command.Command;
    36 import org.openstreetmap.josm.data.SelectionChangedListener;
     36import org.openstreetmap.josm.data.osm.DataSelectionListener;
    3737import org.openstreetmap.josm.data.osm.DataSet;
    3838import org.openstreetmap.josm.data.osm.Node;
    3939import org.openstreetmap.josm.data.osm.OsmPrimitive;
    4040import org.openstreetmap.josm.data.osm.WaySegment;
     41import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
    4142import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
    4243import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
    … …  
    7273 * @author frsantos
    7374 */
    74 public class ValidatorDialog extends ToggleDialog implements SelectionChangedListener, ActiveLayerChangeListener {
     75public class ValidatorDialog extends ToggleDialog implements DataSelectionListener, ActiveLayerChangeListener {
    7576
    7677    /** The display tree */
    … …  
    181182    @Override
    182183    public void showNotify() {
    183         DataSet.addSelectionListener(this);
     184        SelectionEventManager.getInstance().addSelectionListener(this);
    184185        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
    185186        if (ds != null) {
    … …  
    192193    public void hideNotify() {
    193194        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
    194         DataSet.removeSelectionListener(this);
     195        SelectionEventManager.getInstance().removeSelectionListener(this);
    195196    }
    196197
    … …  
    585586
    586587    @Override
    587     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    588         updateSelection(newSelection);
     588    public void selectionChanged(SelectionChangeEvent event) {
     589        updateSelection(event.getSelection());
    589590    }
    590591

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r13854 r13925  
    5959import org.openstreetmap.josm.command.ChangePropertyCommand;
    6060import org.openstreetmap.josm.command.Command;
    61 import org.openstreetmap.josm.data.SelectionChangedListener;
    6261import org.openstreetmap.josm.data.osm.AbstractPrimitive;
     62import org.openstreetmap.josm.data.osm.DataSelectionListener;
    6363import org.openstreetmap.josm.data.osm.DataSet;
    6464import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    … …  
    124124 */
    125125public class PropertiesDialog extends ToggleDialog
    126 implements SelectionChangedListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener {
     126implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener {
    127127
    128128    /**
    … …  
    512512    public void showNotify() {
    513513        DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
    514         SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
     514        SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
    515515        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
    516516        for (JosmAction action : josmActions) {
    … …  
    549549
    550550    @Override
    551     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
     551    public void selectionChanged(SelectionChangeEvent event) {
    552552        if (!isVisible())
    553553            return;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r13434 r13925  
    2121import javax.swing.table.AbstractTableModel;
    2222
    23 import org.openstreetmap.josm.data.SelectionChangedListener;
    24 import org.openstreetmap.josm.data.osm.DataSet;
     23import org.openstreetmap.josm.data.osm.DataSelectionListener;
    2524import org.openstreetmap.josm.data.osm.OsmPrimitive;
    2625import org.openstreetmap.josm.data.osm.Relation;
    … …  
    3332import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
    3433import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
     34import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
    3535import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
    3636import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
    … …  
    5353 */
    5454public class MemberTableModel extends AbstractTableModel
    55 implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPrimitivesTableModel {
     55implements TableModelListener, DataSelectionListener, DataSetListener, OsmPrimitivesTableModel {
    5656
    5757    /**
    … …  
    9797     */
    9898    public void register() {
    99         DataSet.addSelectionListener(this);
     99        SelectionEventManager.getInstance().addSelectionListener(this);
    100100        getLayer().data.addDataSetListener(this);
    101101    }
    … …  
    105105     */
    106106    public void unregister() {
    107         DataSet.removeSelectionListener(this);
     107        SelectionEventManager.getInstance().removeSelectionListener(this);
    108108        getLayer().data.removeDataSetListener(this);
    109109    }
    110110
    111111    /* --------------------------------------------------------------------------- */
    112     /* Interface SelectionChangedListener                                          */
     112    /* Interface DataSelectionListener                                             */
    113113    /* --------------------------------------------------------------------------- */
    114114    @Override
    115     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
     115    public void selectionChanged(SelectionChangeEvent event) {
    116116        if (MainApplication.getLayerManager().getActiveDataLayer() != this.layer) return;
    117117        // just trigger a repaint

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

    r13434 r13925  
    77import javax.swing.table.AbstractTableModel;
    88
    9 import org.openstreetmap.josm.data.SelectionChangedListener;
    10 import org.openstreetmap.josm.data.osm.DataSet;
     9import org.openstreetmap.josm.data.osm.DataSelectionListener;
    1110import org.openstreetmap.josm.data.osm.OsmPrimitive;
     11import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
    1212import org.openstreetmap.josm.gui.MainApplication;
    1313import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
    … …  
    2222/**
    2323 * This table shows the primitives that are currently selected in the main OSM view.
     24 * @since 1790
    2425 */
    25 public class SelectionTableModel extends AbstractTableModel implements SelectionChangedListener, ActiveLayerChangeListener, LayerChangeListener {
     26public class SelectionTableModel extends AbstractTableModel implements DataSelectionListener, ActiveLayerChangeListener, LayerChangeListener {
    2627
    2728    /** this selection table model only displays selected primitives in this layer */
    … …  
    4647     */
    4748    public void register() {
    48         DataSet.addSelectionListener(this);
     49        SelectionEventManager.getInstance().addSelectionListener(this);
    4950        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
    5051    }
    … …  
    5455     */
    5556    public void unregister() {
    56         DataSet.removeSelectionListener(this);
     57        SelectionEventManager.getInstance().removeSelectionListener(this);
    5758        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
    5859    }
    … …  
    106107
    107108    @Override
    108     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
     109    public void selectionChanged(SelectionChangeEvent event) {
     110        selectionChanged(event.getSelection());
     111    }
     112
     113    private void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    109114        if (layer == MainApplication.getLayerManager().getActiveDataLayer()) {
    110115            cache.clear();
    … …  
    116121    }
    117122
     123    /**
     124     * Returns the selected primitives.
     125     * @return the selected primitives
     126     */
    118127    public List<OsmPrimitive> getSelection() {
    119128        return cache;
Note: See TracChangeset for help on using the changeset viewer.