Changeset 5956 in josm for trunk/src

Timestamp:

2013-05-11T22:03:13+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8701 - Do not include OS details in changeset created_by tag

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (2 diffs)
• gui/io/TagSettingsPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -216 +216 @@
      */
     public String getAgentString() {
+        return getAgentString(true);
+    }
+
+    /**
+     * Returns the User-Agent string, with or without OS details
+     * @param includeOsDetails Append Operating System details at the end of the User-Agent
+     * @return The User-Agent
+     * @since 5956
+     */
+    public String getAgentString(boolean includeOsDetails) {
         int v = getVersion();
         String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
@@ -224 +234 @@
             s += " SVN";
         }
-        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+") " + Main.platform.getOSDescription();
+        String result = "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
+        if (includeOsDetails) {
+            result += " " + Main.platform.getOSDescription();
+        }
+        return result;
     }
 

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

@@ -84 +84 @@
             tags.put("comment", currentComment);
         }
-        String agent = Version.getInstance().getAgentString();
+        String agent = Version.getInstance().getAgentString(false);
         String created_by = tags.get("created_by");
         if (created_by == null || created_by.isEmpty()) {