Changeset 7001 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - switch core to Java 7

Location:

trunk/src/org/openstreetmap/josm/gui/conflict

Files:

• pair/ComparePairListCellRenderer.java (modified) (1 diff)
• tags/MultiValueCellEditor.java (modified) (2 diffs)
• tags/RelationMemberConflictDecisionRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java

@@ -10 +10 @@
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 
-public class ComparePairListCellRenderer extends JLabel implements ListCellRenderer {
+public class ComparePairListCellRenderer extends JLabel implements ListCellRenderer<ComparePairType> {
+
+    /**
+     * Constructs a new {@code ComparePairListCellRenderer}.
+     */
     public ComparePairListCellRenderer() {
         setOpaque(true);
     }
+
     @Override
     public Component getListCellRendererComponent(
-            JList list,
-            Object value,
+            JList<? extends ComparePairType> list,
+            ComparePairType value,
             int index,
             boolean isSelected,
-            boolean cellHasFocus)
-    {
-        ComparePairType type = (ComparePairType)value;
-        setText(type.getDisplayName());
+            boolean cellHasFocus) {
+        setText(value.getDisplayName());
         setBackground(isSelected ? ConflictColors.BGCOLOR_SELECTED.get() : ConflictColors.BGCOLOR.get());
         setForeground(ConflictColors.FGCOLOR.get());

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

@@ -35 +35 @@
  * {@link KeyEvent#VK_ENTER} and {@link KeyEvent#VK_TAB} trigger a {@link NavigationListener#gotoNextDecision()}.
  */
-public class MultiValueCellEditor extends AbstractCellEditor implements TableCellEditor{
+public class MultiValueCellEditor extends AbstractCellEditor implements TableCellEditor {
 
     /**
@@ -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/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)) {