Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.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/ConflictDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -95 +95 @@
         model = new ConflictListModel();
 
-        lstConflicts = new JList<OsmPrimitive>(model);
+        lstConflicts = new JList<>(model);
         lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
@@ -235 +235 @@
         Visitor conflictPainter = new AbstractVisitor() {
             // Manage a stack of visited relations to avoid infinite recursion with cyclic relations (fix #7938)
-            private final Set<Relation> visited = new HashSet<Relation>();
+            private final Set<Relation> visited = new HashSet<>();
             @Override
             public void visit(Node n) {
@@ -364 +364 @@
 
         public ConflictListModel() {
-            listeners = new CopyOnWriteArrayList<ListDataListener>();
+            listeners = new CopyOnWriteArrayList<>();
         }
 
@@ -451 +451 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
+            Collection<OsmPrimitive> sel = new LinkedList<>();
             for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
                 sel.add(o);