Changeset 7005 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/test/unit/org/openstreetmap/josm/gui/conflict

Files:

• nodes/NodeListMergeModelTest.java (modified) (2 diffs)
• properties/PropertiesMergeModelTest.java (modified) (1 diff)
• tags/TagMergeItemTest.java (modified) (1 diff)
• tags/TagMergeModelTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java

@@ -19 +19 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DatasetFactory;
 import org.openstreetmap.josm.data.osm.Node;
@@ -705 +704 @@
 
         class MyListener implements PropertyChangeListener {
-            public ArrayList<PropertyChangeEvent> events = new ArrayList<PropertyChangeEvent>();
+            public ArrayList<PropertyChangeEvent> events = new ArrayList<>();
 
             public void propertyChange(PropertyChangeEvent evt) {

trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

@@ -59 +59 @@
 
     private void populate(OsmPrimitive my, OsmPrimitive their) {
-        model.populate(new Conflict<OsmPrimitive>(my, their));
+        model.populate(new Conflict<>(my, their));
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java

@@ -9 +9 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

@@ -13 +13 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;