Changeset 30532 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -37 +37 @@
         panel.add(searchField, BorderLayout.NORTH);
         final FindRelationListModel relationsData = new FindRelationListModel();
-        final JList relationsList = new JList(relationsData);
+        final JList<Relation> relationsList = new JList<>(relationsData);
         relationsList.setSelectionModel(relationsData.getSelectionModel());
         relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -167 +167 @@
      * I admit, some of it was copypasted from {@link org.openstreetmap.josm.gui.dialogs.RelationListDialog.RelationListModel}.
      */
-    protected class FindRelationListModel extends AbstractListModel {
+    protected class FindRelationListModel extends AbstractListModel<Relation> {
         private final ArrayList<Relation> relations = new ArrayList<Relation>();
         private DefaultListSelectionModel selectionModel;
@@ -184 +184 @@
         }
 
-        public Relation getRelation( int idx ) {
-            return relations.get(idx);
-        }
-
+        @Override
         public int getSize() {
             return relations.size();
         }
 
-        public Object getElementAt( int index ) {
-            return getRelation(index);
+        @Override
+        public Relation getElementAt( int index ) {
+            return relations.get(index);
         }
 
         public void setRelations(Collection<Relation> relations) {
             int selectedIndex = selectionModel.getMinSelectionIndex();
-            Relation sel =  selectedIndex < 0 ? null : getRelation(selectedIndex);
+            Relation sel =  selectedIndex < 0 ? null : getElementAt(selectedIndex);
             
             this.relations.clear();