Changeset 2218 in josm for trunk

Timestamp:

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

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/PropertiesDialog.java (modified) (4 diffs)
• historycombobox (deleted)
• io/UploadDialog.java (modified) (3 diffs)
• widgets (added)
• widgets/AutoCompleteComboBox.java (moved) (moved from trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java ) (3 diffs)
• widgets/ComboBoxHistory.java (added)
• widgets/HistoryComboBox.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -26 +26 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -76 +75 @@
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.tools.AutoCompleteComboBox;
+import org.openstreetmap.josm.gui.widgets.AutoCompleteComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -529 +528 @@
         boolean top = Main.pref.getBoolean("properties.presets.top", true);
         bothTables.setLayout(new GridBagLayout());
-        if(top)
+        if(top) {
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
+        }
         bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
         bothTables.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
@@ -536 +536 @@
         bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
         bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
-        if(!top)
+        if(!top) {
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
+        }
 
         DblClickWatch dblClickWatch = new DblClickWatch();

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() {

trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.tools;
+package org.openstreetmap.josm.gui.widgets;
 
 import java.util.Collection;
@@ -55 +55 @@
             Object item = lookupItem(curText);
             setSelectedItem(item);
-            if(initial)
+            if(initial) {
                 start = 0;
+            }
             if (item != null) {
                 String newText = item.toString();
@@ -100 +101 @@
         Object oldValue = this.getEditor().getItem();
         model.removeAllElements();
-        for (String elem : elems) model.addElement(elem);
+        for (String elem : elems) {
+            model.addElement(elem);
+        }
         this.getEditor().setItem(oldValue);
     }