Changeset 13956 in josm for trunk

Timestamp:

2018-06-18T20:29:06+02:00 (6 years ago)

Author:

Don-vip

Message:

use IPrimitive in *CopyActions from PropertiesDialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• dialogs/properties/AbstractCopyAction.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -532 +532 @@
         } else {
             DataSet ds = layerManager.getActiveDataSet();
-            if (ds == null) return null;
+            if (ds == null) return Collections.emptyList();
             return ds.getSelected();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java

@@ -46 +46 @@
         Set<String> values = new TreeSet<>();
         Collection<? extends Tagged> sel = objectSupplier.get();
-        if (rows.length == 0 || sel.isEmpty()) return;
+        if (rows.length == 0 || sel == null || sel.isEmpty()) return;
 
         for (int row: rows) {
             String key = keySupplier.apply(row);
-            if (sel.isEmpty())
-                return;
             for (Tagged p : sel) {
                 Collection<String> s = getString(p, key);

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

@@ -67 +67 @@
 import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -182 +183 @@
     private final PasteValueAction pasteValueAction = new PasteValueAction();
     private final CopyValueAction copyValueAction = new CopyValueAction(
-            tagTable, editHelper::getDataKey, Main.main::getInProgressSelection);
+            tagTable, editHelper::getDataKey, Main.main::getInProgressISelection);
     private final CopyKeyValueAction copyKeyValueAction = new CopyKeyValueAction(
-            tagTable, editHelper::getDataKey, Main.main::getInProgressSelection);
+            tagTable, editHelper::getDataKey, Main.main::getInProgressISelection);
     private final CopyAllKeyValueAction copyAllKeyValueAction = new CopyAllKeyValueAction(
-            tagTable, editHelper::getDataKey, Main.main::getInProgressSelection);
+            tagTable, editHelper::getDataKey, Main.main::getInProgressISelection);
     private final SearchAction searchActionSame = new SearchAction(true);
     private final SearchAction searchActionAny = new SearchAction(false);
@@ -650 +651 @@
         membershipTable.setVisible(membershipData.getRowCount() > 0);
 
-        DataSet ds = Main.main.getActiveDataSet();
+        OsmData<?, ?, ?, ?> ds = MainApplication.getLayerManager().getActiveData();
         boolean isReadOnly = ds != null && ds.isLocked();
         boolean hasSelection = !newSel.isEmpty();