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

Timestamp:

2009-09-30T10:51:31+02:00 (17 years ago)

Author:

Gubaer

Message:

see #3371: Fatal freeze trying to enter a changeset comment

File:

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

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

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.historycombobox.SuggestingJHistoryComboBox;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.tagging.TagModel;
+import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.GBC;
@@ -588 +588 @@
         private JCheckBox cbCloseAfterUpload;
         private OpenChangesetModel model;
-        private SuggestingJHistoryComboBox cmt;
+        private HistoryComboBox cmt;
         private JCheckBox cbUseAtomicUpload;
 
@@ -616 +616 @@
             pnl.setLayout(new GridBagLayout());
             pnl.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
-            cmt = new SuggestingJHistoryComboBox();
+            cmt = new HistoryComboBox();
             List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
-            cmt.setHistory(cmtHistory);
+            cmt.setPossibleItems(cmtHistory);
             cmt.getEditor().addActionListener(
                     new ActionListener() {