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

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

File:

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

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -137 +137 @@
 
         final MouseListener relationMouseAdapter = new ChosenRelationMouseAdapter();
-        final JComboBox roleBox = new JComboBox();
+        final JComboBox<String> roleBox = new JComboBox<>();
         roleBoxModel = new RoleComboBoxModel(roleBox);
         roleBox.setModel(roleBoxModel);
@@ -620 +620 @@
             setEnabled(newRelation != null);
         }
-        }
+    }
         
-    private class RoleComboBoxModel extends AbstractListModel implements ComboBoxModel {
+    private class RoleComboBoxModel extends AbstractListModel<String> implements ComboBoxModel<String> {
         private List<String> roles = new ArrayList<String>();
         private int selectedIndex = -1;
-        private JComboBox combobox;
+        private JComboBox<String> combobox;
         private String membersRole;
         private final String EMPTY_ROLE = tr("<empty>");
         private final String ANOTHER_ROLE = tr("another...");
 
-        public RoleComboBoxModel( JComboBox combobox ) {
+        public RoleComboBoxModel( JComboBox<String> combobox ) {
             super();
             this.combobox = combobox;
@@ -708 +708 @@
         }
 
-        public Object getElementAt( int index ) {
+        public String getElementAt( int index ) {
             return getRole(index);
         }