Changeset 7001 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java

Timestamp:

2014-04-26T03:53:35+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - switch core to Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
-public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer {
+public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer<RelationMemberConflictDecisionType> {
 
     private JosmComboBox cbDecisionTypes;
@@ -63 +63 @@
     /* --------------------------------------------------------------------------------- */
     @Override
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
+    public Component getListCellRendererComponent(
+            JList<? extends RelationMemberConflictDecisionType> list, 
+            RelationMemberConflictDecisionType decision, int index, boolean isSelected,
             boolean cellHasFocus) {
         resetListRenderer();
@@ -70 +72 @@
             setForeground(UIManager.getColor("ComboBox.selectionForeground"));
         }
-        RelationMemberConflictDecisionType decision = (RelationMemberConflictDecisionType)value;
         RelationMemberConflictDecisionType.prepareLabel(decision, this);
         if (RelationMemberConflictDecisionType.UNDECIDED.equals(decision)) {