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

Timestamp:

2014-04-28T00:27:06+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - fix easy compilation warnings

Location:

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

Files:

• pair/ListMergeModel.java (modified) (2 diffs)
• pair/ListMerger.java (modified) (1 diff)
• tags/MultiValueCellRenderer.java (modified) (2 diffs)
• tags/RelationMemberConflictDecisionRenderer.java (modified) (2 diffs)

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

@@ -826 +826 @@
     }
 
-    public class ComparePairListModel extends AbstractListModel implements ComboBoxModel {
+    public class ComparePairListModel extends AbstractListModel<ComparePairType> implements ComboBoxModel<ComparePairType> {
 
         private int selectedIdx;
@@ -843 +843 @@
 
         @Override
-        public Object getElementAt(int index) {
+        public ComparePairType getElementAt(int index) {
             if (index < compareModes.size())
                 return compareModes.get(index);

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

@@ -240 +240 @@
         p.setLayout(new FlowLayout(FlowLayout.LEFT));
         p.add(new JLabel(tr("Compare ")));
-        JosmComboBox cbComparePair = new JosmComboBox(model.getComparePairListModel());
+        JosmComboBox<ComparePairType> cbComparePair = new JosmComboBox<>(model.getComparePairListModel());
         cbComparePair.setRenderer(new ComparePairListCellRenderer());
         p.add(cbComparePair);

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

@@ -27 +27 @@
     private ImageIcon iconDecided;
     private ImageIcon iconUndecided;
-    private DefaultComboBoxModel model;
-    private JosmComboBox cbDecisionRenderer;
+    private DefaultComboBoxModel<Object> model;
+    private JosmComboBox<Object> cbDecisionRenderer;
 
     /**
@@ -37 +37 @@
         iconDecided = ImageProvider.get("dialogs/conflict", "tagconflictresolved");
         iconUndecided = ImageProvider.get("dialogs/conflict", "tagconflictunresolved");
-        cbDecisionRenderer = new JosmComboBox(model = new DefaultComboBoxModel());
+        model = new DefaultComboBoxModel<>();
+        cbDecisionRenderer = new JosmComboBox<>(model);
     }
 

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

@@ -16 +16 @@
 public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer<RelationMemberConflictDecisionType> {
 
-    private JosmComboBox cbDecisionTypes;
+    private JosmComboBox<RelationMemberConflictDecisionType> cbDecisionTypes;
 
     protected void resetTableRenderer() {
@@ -36 +36 @@
      */
     public RelationMemberConflictDecisionRenderer() {
-        cbDecisionTypes = new JosmComboBox(RelationMemberConflictDecisionType.values());
+        cbDecisionTypes = new JosmComboBox<>(RelationMemberConflictDecisionType.values());
         cbDecisionTypes.setRenderer(this);
     }