Changeset 7022 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-04-29T02:07:27+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - enable and fix more warnings

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/TagConflictResolverTable.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• tagging/TaggingPresetSelector.java (modified) (2 diffs)

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

@@ -42 +42 @@
         ((MultiValueCellEditor)getColumnModel().getColumn(2).getCellEditor()).addNavigationListeners(this);
 
-        setRowHeight((int)new JosmComboBox().getPreferredSize().getHeight());
+        setRowHeight((int)new JosmComboBox<String>().getPreferredSize().getHeight());
     }
 

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

@@ -391 +391 @@
             // make sure the casts are done in a meaningful way, so
             // the 2 objects really can be considered equal
-            for (Class<?> klass : new Class[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
+            for (Class<?> klass : new Class<?>[]{Float.class, Boolean.class, Color.class, float[].class, String.class}) {
                 Object a2 = Cascade.convertTo(a, klass);
                 Object b2 = Cascade.convertTo(b, klass);

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

@@ -34 +34 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -80 +81 @@
     private ActionListener clickListener;
 
-    private static class ResultListCellRenderer extends DefaultListCellRenderer {
+    private static class ResultListCellRenderer implements ListCellRenderer<TaggingPreset> {
+        final DefaultListCellRenderer def = new DefaultListCellRenderer();
         @Override
-        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;
+        public Component getListCellRendererComponent(JList<? extends TaggingPreset> list, TaggingPreset tp, int index, boolean isSelected, boolean cellHasFocus) {
+            JLabel result = (JLabel) def.getListCellRendererComponent(list, tp, index, isSelected, cellHasFocus);
             result.setText(tp.getName());
             result.setIcon((Icon) tp.getValue(Action.SMALL_ICON));