Changeset 17318 in josm for trunk

Timestamp:

2020-11-17T01:15:05+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20096 - restore comment initialization from dataset changeset hashtags if specified through remote control (regression from recent upload dialog changes)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/UploadDialog.java (modified) (3 diffs)
• tagging/TagModel.java (modified) (1 diff)

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

@@ -298 +298 @@
         if (!keepSourceComment) {
             tags.put("source", getLastChangesetSourceFromHistory());
-            tags.put("comment", getLastChangesetCommentFromHistory());
+            tags.put("comment", getCommentWithDataSetHashTag(getLastChangesetCommentFromHistory(), dataSet));
         }
 
@@ -330 +330 @@
         if (keepSourceComment) {
             tags.put("source", changesetSourceModel.getComment());
-            tags.put("comment", changesetCommentModel.getComment());
+            tags.put("comment", getCommentWithDataSetHashTag(changesetCommentModel.getComment(), dataSet));
         }
 
@@ -336 +336 @@
         pnlTagSettings.tableChanged(null);
         pnlBasicUploadSettings.discardAllUndoableEdits();
+    }
+
+    /**
+     * Returns the given comment with appended hashtags from dataset changeset tags, if not already present.
+     * @param comment changeset comment
+     * @param dataSet optional dataset, which can contain hashtags in its changeset tags
+     * @return comment with dataset changesets tags, if any, not duplicated
+     */
+    private static String getCommentWithDataSetHashTag(String comment, DataSet dataSet) {
+        String result = comment;
+        if (dataSet != null) {
+            String hashtags = dataSet.getChangeSetTags().get("hashtags");
+            if (hashtags != null) {
+                for (String hashtag : hashtags.split(";")) {
+                    String sanitizedHashtag = hashtag.startsWith("#") ? hashtag : "#" + hashtag;
+                    if (!result.contains(sanitizedHashtag)) {
+                        result = result + " " + sanitizedHashtag;
+                    }
+                }
+            }
+        }
+        return result;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java

@@ -144 +144 @@
         return values.size();
     }
+
+    @Override
+    public String toString() {
+        return name + "=" + values;
+    }
 }