Changeset 34455 in osm for applications/editors/josm

Timestamp:

2018-08-13T22:36:04+02:00 (6 years ago)

Author:

donvip

Message:

fix deprecation warnings

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger

Files:

• MultiTagAction.java (modified) (2 diffs)
• MultiTagDialog.java (modified) (3 diffs)
• MultiTaggerTableModel.java (modified) (4 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagAction.java

@@ -35 +35 @@
             return;
         dlg = new MultiTagDialog();
-        dlg.selectionChanged(getLayerManager().getEditDataSet().getSelected());
+        dlg.doSelectionChanged(getLayerManager().getEditDataSet().getSelected());
         dlg.showDialog();
     }
@@ -48 +48 @@
         setEnabled(getLayerManager().getEditLayer() != null);
         if (dlg != null && dlg.isVisible()) {
-            dlg.selectionChanged(selection);
+            dlg.doSelectionChanged(selection);
         }
     }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagDialog.java

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -66 +66 @@
  * Dialog for editing multiple object tags
  */
-public class MultiTagDialog extends ExtendedDialog implements SelectionChangedListener {
+public class MultiTagDialog extends ExtendedDialog implements DataSelectionListener {
 
     private final MultiTaggerTableModel tableModel = new MultiTaggerTableModel();
@@ -167 +167 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        tableModel.selectionChanged(newSelection);
+    public void selectionChanged(SelectionChangeEvent event) {
+        tableModel.selectionChanged(event);
+    }
+
+    void doSelectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+        tableModel.doSelectionChanged(newSelection);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTaggerTableModel.java

@@ -15 +15 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -26 +26 @@
  * Model of the multi tag table.
  */
-public class MultiTaggerTableModel extends AbstractTableModel implements SelectionChangedListener {
+public class MultiTaggerTableModel extends AbstractTableModel implements DataSelectionListener {
 
     ArrayList<OsmPrimitive> list = new ArrayList<>(50);
@@ -54 +54 @@
         this.watchSelection = watchSelection;
         if (watchSelection && MainApplication.getLayerManager().getEditLayer() != null)
-            selectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
+            doSelectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
     }
 
@@ -95 +95 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
+        doSelectionChanged(event.getSelection());
+    }
+
+    public void doSelectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         if (watchSelection)
             updateData(newSelection);