Changeset 13446 in josm

Timestamp:

2018-02-19T01:14:22+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - disable more actions modifying the dataset

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/relation/DownloadMembersAction.java (modified) (1 diff)
• actions/relation/DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)
• gui/dialogs/properties/PresetListPanel.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)

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

@@ -47 +47 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(!relations.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
+                && !relations.iterator().next().getDataSet().isReadOnly());
     }
 }

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

@@ -67 +67 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(!relations.isEmpty() && !incompleteMembers.isEmpty() && !Main.isOffline(OnlineResource.OSM_API));
+        setEnabled(!relations.isEmpty() && !incompleteMembers.isEmpty() && !Main.isOffline(OnlineResource.OSM_API)
+                && !relations.iterator().next().getDataSet().isReadOnly());
     }
 }

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

@@ -41 +41 @@
             int answer = t.showDialog(selection, false);
 
-            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY) {
+            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !selection.iterator().next().getDataSet().isReadOnly()) {
                 presetHandler.updateTags(t.getChangedTags());
             }

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

@@ -1271 +1271 @@
             Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
             String clipboard = ClipboardUtils.getClipboardStringContent();
-            if (sel.isEmpty() || clipboard == null)
+            if (sel.isEmpty() || clipboard == null || sel.iterator().next().getDataSet().isReadOnly())
                 return;
             MainApplication.undoRedo.add(new ChangePropertyCommand(sel, key, Utils.strip(clipboard)));

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -493 +493 @@
 
             answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
-                    sel.isEmpty(), showNewRelation).getValue();
+                    sel.isEmpty() || sel.iterator().next().getDataSet().isReadOnly(), showNewRelation).getValue();
         }
         if (!showNewRelation && answer == 2)