Changeset 7015 in josm for trunk

Timestamp:

2014-04-27T17:34:22+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - fix generics for JComboBox/JList

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/MultiValueCellEditor.java (modified) (4 diffs)
• conflict/tags/RelationMemberConflictDecisionEditor.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• oauth/AuthorizationProcedureComboBox.java (modified) (1 diff)
• preferences/display/GPXSettingsPanel.java (modified) (5 diffs)
• preferences/display/LafPreference.java (modified) (2 diffs)
• preferences/display/LanguagePreference.java (modified) (4 diffs)
• preferences/imagery/AddWMSLayerPanel.java (modified) (2 diffs)
• preferences/imagery/CommonSettingsPanel.java (modified) (2 diffs)
• preferences/imagery/WMSSettingsPanel.java (modified) (2 diffs)
• preferences/projection/CodeProjectionChoice.java (modified) (1 diff)
• preferences/projection/LambertCC9ZonesProjectionChoice.java (modified) (2 diffs)
• preferences/projection/LambertProjectionChoice.java (modified) (2 diffs)
• preferences/projection/ListProjectionChoice.java (modified) (6 diffs)
• preferences/projection/ProjectionPreference.java (modified) (1 diff)
• preferences/projection/UTMProjectionChoice.java (modified) (7 diffs)
• preferences/shortcut/PrefJPanel.java (modified) (2 diffs)
• tagging/TaggingPresetItems.java (modified) (9 diffs)
• tagging/TaggingPresetSelector.java (modified) (1 diff)
• tagging/ac/AutoCompletingComboBox.java (modified) (13 diffs)
• widgets/ComboBoxHistory.java (modified) (3 diffs)
• widgets/HistoryComboBox.java (modified) (2 diffs)
• widgets/JosmComboBox.java (modified) (13 diffs)
• widgets/OsmPrimitiveTypesComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

@@ -48 +48 @@
 
     /** the combo box used as editor */
-    private JosmComboBox editor;
-    private DefaultComboBoxModel editorModel;
+    private JosmComboBox<Object> editor;
+    private DefaultComboBoxModel<Object> editorModel;
     private CopyOnWriteArrayList<NavigationListener> listeners;
 
