Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/actions/relation

Timestamp:

2018-02-18T05:02:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AddSelectionToRelations.java (modified) (3 diffs)
• DeleteRelationsAction.java (modified) (2 diffs)
• DuplicateRelationAction.java (modified) (1 diff)
• EditRelationAction.java (modified) (2 diffs)
• SelectMembersAction.java (modified) (1 diff)
• SelectRelationAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -14 +14 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -39 +40 @@
         Collection<Command> cmds = new LinkedList<>();
         for (Relation orig : relations) {
-            Command c = GenericRelationEditor.addPrimitivesToRelation(orig, MainApplication.getLayerManager().getEditDataSet().getSelected());
+            Command c = GenericRelationEditor.addPrimitivesToRelation(orig, MainApplication.getLayerManager().getActiveDataSet().getSelected());
             if (c != null) {
                 cmds.add(c);
@@ -57 +58 @@
     @Override
     public void updateEnabledState() {
-        putValue(NAME, trn("Add selection to {0} relation", "Add selection to {0} relations",
-                relations.size(), relations.size()));
+        int size = relations.size();
+        putValue(NAME, trn("Add selection to {0} relation", "Add selection to {0} relations", size, size));
+        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+        if (ds != null) {
+            selectionChanged(ds.getSelected());
+        } else {
+            setEnabled(false);
+        }
     }
 
     @Override
     public void selectionChanged(final Collection<? extends OsmPrimitive> newSelection) {
-        GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty()));
+        GuiHelper.runInEDT(() -> setEnabled(newSelection != null && !newSelection.isEmpty() && !relations.isEmpty()
+                && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly)));
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -47 +48 @@
         deleteRelation(relations);
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(!relations.isEmpty() && relations.stream().map(Relation::getDataSet).noneMatch(DataSet::isReadOnly));
+    }
 }

trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java

@@ -52 +52 @@
     protected void updateEnabledState() {
         // only one selected relation can be edited
-        setEnabled(relations.size() == 1);
+        setEnabled(relations.size() == 1 && !relations.iterator().next().getDataSet().isReadOnly());
     }
 }

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -88 +89 @@
     protected void updateEnabledState() {
         boolean enabled = false;
-        for (Relation r : relations) {
-            if (!r.isDeleted()) {
-                enabled = true;
-                break;
+        if (relations.stream().map(r -> r.getDataSet()).noneMatch(DataSet::isReadOnly)) {
+            for (Relation r : relations) {
+                if (!r.isDeleted()) {
+                    enabled = true;
+                    break;
+                }
             }
         }

trunk/src/org/openstreetmap/josm/actions/relation/SelectMembersAction.java

@@ -43 +43 @@
         }
         if (add) {
-            MainApplication.getLayerManager().getEditLayer().data.addSelected(members);
+            MainApplication.getLayerManager().getActiveDataSet().addSelected(members);
         } else {
-            MainApplication.getLayerManager().getEditLayer().data.setSelected(members);
+            MainApplication.getLayerManager().getActiveDataSet().setSelected(members);
         }
     }

trunk/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -34 +34 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled() || relations.isEmpty()) return;
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer == null || editLayer.data == null) return;
+        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+        if (ds == null) return;
         if (add) {
-            editLayer.data.addSelected(relations);
+            ds.addSelected(relations);
         } else {
-            editLayer.data.setSelected(relations);
+            ds.setSelected(relations);
         }
     }