Changeset 7015 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - fix generics for JComboBox/JList

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TaggingPresetItems.java (modified) (9 diffs)
• TaggingPresetSelector.java (modified) (1 diff)
• ac/AutoCompletingComboBox.java (modified) (13 diffs)

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