@@ -78 +78 @@
      */
     public MultiValueCellEditor() {
-        editorModel = new DefaultComboBoxModel();
-        editor = new JosmComboBox(editorModel) {
+        editorModel = new DefaultComboBoxModel<>();
+        editor = new JosmComboBox<Object>(editorModel) {
             @Override
             public void processKeyEvent(KeyEvent e) {
@@ -172 +172 @@
      *
      */
-    private static class EditorCellRenderer extends JLabel implements ListCellRenderer {
+    private static class EditorCellRenderer extends JLabel implements ListCellRenderer<Object> {
 
         /**
@@ -224 +224 @@
 
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             renderColors(isSelected);
             renderValue(value);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class RelationMemberConflictDecisionEditor extends JosmComboBox implements TableCellEditor {
+public class RelationMemberConflictDecisionEditor extends JosmComboBox<RelationMemberConflictDecisionType> implements TableCellEditor {
 
     /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -154 +154 @@
          * @see Arrays#asList(Object[])
          */
-        public static List list(Object... args) {
+        public static List<Object> list(Object... args) {
             return Arrays.asList(args);
         }

trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class AuthorizationProcedureComboBox extends JosmComboBox {
+public class AuthorizationProcedureComboBox extends JosmComboBox<AuthorizationProcedure> {
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -61 +61 @@
     private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
     private JRadioButton colorTypeGlobal  = new JRadioButton(tr("Use global settings"));
-    private JosmComboBox colorTypeVelocityTune = new JosmComboBox(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
+    private JosmComboBox<String> colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
     private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX"));
     private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
@@ -67 +67 @@
     private JosmTextField drawGpsArrowsMinDist = new JosmTextField(8);
     private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
-    private JosmComboBox waypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
+    private JosmComboBox<String> waypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
     private JosmTextField waypointLabelPattern = new JosmTextField();
-    private JosmComboBox audioWaypointLabel = new JosmComboBox(LABEL_PATTERN_DESC);
+    private JosmComboBox<String> audioWaypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
     private JosmTextField audioWaypointLabelPattern = new JosmTextField();
     private JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)"));
@@ -368 +368 @@
     }
 
-
     /**
      * Save preferences from UI controls, globally or for a specified layer.
@@ -443 +442 @@
     }
 
-    private void updateWaypointLabelCombobox(JosmComboBox cb, JosmTextField tf, TemplateEntryProperty property) {
+    private void updateWaypointLabelCombobox(JosmComboBox<String> cb, JosmTextField tf, TemplateEntryProperty property) {
         String labelPattern = property.getAsString();
         boolean found = false;
@@ -460 +459 @@
     }
 
-    private void updateWaypointPattern(JosmComboBox cb, JosmTextField tf) {
+    private void updateWaypointPattern(JosmComboBox<String> cb, JosmTextField tf) {
         if (cb.getSelectedIndex() == WAYPOINT_LABEL_CUSTOM) {
             tf.setEnabled(true);

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -49 +49 @@
      * ComboBox with all look and feels.
      */
-    private JosmComboBox lafCombo;
+    private JosmComboBox<LookAndFeelInfo> lafCombo;
     JPanel panel;
     private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
@@ -59 +59 @@
     @Override
     public void addGui(PreferenceTabbedPane gui) {
-        lafCombo = new JosmComboBox(UIManager.getInstalledLookAndFeels());
+        lafCombo = new JosmComboBox<>(UIManager.getInstalledLookAndFeels());
 
         // let's try to load additional LookAndFeels and put them into the list

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -44 +44 @@
 
     /** the combo box with the available locales */
-    private JosmComboBox langCombo;
+    private JosmComboBox<Locale> langCombo;
 
     @Override
@@ -52 +52 @@
         // See https://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
         model.selectLanguage(Main.pref.get("language"));
-        langCombo = new JosmComboBox(model);
+        langCombo = new JosmComboBox<>(model);
         langCombo.setRenderer(new LanguageCellRenderer(langCombo.getRenderer()));
 
@@ -75 +75 @@
     }
 
-    private static class LanguageComboBoxModel extends DefaultComboBoxModel {
+    private static class LanguageComboBoxModel extends DefaultComboBoxModel<Locale> {
         private final List<Locale> data = new ArrayList<>();
 
@@ -99 +99 @@
 
         @Override
-        public Object getElementAt(int index) {
+        public Locale getElementAt(int index) {
             return data.get(index);
         }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -38 +38 @@
     private final JCheckBox endpoint = new JCheckBox(tr("Store WMS endpoint only, select layers at usage"));
     private final WMSLayerTree tree = new WMSLayerTree();
-    private final JComboBox formats = new JComboBox();
+    private final JComboBox<String> formats = new JComboBox<>();
     private final JLabel wmsInstruction;
     private final JosmTextArea wmsUrl = new JosmTextArea(3, 40);
@@ -77 +77 @@
                     wms.attemptGetCapabilities(rawUrl.getText());
                     tree.updateTree(wms);
-                    formats.setModel(new DefaultComboBoxModel(wms.getFormats().toArray()));
+                    formats.setModel(new DefaultComboBoxModel<>(wms.getFormats().toArray(new String[0])));
                     formats.setSelectedItem(wms.getPreferredFormats());
                 } catch (MalformedURLException ex) {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -30 +30 @@
     private final JButton btnFadeColor;
     private final JSlider fadeAmount = new JSlider(0, 100);
-    private final JosmComboBox sharpen;
+    private final JosmComboBox<String> sharpen;
 
     /**
@@ -65 +65 @@
         add(this.fadeAmount, GBC.eol().fill(GBC.HORIZONTAL));
 
-        this.sharpen = new JosmComboBox(new String[] {
+        this.sharpen = new JosmComboBox<>(new String[] {
                 tr("None"),
                 tr("Soft"),

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java

@@ -27 +27 @@
     // WMS Settings
     private final JCheckBox autozoomActive;
-    private final JosmComboBox browser;
+    private final JosmComboBox<String> browser;
     private final JCheckBox overlapCheckBox;
     private final JSpinner spinEast;
@@ -46 +46 @@
 
         // Downloader
-        browser = new JosmComboBox(new String[] {
+        browser = new JosmComboBox<>(new String[] {
                 "webkit-image {0}",
                 "gnome-web-photo --mode=photo --format=png {0} /dev/stdout",

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

@@ -115 +115 @@
             filter.getDocument().addDocumentListener(this);
 
-            selectionList = new JList(data.toArray());
+            selectionList = new JList<>(data.toArray(new String[0]));
             selectionList.setModel(model = new ProjectionCodeListModel());
             JScrollPane scroll = new JScrollPane(selectionList);

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

@@ -37 +37 @@
 
     private class LambertCC9CBPanel extends CBPanel {
-        public LambertCC9CBPanel(Object[] entries, int initialIndex, String label, ActionListener listener) {
+        public LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
             this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
@@ -85 +85 @@
 
     @Override
-    protected String indexToZone(int index) {
-        return Integer.toString(index + 1);
+    protected String indexToZone(int idx) {
+        return Integer.toString(idx + 1);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

@@ -32 +32 @@
 
     private class LambertCBPanel extends CBPanel {
-        public LambertCBPanel(Object[] entries, int initialIndex, String label, ActionListener listener) {
+        public LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
             this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
@@ -79 +79 @@
 
     @Override
-    protected String indexToZone(int index) {
-        return Integer.toString(index + 1);
+    protected String indexToZone(int idx) {
+        return Integer.toString(idx + 1);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

@@ -21 +21 @@
     protected int index;        // 0-based index
     protected int defaultIndex;
-    protected Object[] entries;
+    protected String[] entries;
     protected String label;
 
@@ -33 +33 @@
      * @param defaultIndex the default index for the combo-box
      */
-    public ListProjectionChoice(String name, String id, Object[] entries, String label, int defaultIndex) {
+    public ListProjectionChoice(String name, String id, String[] entries, String label, int defaultIndex) {
         super(name, id);
         this.entries = Utils.copyArray(entries);
@@ -47 +47 @@
      * @param label a label shown left to the combo-box
      */
-    public ListProjectionChoice(String name, String id, Object[] entries, String label) {
+    public ListProjectionChoice(String name, String id, String[] entries, String label) {
         this(name, id, entries, label, 0);
     }
@@ -54 +54 @@
      * Convert 0-based index to preference value.
      */
-    protected abstract String indexToZone(int index);
+    protected abstract String indexToZone(int idx);
 
     /**
@@ -67 +67 @@
             zone = args.iterator().next();
         }
-        int index;
+        int idx;
         if (zone == null) {
-            index = defaultIndex;
+            idx = defaultIndex;
         } else {
-            index = zoneToIndex(zone);
-            if (index < 0 || index >= entries.length) {
-                index = defaultIndex;
+            idx = zoneToIndex(zone);
+            if (idx < 0 || idx >= entries.length) {
+                idx = defaultIndex;
             }
         }
-        this.index = index;
+        this.index = idx;
     }
 
     protected class CBPanel extends JPanel {
-        public JosmComboBox prefcb;
+        public JosmComboBox<String> prefcb;
 
-        public CBPanel(Object[] entries, int initialIndex, String label, final ActionListener listener) {
-            prefcb = new JosmComboBox(entries);
+        public CBPanel(String[] entries, int initialIndex, String label, final ActionListener listener) {
+            prefcb = new JosmComboBox<>(entries);
 
             prefcb.setSelectedIndex(initialIndex);
@@ -109 +109 @@
         }
         CBPanel p = (CBPanel) panel;
-        int index = p.prefcb.getSelectedIndex();
-        return Collections.singleton(indexToZone(index));
+        int idx = p.prefcb.getSelectedIndex();
+        return Collections.singleton(indexToZone(idx));
     }
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

@@ -258 +258 @@
      * Combobox with all projections available
      */
-    private final JosmComboBox projectionCombo = new JosmComboBox(projectionChoices.toArray());
+    private final JosmComboBox<ProjectionChoice> projectionCombo = new JosmComboBox<>(projectionChoices.toArray(new ProjectionChoice[0]));
 
     /**
      * Combobox with all coordinate display possibilities
      */
-    private final JosmComboBox coordinatesCombo = new JosmComboBox(CoordinateFormat.values());
-
-    private final JosmComboBox unitsCombo = new JosmComboBox(unitsValuesTr);
+    private final JosmComboBox<CoordinateFormat> coordinatesCombo = new JosmComboBox<>(CoordinateFormat.values());
+
+    private final JosmComboBox<String> unitsCombo = new JosmComboBox<>(unitsValuesTr);
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

@@ -44 +44 @@
      */
     public UTMProjectionChoice() {
-        super(tr("UTM"), "core:utm", cbEntries.toArray(), tr("UTM Zone"));
+        super(tr("UTM"), "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone"));
     }
 
@@ -51 +51 @@
         public JRadioButton north, south;
 
-        public UTMPanel(Object[] entries, int initialIndex, String label, ActionListener listener) {
+        public UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
 
-            //Hemisphere
             north = new JRadioButton();
             north.setSelected(hemisphere == Hemisphere.North);
@@ -110 +109 @@
         }
         UTMPanel p = (UTMPanel) panel;
-        int index = p.prefcb.getSelectedIndex();
-        Hemisphere hemisphere = p.south.isSelected()?Hemisphere.South:Hemisphere.North;
-        return Arrays.asList(indexToZone(index), hemisphere.toString());
+        int idx = p.prefcb.getSelectedIndex();
+        Hemisphere hem = p.south.isSelected()?Hemisphere.South:Hemisphere.North;
+        return Arrays.asList(indexToZone(idx), hem.toString());
     }
 
@@ -119 +118 @@
         List<String> projections = new ArrayList<>(60*4);
         for (int zone = 1;zone <= 60; zone++) {
-            for (Hemisphere hemisphere : Hemisphere.values()) {
-                projections.add("EPSG:" + (32600 + zone + (hemisphere == Hemisphere.South?100:0)));
+            for (Hemisphere hem : Hemisphere.values()) {
+                projections.add("EPSG:" + (32600 + zone + (hem == Hemisphere.South?100:0)));
             }
         }
@@ -131 +130 @@
         if (code.startsWith("EPSG:326") || code.startsWith("EPSG:327")) {
             try {
-                Hemisphere hemisphere = code.charAt(7)=='6'?Hemisphere.North:Hemisphere.South;
+                Hemisphere hem = code.charAt(7)=='6'?Hemisphere.North:Hemisphere.South;
                 String zonestring = code.substring(8);
                 int zoneval = Integer.parseInt(zonestring);
                 if(zoneval > 0 && zoneval <= 60)
-                    return Arrays.asList(zonestring, hemisphere.toString());
+                    return Arrays.asList(zonestring, hem.toString());
             } catch(NumberFormatException e) {
                 Main.warn(e);
@@ -146 +145 @@
     public void setPreferences(Collection<String> args) {
         super.setPreferences(args);
-        Hemisphere hemisphere = DEFAULT_HEMISPHERE;
+        Hemisphere hem = DEFAULT_HEMISPHERE;
 
         if (args != null) {
@@ -152 +151 @@
 
             if (array.length > 1) {
-                hemisphere = Hemisphere.valueOf(array[1]);
+                hem = Hemisphere.valueOf(array[1]);
             }
         }
-        this.hemisphere = hemisphere;
+        this.hemisphere = hem;
     }
 
     @Override
-    protected String indexToZone(int index) {
-        return Integer.toString(index + 1);
+    protected String indexToZone(int idx) {
+        return Integer.toString(idx + 1);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -97 +97 @@
     private JCheckBox cbDefault = new JCheckBox();
     private JCheckBox cbDisable = new JCheckBox();
-    private JosmComboBox tfKey = new JosmComboBox();
+    private JosmComboBox<String> tfKey = new JosmComboBox<>();
 
     JTable shortcutTable = new JTable();
@@ -218 +218 @@
         cbAlt.setText(ALT); // see above for why no tr()
         tfKey.setAction(action);
-        tfKey.setModel(new DefaultComboBoxModel(keyList.values().toArray()));
+        tfKey.setModel(new DefaultComboBoxModel<>(keyList.values().toArray(new String[0])));
         cbMeta.setAction(action);
         cbMeta.setText(META); // see above for why no tr()

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -618 +618 @@
             } else {
                 // the objects have different values
-                JosmComboBox comboBox = new JosmComboBox(usage.values.toArray());
+                JosmComboBox<String> comboBox = new JosmComboBox<>(usage.values.toArray(new String[0]));
                 comboBox.setEditable(true);
                 comboBox.setEditor(textField);
@@ -697 +697 @@
         private static String getValue(Component comp) {
             if (comp instanceof JosmComboBox) {
-                return ((JosmComboBox) comp).getEditor().getItem().toString();
+                return ((JosmComboBox<?>) comp).getEditor().getItem().toString();
             } else if (comp instanceof JosmTextField) {
                 return ((JosmTextField) comp).getText();
@@ -1174 +1174 @@
 
         public boolean editable = true;
-        protected JosmComboBox combo;
+        protected JosmComboBox<PresetListEntry> combo;
         public String length;
 
@@ -1198 +1198 @@
             lhm.put("", new PresetListEntry(""));
 
-            combo = new JosmComboBox(lhm.values().toArray());
+            combo = new JosmComboBox<>(lhm.values().toArray(new PresetListEntry[0]));
             component = combo;
             combo.setRenderer(getListCellRenderer());
@@ -1265 +1265 @@
         @Override
         protected void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches) {
-            list = new ConcatenatingJList(delimiter, lhm.values().toArray());
+            list = new ConcatenatingJList(delimiter, lhm.values().toArray(new PresetListEntry[0]));
             component = list;
-            ListCellRenderer renderer = getListCellRenderer();
+            ListCellRenderer<PresetListEntry> renderer = getListCellRenderer();
             list.setCellRenderer(renderer);
 
@@ -1315 +1315 @@
     * string (extracted from TaggingPreset)
     */
-    private static class ConcatenatingJList extends JList {
+    private static class ConcatenatingJList extends JList<PresetListEntry> {
         private String delimiter;
-        public ConcatenatingJList(String del, Object[] o) {
+        public ConcatenatingJList(String del, PresetListEntry[] o) {
             super(o);
             delimiter = del;
@@ -1328 +1328 @@
                 String s = o.toString();
                 TreeSet<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
-                ListModel lm = getModel();
+                ListModel<PresetListEntry> lm = getModel();
                 int[] intParts = new int[lm.getSize()];
                 int j = 0;
                 for (int i = 0; i < lm.getSize(); i++) {
-                    if (parts.contains((((PresetListEntry)lm.getElementAt(i)).value))) {
+                    if (parts.contains((lm.getElementAt(i).value))) {
                         intParts[j++]=i;
                     }
@@ -1345 +1345 @@
 
         public String getSelectedItem() {
-            ListModel lm = getModel();
+            ListModel<PresetListEntry> lm = getModel();
             int[] si = getSelectedIndices();
             StringBuilder builder = new StringBuilder();
@@ -1352 +1352 @@
                     builder.append(delimiter);
                 }
-                builder.append(((PresetListEntry)lm.getElementAt(si[i])).value);
+                builder.append(lm.getElementAt(si[i]).value);
             }
             return builder.toString();

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java

@@ -82 +82 @@
     private static class ResultListCellRenderer extends DefaultListCellRenderer {
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
-                boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             JLabel result = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
             TaggingPreset tp = (TaggingPreset)value;

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -30 +30 @@
  * @author guilhem.bonnefille@gmail.com
  */
-public class AutoCompletingComboBox extends JosmComboBox {
+public class AutoCompletingComboBox extends JosmComboBox<AutoCompletionListItem> {
 
     private boolean autocompleteEnabled = true;
@@ -43 +43 @@
      */
     class AutoCompletingComboBoxDocument extends PlainDocument {
-        private JosmComboBox comboBox;
+        private JosmComboBox<AutoCompletionListItem> comboBox;
         private boolean selecting = false;
 
-        public AutoCompletingComboBoxDocument(final JosmComboBox comboBox) {
+        public AutoCompletingComboBoxDocument(final JosmComboBox<AutoCompletionListItem> comboBox) {
             this.comboBox = comboBox;
         }
@@ -114 +114 @@
                 }
             }
-            JTextComponent editor = (JTextComponent)comboBox.getEditor().getEditorComponent();
+            JTextComponent editorComponent = (JTextComponent)comboBox.getEditor().getEditorComponent();
             // save unix system selection (middle mouse paste)
             Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection();
             if(sysSel != null) {
                 Transferable old = sysSel.getContents(null);
-                editor.select(start, end);
+                editorComponent.select(start, end);
                 sysSel.setContents(old, null);
             } else {
-                editor.select(start, end);
+                editorComponent.select(start, end);
             }
         }
@@ -133 +133 @@
 
         private Object lookupItem(String pattern, boolean match) {
-            ComboBoxModel model = comboBox.getModel();
+            ComboBoxModel<AutoCompletionListItem> model = comboBox.getModel();
             AutoCompletionListItem bestItem = null;
             for (int i = 0, n = model.getSize(); i < n; i++) {
@@ -153 +153 @@
      */
     public AutoCompletingComboBox() {
-        this(JosmComboBox.DEFAULT_PROTOTYPE_DISPLAY_VALUE);
+        this("Foo");
     }
 
@@ -165 +165 @@
         super(new AutoCompletionListItem(prototype));
         setRenderer(new AutoCompleteListCellRenderer());
-        final JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
-        editor.setDocument(new AutoCompletingComboBoxDocument(this));
-        editor.addFocusListener(
+        final JTextComponent editorComponent = (JTextComponent) this.getEditor().getEditorComponent();
+        editorComponent.setDocument(new AutoCompletingComboBoxDocument(this));
+        editorComponent.addFocusListener(
                 new FocusListener() {
                     @Override
@@ -178 +178 @@
                         if(sysSel != null) {
                             Transferable old = sysSel.getContents(null);
-                            editor.selectAll();
+                            editorComponent.selectAll();
                             sysSel.setContents(old, null);
                         } else {
-                            editor.selectAll();
+                            editorComponent.selectAll();
                         }
                     }
@@ -188 +188 @@
     }
 
-    public void setMaxTextLength(int length)
-    {
+    public void setMaxTextLength(int length) {
         this.maxTextLength = length;
     }
 
     /**
-     * Convert the selected item into a String
-     * that can be edited in the editor component.
+     * Convert the selected item into a String that can be edited in the editor component.
      *
-     * @param editor    the editor
+     * @param cbEditor    the editor
      * @param item      excepts AutoCompletionListItem, String and null
      */
-    @Override public void configureEditor(ComboBoxEditor editor, Object item) {
+    @Override
+    public void configureEditor(ComboBoxEditor cbEditor, Object item) {
         if (item == null) {
-            editor.setItem(null);
+            cbEditor.setItem(null);
         } else if (item instanceof String) {
-            editor.setItem(item);
+            cbEditor.setItem(item);
         } else if (item instanceof AutoCompletionListItem) {
-            editor.setItem(((AutoCompletionListItem)item).getValue());
+            cbEditor.setItem(((AutoCompletionListItem)item).getValue());
         } else
             throw new IllegalArgumentException();
@@ -215 +214 @@
      * @param item      excepts AutoCompletionListItem, String and null
      */
-    @Override public void setSelectedItem(Object item) {
+    @Override
+    public void setSelectedItem(Object item) {
         if (item == null) {
             super.setSelectedItem(null);
@@ -239 +239 @@
      */
     public void setPossibleItems(Collection<String> elems) {
-        DefaultComboBoxModel model = (DefaultComboBoxModel)this.getModel();
+        DefaultComboBoxModel<AutoCompletionListItem> model = (DefaultComboBoxModel<AutoCompletionListItem>)this.getModel();
         Object oldValue = this.getEditor().getItem(); // Do not use getSelectedItem(); (fix #8013)
         model.removeAllElements();
@@ -245 +245 @@
             model.addElement(new AutoCompletionListItem(elem, AutoCompletionItemPriority.UNKNOWN));
         }
-        // disable autocomplete to prevent unnecessary actions in
-        // AutoCompletingComboBoxDocument#insertString
+        // disable autocomplete to prevent unnecessary actions in AutoCompletingComboBoxDocument#insertString
         autocompleteEnabled = false;
         this.getEditor().setItem(oldValue); // Do not use setSelectedItem(oldValue); (fix #8013)
@@ -256 +255 @@
      */
     public void setPossibleACItems(Collection<AutoCompletionListItem> elems) {
-        DefaultComboBoxModel model = (DefaultComboBoxModel)this.getModel();
+        DefaultComboBoxModel<AutoCompletionListItem> model = (DefaultComboBoxModel<AutoCompletionListItem>)this.getModel();
         Object oldValue = getSelectedItem();
         Object editorOldValue = this.getEditor().getItem();
@@ -266 +265 @@
         this.getEditor().setItem(editorOldValue);
     }
-
 
     protected boolean isAutocompleteEnabled() {

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

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 
-public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<AutoCompletionListItem> {
+public class ComboBoxHistory extends DefaultComboBoxModel<AutoCompletionListItem> implements Iterable<AutoCompletionListItem> {
 
     private int maxSize = 10;
@@ -20 +20 @@
     }
 
+    public void addElement(String s) {
+        addElement(new AutoCompletionListItem(s));
+    }
+    
     /**
      * Adds or moves an element to the top of the history
      */
     @Override
-    public void addElement(Object o) {
-        if (o instanceof String) {
-            o = new AutoCompletionListItem((String) o);
-        }
-
+    public void addElement(AutoCompletionListItem o) {
         String newEntry = ((AutoCompletionListItem)o).getValue();
 
@@ -77 +77 @@
                 return (AutoCompletionListItem)getElementAt(position);
             }
-
         };
     }

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

@@ -14 +14 @@
     public static final int DEFAULT_SEARCH_HISTORY_SIZE = 15;
 
+    /**
+     * Constructs a new {@code HistoryComboBox}.
+     */
     public HistoryComboBox() {
         int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
@@ -31 +34 @@
 
     public void addCurrentItemToHistory() {
-        String regex = (String)getEditor().getItem();
-        model.addElement(regex);
+        model.addElement((String)getEditor().getItem());
     }
 

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

@@ -15 +15 @@
 
 import javax.accessibility.Accessible;
-import javax.swing.ComboBoxEditor;
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
@@ -26 +25 @@
  * Class overriding each {@link JComboBox} in JOSM to control consistently the number of displayed items at once.<br>
  * This is needed because of the default Java behaviour that may display the top-down list off the screen (see #7917).
+ * @param <E> the type of the elements of this combo box
  *
- * @since 5429
+ * @since 5429 (creation)
+ * @since 7015 (generics for Java 7)
  */
-public class JosmComboBox extends JComboBox {
-
-    /**
-     * The default prototype value used to compute the maximum number of elements to be displayed at once before
-     * displaying a scroll bar
-     */
-    public static final String DEFAULT_PROTOTYPE_DISPLAY_VALUE = "Prototype display value";
+public class JosmComboBox<E> extends JComboBox<E> {
 
     /**
@@ -46 +41 @@
      */
     public JosmComboBox() {
-        this(DEFAULT_PROTOTYPE_DISPLAY_VALUE);
+        init(null);
     }
 
@@ -63 +58 @@
      * @since 5450
      */
-    public JosmComboBox(Object prototypeDisplayValue) {
-        super();
+    public JosmComboBox(E prototypeDisplayValue) {
         init(prototypeDisplayValue);
     }
@@ -79 +73 @@
      * @see DefaultComboBoxModel
      */
-    public JosmComboBox(ComboBoxModel aModel) {
+    public JosmComboBox(ComboBoxModel<E> aModel) {
         super(aModel);
-        List<Object> list = new ArrayList<>(aModel.getSize());
+        List<E> list = new ArrayList<>(aModel.getSize());
         for (int i = 0; i<aModel.getSize(); i++) {
             list.add(aModel.getElementAt(i));
@@ -96 +90 @@
      * @see DefaultComboBoxModel
      */
-    public JosmComboBox(Object[] items) {
+    public JosmComboBox(E[] items) {
         super(items);
         init(findPrototypeDisplayValue(Arrays.asList(items)));
@@ -107 +101 @@
      * @since 5558
      */
-    protected final Object findPrototypeDisplayValue(Collection<?> possibleValues) {
-        Object result = null;
+    protected final E findPrototypeDisplayValue(Collection<E> possibleValues) {
+        E result = null;
         int maxHeight = -1;
         if (possibleValues != null) {
             // Remind old prototype to restore it later
-            Object oldPrototype = getPrototypeDisplayValue();
+            E oldPrototype = getPrototypeDisplayValue();
             // Get internal JList to directly call the renderer
-            JList list = getList();
+            JList<E> list = getList();
             try {
                 // Index to give to renderer
                 int i = 0;
-                for (Object value : possibleValues) {
+                for (E value : possibleValues) {
                     if (value != null) {
                         // With a "classic" renderer, we could call setPrototypeDisplayValue(value) + getPreferredSize()
@@ -144 +138 @@
     }
 
-    protected final JList getList() {
+    @SuppressWarnings("unchecked")
+    protected final JList<E> getList() {
         for (int i = 0; i < getUI().getAccessibleChildrenCount(this); i++) {
             Accessible child = getUI().getAccessibleChild(this, i);
@@ -154 +149 @@
     }
 
-    protected final void init(Object prototype) {
+    protected final void init(E prototype) {
         if (prototype != null) {
             setPrototypeDisplayValue(prototype);
@@ -163 +158 @@
             // If possible, adjust the maximum number of items with the real height of items
             // It is not granted this works on every platform (tested OK on Windows)
-            JList list = getList();
+            JList<E> list = getList();
             if (list != null) {
                 if (list.getPrototypeCellValue() != prototype) {
@@ -203 +198 @@
         private void enableMenu() {
             if (launcher == null) {
-                ComboBoxEditor editor = getEditor();
                 if (editor != null) {
                     Component editorComponent = editor.getEditorComponent();
@@ -224 +218 @@
         }
 
-        @Override public void mousePressed(MouseEvent e) { processEvent(e); }
-        @Override public void mouseReleased(MouseEvent e) { processEvent(e); }
+        @Override
+        public void mousePressed(MouseEvent e) {
+            processEvent(e);
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
+            processEvent(e);
+        }
 
         private void processEvent(MouseEvent e) {
@@ -241 +242 @@
      * @since 5558
      */
-    public final void reinitialize(Collection<?> values) {
+    public final void reinitialize(Collection<E> values) {
         init(findPrototypeDisplayValue(values));
     }

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

@@ -10 +10 @@
  * @since 2923
  */
-public class OsmPrimitiveTypesComboBox extends JosmComboBox {
+public class OsmPrimitiveTypesComboBox extends JosmComboBox<Object> {
 
     /**