Index: applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
===================================================================
--- applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 35583)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 35858)
@@ -13,8 +13,5 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Collections;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.JComboBox;
@@ -24,5 +21,4 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -140,9 +136,5 @@
         descriptionField.setToolTipText(tr("Please enter Description about your trace."));
 
-        List<String> descHistory = new LinkedList<>(Config.getPref().getList("directupload.description.history", new LinkedList<String>()));
-        // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
-        // XXX this should be handled in HistoryComboBox
-        Collections.reverse(descHistory);
-        descriptionField.setPossibleItems(descHistory);
+        descriptionField.getModel().prefs().load("directupload.description.history");
 
         // tags
@@ -151,9 +143,5 @@
         tagsField.setToolTipText(tr("Please enter tags about your trace."));
 
-        List<String> tagsHistory = new LinkedList<>(Config.getPref().getList("directupload.tags.history", new LinkedList<String>()));
-        // we have to reverse the history, because ComboBoxHistory will reverse it againin addElement()
-        // XXX this should be handled in HistoryComboBox
-        Collections.reverse(tagsHistory);
-        tagsField.setPossibleItems(tagsHistory);
+        tagsField.getModel().prefs().load("directupload.tags.history");
 
         JPanel p = new JPanel(new GridBagLayout());
@@ -240,5 +228,5 @@
 
             if (canceled) {
-            	response.disconnect();
+                response.disconnect();
                 GuiHelper.runInEDT(new Runnable() {
                     @Override public void run() {
@@ -429,8 +417,8 @@
 
         descriptionField.addCurrentItemToHistory();
-        Config.getPref().putList("directupload.description.history", descriptionField.getHistory());
+        descriptionField.getModel().prefs().save("directupload.description.history");
 
         tagsField.addCurrentItemToHistory();
-        Config.getPref().putList("directupload.tags.history", tagsField.getHistory());
+        tagsField.getModel().prefs().save("directupload.tags.history");
 
         PleaseWaitRunnable uploadTask = new PleaseWaitRunnable(tr("Uploading GPX Track")){