Changeset 34346 in osm for applications

Timestamp:

2018-06-23T13:07:00+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13959

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/RelContextDialog.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13807"/>
+    <property name="plugin.main.version" value="13959"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -63 +63 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.IPrimitive;
@@ -105 +106 @@
  * @author Zverik
  */
-public class RelContextDialog extends ToggleDialog implements ActiveLayerChangeListener, ChosenRelationListener, SelectionChangedListener {
+public class RelContextDialog extends ToggleDialog implements ActiveLayerChangeListener, ChosenRelationListener, DataSelectionListener {
 
     public static final String PREF_PREFIX = "reltoolbox";
@@ -347 +348 @@
     @Override
     public void showNotify() {
-        SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
         MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         DatasetEventManager.getInstance().addDatasetListener(chosenRelation, FireMode.IN_EDT);
@@ -361 +362 @@
             chosenRelationPanel.setVisible(newRelation != null);
         }
-        if (MainApplication.getLayerManager().getEditDataSet() != null) {
-            selectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            doSelectionChanged(ds.getSelected());
         }
         roleBoxModel.update();
@@ -368 +370 @@
 
     @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    public void selectionChanged(SelectionChangeEvent event) {
+        doSelectionChanged(event.getSelection());
+    }
+
+    private void doSelectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         if (!isVisible() || relationsData == null)
             return;
@@ -413 +419 @@
     private void updateSelection() {
         if (MainApplication.getLayerManager().getEditDataSet() == null) {
-            selectionChanged(Collections.<OsmPrimitive>emptyList());
+            doSelectionChanged(Collections.<OsmPrimitive>emptyList());
         } else {
-            selectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
+            doSelectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
         }
     }