Changeset 6654 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

Timestamp:

2014-01-06T21:46:07+01:00 (10 years ago)

Author:

simon04

Message:

fix #9514 fix #9484 fix #9502 - Upload dialog: make source field behave like comment field, provide link "obtain from current layers" to insert current layers in field, display Bing layer as "Bing"

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (2 diffs)

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

@@ -590 +590 @@
     }
 
-    public String getLastChangesetCommentFromHistory() {
-        Collection<String> history = Main.pref.getCollection(BasicUploadSettingsPanel.HISTORY_KEY, new ArrayList<String>());
+    private String getLastChangesetTagFromHistory(String historyKey) {
+        Collection<String> history = Main.pref.getCollection(historyKey, new ArrayList<String>());
         int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
         if (age < Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
@@ -599 +599 @@
         }
     }
+
+    public String getLastChangesetCommentFromHistory() {
+        return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.HISTORY_KEY);
+    }
+
+    public String getLastChangesetSourceFromHistory() {
+        return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.SOURCE_HISTORY_KEY);
+    }
 }