Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 6995)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 7005)
@@ -55,6 +55,6 @@
         int numRelations = 1000;
 
-        ArrayList<Node> nodes = new ArrayList<Node>();
-        ArrayList<Way> ways = new ArrayList<Way>();
+        ArrayList<Node> nodes = new ArrayList<>();
+        ArrayList<Way> ways = new ArrayList<>();
 
         // create a set of nodes
@@ -122,5 +122,5 @@
     static public void createDataSetOnServer(DataSet ds) throws OsmTransferException {
         logger.info("creating data set on the server ...");
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+        ArrayList<OsmPrimitive> primitives = new ArrayList<>();
         primitives.addAll(testDataSet.getNodes());
         primitives.addAll(testDataSet.getWays());
@@ -246,5 +246,5 @@
     public void testMultiGet10Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));
@@ -263,5 +263,5 @@
     public void testMultiGet10Ways() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Way> ways= new ArrayList<Way>(ds.getWays());
+        ArrayList<Way> ways= new ArrayList<>(ds.getWays());
         for (int i =0; i< 10; i++) {
             reader.append(ways.get(i));
@@ -281,5 +281,5 @@
     public void testMultiGet10Relations() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Relation> relations= new ArrayList<Relation>(ds.getRelations());
+        ArrayList<Relation> relations= new ArrayList<>(ds.getRelations());
         for (int i =0; i< 10; i++) {
             reader.append(relations.get(i));
@@ -299,5 +299,5 @@
     public void testMultiGet800Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 812; i++) {
             reader.append(nodes.get(i));
@@ -316,5 +316,5 @@
     public void multiGetWithNonExistingNode() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 6995)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 7005)
@@ -127,5 +127,5 @@
     static public void createDataSetOnServer(DataSet ds) throws OsmTransferException {
         logger.info("creating data set on the server ...");
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+        ArrayList<OsmPrimitive> primitives = new ArrayList<>();
         primitives.addAll(ds.getNodes());
         primitives.addAll(ds.getWays());
@@ -328,5 +328,5 @@
         }
         assertEquals(2, referers.getRelations().size());  // two relations referring to
