Changeset 32058 in osm for applications/editors/josm

Timestamp:

2016-02-09T16:58:35+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/wikipedia: Existing wikipedia/wikidata tag is silently replaced - see #josm12512

Location:

applications/editors/josm/plugins/wikipedia/src/org/wikipedia

Files:

• FetchWikidataAction.java (modified) (3 diffs)
• GuiUtils.java (added)
• WikipediaToggleDialog.java (modified) (1 diff)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/FetchWikidataAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -124 +125 @@
                     "Fetching {0} Wikidata IDs for language ''{1}''", size, size, lang));
             final Map<String, String> wikidataByWikipedia = WikipediaApp.getWikidataForArticles(lang, byArticle.keySet());
+            ConditionalOptionPaneUtil.startBulkOperation(GuiUtils.PREF_OVERWRITE);
             for (Map.Entry<String, Set<OsmPrimitive>> i : byArticle.entrySet()) {
                 final String wikipedia = i.getKey();
                 final String wikidata = wikidataByWikipedia.get(wikipedia);
                 if (wikidata != null) {
-                    commands.add(new ChangePropertyCommand(i.getValue(), "wikidata", wikidata));
+                    if (GuiUtils.confirmOverwrite("wikidata", wikidata, i.getValue())) {
+                        commands.add(new ChangePropertyCommand(i.getValue(), "wikidata", wikidata));
+                    }
                 } else {
                     final WikipediaApp.WikipediaLangArticle article = new WikipediaApp.WikipediaLangArticle(lang, wikipedia);
@@ -135 +139 @@
                 }
             }
+            ConditionalOptionPaneUtil.endBulkOperation(GuiUtils.PREF_OVERWRITE);
             monitor.finishTask();
         }

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java

@@ -269 +269 @@
                 if (tag != null) {
                     final Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getSelected();
+                    if (!GuiUtils.confirmOverwrite(tag.getKey(), tag.getValue(), selected)) {
+                        return;
+                    }
                     ChangePropertyCommand cmd = new ChangePropertyCommand(
                             selected,