Changeset 9514 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.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/UploadDialog.java (modified) (8 diffs)

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

@@ -20 +20 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -39 +41 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.Preferences.Setting;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -101 +105 @@
     private final transient ChangesetCommentModel changesetSourceModel = new ChangesetCommentModel();
 
+    private transient DataSet dataSet;
+
     /**
      * builds the content panel for the upload dialog
@@ -194 +200 @@
         // changes
         //
+        pnlChangesetManagement.addPropertyChangeListener(this);
         pnlChangesetManagement.addPropertyChangeListener(
                 pnlBasicUploadSettings.getUploadParameterSummaryPanel()
@@ -267 +274 @@
     }
 
+    /**
+     * Sets the tags for this upload based on (later items overwrite earlier ones):
+     * <ul>
+     * <li>previous "source" and "comment" input</li>
+     * <li>the tags set in the dataset (see {@link DataSet#getChangeSetTags()})</li>
+     * <li>the tags from the selected open changeset</li>
+     * <li>the JOSM user agent (see {@link Version#getAgentString(boolean)})</li>
+     * </ul>
+     *
+     * @param dataSet to obtain the tags set in the dataset
+     */
+    public void setChangesetTags(DataSet dataSet) {
+        final Map<String, String> tags = new HashMap<>();
+
+        // obtain from previos input
+        tags.put("source", getLastChangesetSourceFromHistory());
+        tags.put("comment", getLastChangesetCommentFromHistory());
+
+        // obtain from dataset
+        if (dataSet != null) {
+            tags.putAll(dataSet.getChangeSetTags());
+        }
+        this.dataSet = dataSet;
+
+        // obtain from selected open changeset
+        if (pnlChangesetManagement.getSelectedChangeset() != null) {
+            tags.putAll(pnlChangesetManagement.getSelectedChangeset().getKeys());
+        }
+
+        // set/adapt created_by
+        final String agent = Version.getInstance().getAgentString(false);
+        final 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);
+        }
+
+        // remove empty values
+        final Iterator<String> it = tags.keySet().iterator();
+        while (it.hasNext()) {
+            final String v = tags.get(it.next());
+            if (v == null || v.isEmpty()) {
+                it.remove();
+            }
+        }
+
+        pnlTagSettings.initFromTags(tags);
+        pnlTagSettings.tableChanged(null);
+    }
+
     @Override
     public void rememberUserInput() {
@@ -280 +338 @@
         pnlBasicUploadSettings.startUserInput();
         pnlTagSettings.startUserInput();
-        pnlTagSettings.initFromChangeset(pnlChangesetManagement.getSelectedChangeset());
         pnlUploadStrategySelectionPanel.initFromPreferences();
         UploadParameterSummaryPanel pnl = pnlBasicUploadSettings.getUploadParameterSummaryPanel();
@@ -310 +367 @@
     }
 
+    /**
+     * @deprecated No longer supported, does nothing; use {@link #setChangesetTags(DataSet)} instead!
+     */
+    @Deprecated
     public void setDefaultChangesetTags(Map<String, String> tags) {
-        pnlTagSettings.setDefaultTags(tags);
-        changesetCommentModel.setComment(tags.get("comment"));
-        changesetSourceModel.setComment(tags.get("source"));
     }
 
@@ -543 +601 @@
         if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
             Changeset cs = (Changeset) evt.getNewValue();
+            setChangesetTags(dataSet);
             if (cs == null) {
                 tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));