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

Timestamp:

2014-10-18T23:07:52+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

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

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

@@ -358 +358 @@
             return;
 
-        Set<Relation> relations = new TreeSet<Relation>(
+        Set<Relation> relations = new TreeSet<>(
                 DefaultNameFormatter.getInstance().getRelationComparator());
         for( OsmPrimitive element : newSelection ) {
@@ -415 +415 @@
 
     private static Map<String, List<String>> loadRoles() {
-        Map<String, List<String>> result = new HashMap<String, List<String>>();
+        Map<String, List<String>> result = new HashMap<>();
         try {
             ClassLoader classLoader = RelContextDialog.class.getClassLoader();
@@ -425 +425 @@
                 if( t.hasMoreTokens() ) {
                     String type = t.nextToken();
-                    List<String> roles = new ArrayList<String>();
+                    List<String> roles = new ArrayList<>();
                     while( t.hasMoreTokens() )
                         roles.add(t.nextToken());
@@ -442 +442 @@
         JPanel panel = new JPanel(new GridBagLayout());
 
-        List<String> items = new ArrayList<String>();
+        List<String> items = new ArrayList<>();
         for( String role : roleBoxModel.getRoles() ) {
             if( role.length() > 1 )
@@ -527 +527 @@
             Collection<OsmPrimitive> selected = Main.main.getCurrentDataSet().getSelected();
             Relation r = chosenRelation.get();
-            List<Command> commands = new ArrayList<Command>();
+            List<Command> commands = new ArrayList<>();
             for( int i = 0; i < r.getMembersCount(); i++ ) {
                 RelationMember m = r.getMember(i);
@@ -623 +623 @@
         
     private class RoleComboBoxModel extends AbstractListModel<String> implements ComboBoxModel<String> {
-        private List<String> roles = new ArrayList<String>();
+        private List<String> roles = new ArrayList<>();
         private int selectedIndex = -1;
         private JComboBox<String> combobox;
@@ -646 +646 @@
                 combobox.setEnabled(true);
 
-            List<String> items = new ArrayList<String>();
+            List<String> items = new ArrayList<>();
             if( chosenRelation != null && chosenRelation.get() != null ) {
                 if( chosenRelation.isMultipolygon() ) {