Changeset 1628 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-05-30T13:58:30+02:00 (15 years ago)

Author:

stoecker

Message:

cleanup group settings in preferences

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.historycombobox.StringUtils;
 import org.openstreetmap.josm.gui.historycombobox.SuggestingJHistoryComboBox;
 import org.openstreetmap.josm.io.OsmServerWriter;
@@ -38 +37 @@
  */
 public class UploadAction extends JosmAction {
-    
-    public static final String HISTORY_KEY = "upload.comment.history"; 
+
+    public static final String HISTORY_KEY = "upload.comment.history";
 
     /** Upload Hook */
@@ -103 +102 @@
                     p.add(new JScrollPane(l), GBC.eol().fill());
                 }
-                
+
                 p.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
                 SuggestingJHistoryComboBox cmt = new SuggestingJHistoryComboBox();
-                List<String> cmtHistory = StringUtils.stringToList(Main.pref.get(HISTORY_KEY), SuggestingJHistoryComboBox.DELIM);
+                List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, null));
                 cmt.setHistory(cmtHistory);
                 //final JTextField cmt = new JTextField(lastCommitComment);
@@ -112 +111 @@
 
                 while(true) {
-                    int result = new ExtendedDialog(Main.parent, 
-                        tr("Upload these changes?"), 
+                    int result = new ExtendedDialog(Main.parent,
+                        tr("Upload these changes?"),
                         p,
-                        new String[] {tr("Upload Changes"), tr("Cancel")}, 
+                        new String[] {tr("Upload Changes"), tr("Cancel")},
                         new String[] {"upload.png", "cancel.png"}).getValue();
-                    
+
                     // cancel pressed
                     if (result != 1) return false;
-                    
+
                     // don't allow empty commit message
                     if (cmt.getText().trim().length() < 3) continue;
-                    
+
                     // store the history of comments
                     cmt.addCurrentItemToHistory();
-                    Main.pref.put(HISTORY_KEY, StringUtils.listToString(cmt.getHistory(), SuggestingJHistoryComboBox.DELIM));
-                    
+                    Main.pref.putCollection(HISTORY_KEY, cmt.getHistory());
+
                     break;
                 }