-        Set<Long> expectedNodeIds = new HashSet<Long>();
+        Set<Long> expectedNodeIds = new HashSet<>();
         for (Way way : referers.getWays()) {
             Way orig = (Way) ds.getPrimitiveById(way);
@@ -359,5 +359,5 @@
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
 
-        Set<Long> referringRelationsIds = new HashSet<Long>();
+        Set<Long> referringRelationsIds = new HashSet<>();
         r = lookupRelation(referers, 6);
         assertNotNull(r);
@@ -386,5 +386,5 @@
         // ways are incomplete after reading.
         //
-        Set<Long> expectedWayIds = new HashSet<Long>();
+        Set<Long> expectedWayIds = new HashSet<>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
             if (m.isWay()) {
@@ -420,5 +420,5 @@
 
     protected Set<Long> getNodeIdsInWay(Way way) {
-        HashSet<Long> ret = new HashSet<Long>();
+        HashSet<Long> ret = new HashSet<>();
         if (way == null)return ret;
         for (Node n: way.getNodes()) {
@@ -429,5 +429,5 @@
 
     protected Set<Long> getNodeIdsInRelation(Relation r) {
-        HashSet<Long> ret = new HashSet<Long>();
+        HashSet<Long> ret = new HashSet<>();
         if (r == null) return ret;
         for (RelationMember m: r.getMembers()) {
@@ -455,5 +455,5 @@
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
 
-        Set<Long> referringRelationsIds = new HashSet<Long>();
+        Set<Long> referringRelationsIds = new HashSet<>();
         r = lookupRelation(referers, 6);
         assertNotNull(r);
@@ -482,5 +482,5 @@
         // ways are completely read after reading the relations
         //
-        Set<Long> expectedWayIds = new HashSet<Long>();
+        Set<Long> expectedWayIds = new HashSet<>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
             if (m.isWay()) {
@@ -509,5 +509,5 @@
         }
 
-        Set<Long> expectedNodeIds = new HashSet<Long>();
+        Set<Long> expectedNodeIds = new HashSet<>();
         for (int i = 6; i < 10; i++) {
             Relation r1 = lookupRelation(ds, i);
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java	(revision 7005)
@@ -44,8 +44,8 @@
         ds.addPrimitive(n2);
 
-        Collection<OsmPrimitive> all = new HashSet<OsmPrimitive>();
+        Collection<OsmPrimitive> all = new HashSet<>();
         all.addAll(Arrays.asList(new OsmPrimitive[] {n1, n2}));
 
-        List<Filter> filters = new LinkedList<Filter>();
+        List<Filter> filters = new LinkedList<>();
         Filter f1 = new Filter();
         f1.text = "fixme";
@@ -67,5 +67,5 @@
             DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/filterTests.osm"), NullProgressMonitor.INSTANCE);
 
-            List<Filter> filters = new LinkedList<Filter>();
+            List<Filter> filters = new LinkedList<>();
             switch (i) {
             case 1: {
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java	(revision 7005)
@@ -20,6 +20,6 @@
 
     private void compareReferrers(OsmPrimitive actual, OsmPrimitive... expected) {
-        Assert.assertEquals(new HashSet<OsmPrimitive>(Arrays.asList(expected)),
-                new HashSet<OsmPrimitive>(actual.getReferrers()));
+        Assert.assertEquals(new HashSet<>(Arrays.asList(expected)),
+                new HashSet<>(actual.getReferrers()));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java	(revision 7005)
@@ -27,7 +27,7 @@
 
     private void removeAllTest(DataSet ds) {
-        List<Node> allNodes = new ArrayList<Node>(ds.getNodes());
-        List<Way> allWays = new ArrayList<Way>(ds.getWays());
-        List<Relation> allRelations = new ArrayList<Relation>(ds.getRelations());
+        List<Node> allNodes = new ArrayList<>(ds.getNodes());
+        List<Way> allWays = new ArrayList<>(ds.getWays());
+        List<Relation> allRelations = new ArrayList<>(ds.getRelations());
 
         QuadBuckets<Node> nodes = Reflection.field("nodes").ofType(new TypeRef<QuadBuckets<Node>>() {}).in(ds).get();
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java	(revision 7005)
@@ -93,5 +93,5 @@
         way.addNode(1);
         way.addNode(2);
-        ArrayList<Long> ids = new ArrayList<Long>();
+        ArrayList<Long> ids = new ArrayList<>();
         for (long id : way.getNodes()) {
             ids.add(id);
@@ -102,4 +102,3 @@
         assertEquals(2, (long) ids.get(1));
     }
-
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java	(revision 7005)
@@ -33,5 +33,5 @@
      */
     public static void main(String[] args) {
-        Map<String, Projection> allCodes = new HashMap<String, Projection>();
+        Map<String, Projection> allCodes = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {
Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java	(revision 7005)
@@ -58,5 +58,5 @@
         setUp();
 
-        Map<String, Projection> supportedCodesMap = new HashMap<String, Projection>();
+        Map<String, Projection> supportedCodesMap = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {
@@ -68,14 +68,14 @@
         }
 
-        List<TestData> prevData = new ArrayList<TestData>();
+        List<TestData> prevData = new ArrayList<>();
         if (new File(PROJECTION_DATA_FILE).exists()) {
             prevData = readData();
         }
-        Map<String,TestData> prevCodesMap = new HashMap<String,TestData>();
+        Map<String,TestData> prevCodesMap = new HashMap<>();
         for (TestData data : prevData) {
             prevCodesMap.put(data.code, data);
         }
 
-        Set<String> codesToWrite = new LinkedHashSet<String>();
+        Set<String> codesToWrite = new LinkedHashSet<>();
         for (TestData data : prevData) {
             if (supportedCodesMap.containsKey(data.code)) {
@@ -116,5 +116,5 @@
     private static List<TestData> readData() throws IOException, FileNotFoundException {
         BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), Utils.UTF_8));
-        List<TestData> result = new ArrayList<TestData>();
+        List<TestData> result = new ArrayList<>();
         String line;
         while ((line = in.readLine()) != null) {
@@ -159,5 +159,5 @@
     public void regressionTest() throws IOException, FileNotFoundException {
         List<TestData> allData = readData();
-        Set<String> dataCodes = new HashSet<String>();
+        Set<String> dataCodes = new HashSet<>();
         for (TestData data : allData) {
             dataCodes.add(data.code);
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java	(revision 7005)
@@ -73,5 +73,5 @@
         c.initialize();
 
-        LinkedHashSet<String> assertionErrors = new LinkedHashSet<String>();
+        LinkedHashSet<String> assertionErrors = new LinkedHashSet<>();
         for (final MapCSSTagChecker.TagCheck check : c.checks) {
             System.out.println("Check: "+check);
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 7005)
@@ -144,5 +144,5 @@
     public void testPresetValues() throws Exception {
         final Collection<TaggingPreset> presets = TaggingPresetReader.readFromPreferences(false, false);
-        final Set<Tag> values = new LinkedHashSet<Tag>();
+        final Set<Tag> values = new LinkedHashSet<>();
         for (final TaggingPreset p : presets) {
             for (final TaggingPresetItem i : p.data) {
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 7005)
@@ -19,5 +19,4 @@
 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,5 +704,5 @@
 
         class MyListener implements PropertyChangeListener {
-            public ArrayList<PropertyChangeEvent> events = new ArrayList<PropertyChangeEvent>();
+            public ArrayList<PropertyChangeEvent> events = new ArrayList<>();
 
             public void propertyChange(PropertyChangeEvent evt) {
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java	(revision 7005)
@@ -59,5 +59,5 @@
 
     private void populate(OsmPrimitive my, OsmPrimitive their) {
-        model.populate(new Conflict<OsmPrimitive>(my, their));
+        model.populate(new Conflict<>(my, their));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java	(revision 7005)
@@ -9,5 +9,4 @@
 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;
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java	(revision 7005)
@@ -13,5 +13,4 @@
 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;
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 7005)
@@ -10,5 +10,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 7005)
@@ -11,5 +11,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java	(revision 6995)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java	(revision 7005)
@@ -31,5 +31,5 @@
 
         public List<ActionParameter<?>> getActionParameters() {
-            List<ActionParameter<?>> result = new ArrayList<ActionParameter<?>>();
+            List<ActionParameter<?>> result = new ArrayList<>();
             result.add(new StringActionParameter("param1"));
             result.add(new StringActionParameter("param2"));
@@ -44,5 +44,5 @@
 
     private void checkAction(ActionDefinition a, Object... params) {
-        Map<String, Object> expected = new HashMap<String, Object>();
+        Map<String, Object> expected = new HashMap<>();
         for (int i=0; i<params.length; i+=2) {
             expected.put((String)params[i], params[i+1]);
@@ -53,5 +53,5 @@
     @Test
     public void test1() {
-        Map<String, Action> actions = new HashMap<String, Action>();
+        Map<String, Action> actions = new HashMap<>();
         actions.put("action", new TestAction());
         ActionParser parser = new ActionParser(actions);