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

Timestamp:

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

Author:

stoecker

Message:

cleanup group settings in preferences

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.gui.historycombobox.JHistoryComboBox;
-import org.openstreetmap.josm.gui.historycombobox.StringUtils;
 
 /**
@@ -34 +33 @@
      */
     public Collection<OsmPrimitive> processed;
-   
 
     private OsmApi api = new OsmApi();
-    
+
     private static final int MSECS_PER_SECOND = 1000;
     private static final int SECONDS_PER_MINUTE = 60;
@@ -62 +60 @@
 
     /**
-     * Send the dataset to the server. 
+     * Send the dataset to the server.
      * @param the_version version of the data set
      * @param list list of objects to send
@@ -68 +66 @@
     public void uploadOsm(String the_version, Collection<OsmPrimitive> list) {
         processed = new LinkedList<OsmPrimitive>();
-        
+
         // initialize API. Abort upload in case of configuration or network
         // errors
@@ -87 +85 @@
             return;
         }
-        
 
         Main.pleaseWaitDlg.progress.setMaximum(list.size());
@@ -93 +90 @@
 
         boolean useChangesets = api.hasChangesetSupport();
-        
+
         // controls whether or not we try and upload the whole bunch in one go
         boolean useDiffUploads = Main.pref.getBoolean("osm-server.atomic-upload",
@@ -103 +100 @@
                 // add the last entered comment to the changeset
                 String cmt = "";
-                List<String> history = StringUtils.stringToList(Main.pref.get(UploadAction.HISTORY_KEY), JHistoryComboBox.DELIM);
+                List<String> history = new LinkedList<String>(Main.pref.getCollection(UploadAction.HISTORY_KEY, null));
                 if(history.size() > 0) {
                     cmt = history.get(0);
@@ -161 +158 @@
             // has successfully cancelled the data upload
             //
-            return; 
+            return;
         }
-        
-        JOptionPane.showMessageDialog(Main.parent, 
+
+        JOptionPane.showMessageDialog(Main.parent,
             /* tr("Error during upload: ") + */ e.getMessage());
     }