Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -156 +156 @@
     private final PopupMenuHandler blankSpaceMenuHandler = new PopupMenuHandler(blankSpaceMenu);
 
-    private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
+    private final Map<String, Map<String, Integer>> valueCount = new TreeMap<>();
     /**
      * This sub-object is responsible for all adding and editing of tags
@@ -400 +400 @@
             protected int checkTableSelection(JTable table, Point p) {
                 int row = super.checkTableSelection(table, p);
-                List<Relation> rels = new ArrayList<Relation>();
+                List<Relation> rels = new ArrayList<>();
                 for (int i: table.getSelectedRows()) {
                     rels.add((Relation) table.getValueAt(i, 0));
@@ -603 +603 @@
 
         final boolean displayDiscardableKeys = Main.pref.getBoolean("display.discardable-keys", false);
-        final Map<String, Integer> keyCount = new HashMap<String, Integer>();
-        final Map<String, String> tags = new HashMap<String, String>();
+        final Map<String, Integer> keyCount = new HashMap<>();
+        final Map<String, String> tags = new HashMap<>();
         valueCount.clear();
         EnumSet<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
@@ -617 +617 @@
                         v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
                     } else {
-                        TreeMap<String, Integer> v = new TreeMap<String, Integer>();
+                        TreeMap<String, Integer> v = new TreeMap<>();
                         v.put(value, 1);
                         valueCount.put(key, v);
@@ -639 +639 @@
         membershipData.setRowCount(0);
 
-        Map<Relation, MemberInfo> roles = new HashMap<Relation, MemberInfo>();
+        Map<Relation, MemberInfo> roles = new HashMap<>();
         for (OsmPrimitive primitive: newSel) {
             for (OsmPrimitive ref: primitive.getReferrers(true)) {
@@ -660 +660 @@
         }
 
-        List<Relation> sortedRelations = new ArrayList<Relation>(roles.keySet());
+        List<Relation> sortedRelations = new ArrayList<>(roles.keySet());
         Collections.sort(sortedRelations, new Comparator<Relation>() {
             @Override public int compare(Relation o1, Relation o2) {
@@ -819 +819 @@
 
     static class MemberInfo {
-        private List<RelationMember> role = new ArrayList<RelationMember>();
-        private Set<OsmPrimitive> members = new HashSet<OsmPrimitive>();
-        private List<Integer> position = new ArrayList<Integer>();
+        private List<RelationMember> role = new ArrayList<>();
+        private Set<OsmPrimitive> members = new HashSet<>();
+        private List<Integer> position = new ArrayList<>();
         private Iterable<OsmPrimitive> selection;
         private String positionString = null;
@@ -901 +901 @@
         protected void deleteTags(int[] rows){
             // convert list of rows to HashMap (and find gap for nextKey)
-            HashMap<String, String> tags = new HashMap<String, String>(rows.length);
+            HashMap<String, String> tags = new HashMap<>(rows.length);
             int nextKeyIndex = rows[0];
             for (int row : rows) {
@@ -1063 +1063 @@
                 String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
                 String lang = LanguageInfo.getWikiLanguagePrefix();
-                final List<URI> uris = new ArrayList<URI>();
+                final List<URI> uris = new ArrayList<>();
                 int row;
                 if (tagTable.getSelectedRowCount() == 1) {
@@ -1174 +1174 @@
         public void actionPerformed(ActionEvent ae) {
             int[] rows = tagTable.getSelectedRows();
-            Set<String> values = new TreeSet<String>();
+            Set<String> values = new TreeSet<>();
             Collection<OsmPrimitive> sel = Main.main.getInProgressSelection();
             if (rows.length == 0 || sel.isEmpty()) return;
@@ -1232 +1232 @@
         @Override
         protected Collection<String> getString(OsmPrimitive p, String key) {
-            List<String> r = new LinkedList<String>();
+            List<String> r = new LinkedList<>();
             for (Entry<String, String> kv : p.getKeys().entrySet()) {
                 r.add(new Tag(kv.getKey(), kv.getValue()).toString());