Changeset 9514 in josm for trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java

Timestamp:

2016-01-17T22:38:38+01:00 (8 years ago)

Author:

simon04

Message:

fix #4003 fix #7004 fix #8149 - Improve changeset tags handling (from earlier changeset, from dataset)

File:

• trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java

@@ -3 +3 @@
 
 import java.awt.BorderLayout;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Observable;
@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.tagging.TagModel;
@@ -26 +26 @@
     private final transient ChangesetCommentModel changesetCommentModel;
     private final transient ChangesetCommentModel changesetSourceModel;
-    /** tags that applied to uploaded changesets by default*/
-    private final transient Map<String, String> defaultTags = new HashMap<>();
 
     protected void build() {
@@ -81 +79 @@
 
     /**
-     * Initialize panel from changeset.
-     * @param cs changeset
+     * Initialize panel from the given tags.
+     * @param tags the tags used to initialize the panel
      */
-    public void initFromChangeset(Changeset cs) {
-        Map<String, String> tags = getDefaultTags();
-        if (cs != null) {
-            tags.putAll(cs.getKeys());
-        }
-        if (tags.get("comment") == null) {
-            tags.put("comment", getTagEditorValue("comment"));
-        }
-        if (tags.get("source") == null) {
-            tags.put("source", getTagEditorValue("source"));
-        }
-        String agent = Version.getInstance().getAgentString(false);
-        String created_by = tags.get("created_by");
-        if (created_by == null || created_by.isEmpty()) {
-            tags.put("created_by", agent);
-        } else if (!created_by.contains(agent)) {
-            tags.put("created_by", created_by + ';' + agent);
-        }
+    public void initFromTags(Map<String, String> tags) {
         pnlTagEditor.getModel().initFromTags(tags);
     }
@@ -115 +96 @@
 
     /**
-     * Replies the map with the default tags.
-     * @return the map with the default tags
+     * @return an empty map
+     * @deprecated No longer supported, returns an empty map
      */
+    @Deprecated
     public Map<String, String> getDefaultTags() {
-        Map<String, String> tags = new HashMap<>();
-        tags.putAll(defaultTags);
-        return tags;
+        return Collections.emptyMap();
     }
 
     /**
-     * Sets the map with the default tags.
-     * @param tags the map with the default tags
+     * @param tags ignored
+     * @deprecated No longer supported, does nothing; use {@link UploadDialog#setChangesetTags(DataSet)} instead!
      */
+    @Deprecated
     public void setDefaultTags(Map<String, String> tags) {
-        defaultTags.clear();
-        defaultTags.putAll(tags);
-        tableChanged(null);
     }