Changeset 6408 in josm for trunk/src

Timestamp:

2013-11-23T20:34:59+01:00 (11 years ago)

Author:

simon04

Message:

fix #9349 - see #6381 - fix intermixing of changeset source and comment

File:

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

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

@@ -37 +37 @@
     public static final String HISTORY_KEY = "upload.comment.history";
     public static final String HISTORY_LAST_USED_KEY = "upload.comment.last-used";
-    public static final String SOURCE_HISTORY_KEY = "upload.comment.source";
+    public static final String SOURCE_HISTORY_KEY = "upload.source.history";
 
     /** the history combo box for the upload comment */
@@ -67 +67 @@
         List<String> sourceHistory = new LinkedList<String>(Main.pref.getCollection(SOURCE_HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
-        hcbUploadComment.setPossibleItems(sourceHistory);
+        hcbUploadSource.setPossibleItems(sourceHistory);
         final CommentModelListener sourceModelListener = new CommentModelListener(hcbUploadSource, changesetSourceModel);
         hcbUploadSource.getEditor().addActionListener(sourceModelListener);