Changeset 30532 in osm for applications/editors/josm/plugins/openstreetbugs/src

Timestamp:

2014-07-14T04:18:06+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui

Files:

• OsbBugListCellRenderer.java (modified) (3 diffs)
• OsbDialog.java (modified) (6 diffs)
• OsbQueueListCellRenderer.java (modified) (2 diffs)
• action/ActionQueue.java (modified) (3 diffs)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbBugListCellRenderer.java ¶

@@ -41 +41 @@
 import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 
-public class OsbBugListCellRenderer implements ListCellRenderer {
+public class OsbBugListCellRenderer implements ListCellRenderer<OsbListItem> {
 
     private Color background = Color.WHITE;
     private Color altBackground = new Color(250, 250, 220);
 
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
+    public Component getListCellRendererComponent(JList<? extends OsbListItem> list, OsbListItem item, int index, boolean isSelected,
             boolean cellHasFocus) {
 
@@ -64 +64 @@
         }
 
-        OsbListItem item = (OsbListItem) value;
         Node n = item.getNode();
         Icon icon = null;
@@ -86 +85 @@
         return label;
     }
-
 }

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java ¶

@@ -93 +93 @@
     private static final long serialVersionUID = 1L;
     private JPanel bugListPanel, queuePanel;
-    private DefaultListModel bugListModel;
-    private JList bugList;
-    private JList queueList;
+    private DefaultListModel<OsbListItem> bugListModel;
+    private JList<OsbListItem> bugList;
+    private JList<OsbAction> queueList;
     private OsbPlugin osbPlugin;
     private boolean fireSelectionChanged = true;
@@ -120 +120 @@
         add(bugListPanel, BorderLayout.CENTER);
 
-        bugListModel = new DefaultListModel();
-        bugList = new JList(bugListModel);
+        bugListModel = new DefaultListModel<>();
+        bugList = new JList<>(bugListModel);
         bugList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         bugList.addListSelectionListener(this);
@@ -180 +180 @@
         queuePanel = new JPanel(new BorderLayout());
         queuePanel.setName(tr("Queue"));
-        queueList = new JList(getActionQueue());
+        queueList = new JList<>(getActionQueue());
         queueList.setCellRenderer(new OsbQueueListCellRenderer());
         queuePanel.add(new JScrollPane(queueList), BorderLayout.CENTER);
@@ -241 +241 @@
     public synchronized void update(final DataSet dataset) {
         // create a new list model
-        bugListModel = new DefaultListModel();
+        bugListModel = new DefaultListModel<>();
         List<Node> sortedList = new ArrayList<Node>(dataset.getNodes());
         Collections.sort(sortedList, new BugComparator());
@@ -253 +253 @@
 
     public void valueChanged(ListSelectionEvent e) {
-        if (bugList.getSelectedValues().length == 0) {
+        if (bugList.getSelectedValuesList().isEmpty()) {
             addComment.setEnabled(false);
             closeIssue.setEnabled(false);
@@ -260 +260 @@
 
         List<OsmPrimitive> selected = new ArrayList<OsmPrimitive>();
-        for (Object listItem : bugList.getSelectedValues()) {
+        for (Object listItem : bugList.getSelectedValuesList()) {
             Node node = ((OsbListItem) listItem).getNode();
             selected.add(node);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbQueueListCellRenderer.java ¶

@@ -43 +43 @@
 import org.openstreetmap.josm.plugins.osb.gui.action.OsbAction;
 
-public class OsbQueueListCellRenderer implements ListCellRenderer {
+public class OsbQueueListCellRenderer implements ListCellRenderer<OsbAction> {
 
     private Color background = Color.WHITE;
     private Color altBackground = new Color(250, 250, 220);
 
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
+    @Override
+    public Component getListCellRendererComponent(JList<? extends OsbAction> list, OsbAction action, int index, boolean isSelected,
             boolean cellHasFocus) {
 
@@ -62 +63 @@
         }
 
-        OsbAction action = (OsbAction) value;
         Icon icon = null;
         if(action instanceof AddCommentAction) {

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ActionQueue.java ¶

@@ -5 +5 @@
 import javax.swing.AbstractListModel;
 
-public class ActionQueue extends AbstractListModel {
+public class ActionQueue extends AbstractListModel<OsbAction> {
 
     private LinkedList<OsbAction> queue = new LinkedList<OsbAction>();
@@ -25 +25 @@
     }
 
-    public boolean remove(Object o) {
+    public boolean remove(OsbAction o) {
         int index = queue.indexOf(o);
         if(index >= 0) {
@@ -52 +52 @@
     }
 
-    public Object getElementAt(int index) {
+    @Override
+    public OsbAction getElementAt(int index) {
         return queue.get(index);
     }
 
+    @Override
     public int getSize() {
         return queue.size();