Changeset 30737 in osm for applications/editors/josm/plugins/graphview/test

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core

Files:

• FullGraphCreationTest.java (modified) (3 diffs)
• TestDataSource.java (modified) (4 diffs)
• access/AccessRulesetReaderTest.java (modified) (1 diff)
• util/TagConditionLogicTest.java (modified) (2 diffs)
• visualisation/FloatPropertyColorSchemeTest.java (modified) (1 diff)

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java

@@ -35 +35 @@
     static {
         Map<VehiclePropertyType<?>, String> vehiclePropertyValues =
-            new HashMap<VehiclePropertyType<?>, String>();
+            new HashMap<>();
         vehiclePropertyValues.put(VehiclePropertyTypes.WIDTH, "3.0");
 
@@ -56 +56 @@
         }
         public java.util.List<Implication> getImplications() {
-            return new LinkedList<Implication>();
+            return new LinkedList<>();
         }
     };
@@ -162 +162 @@
     private TransitionStructure createTestTransitionStructure(TestDataSource dataSource) {
 
-        LinkedList<RoadPropertyType<?>> properties = new LinkedList<RoadPropertyType<?>>();
+        LinkedList<RoadPropertyType<?>> properties = new LinkedList<>();
         properties.add(new RoadWidth());
 
-        return new GenericTransitionStructure<TestNode, TestWay, TestRelation, TestRelationMember>(
+        return new GenericTransitionStructure<>(
                 ACCESS_PARAMS, TEST_RULESET, dataSource, properties);
     }

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java

@@ -15 +15 @@
 
     public static class TestPrimitive {
-        public final Map<String, String> tags = new HashMap<String, String>();
+        public final Map<String, String> tags = new HashMap<>();
     };
 
@@ -35 +35 @@
 
     public static class TestWay extends TestPrimitive {
-        public final List<TestNode> nodes = new LinkedList<TestNode>();
+        public final List<TestNode> nodes = new LinkedList<>();
         @Override
         public String toString() {
@@ -43 +43 @@
 
     public static class TestRelation extends TestPrimitive {
-        public final Collection<TestRelationMember> members = new LinkedList<TestRelationMember>();
+        public final Collection<TestRelationMember> members = new LinkedList<>();
         @Override
         public String toString() {
@@ -70 +70 @@
 
 
-    public final Collection<TestNode> nodes = new LinkedList<TestNode>();
-    public final Collection<TestWay> ways = new LinkedList<TestWay>();
-    public final Collection<TestRelation> relations = new LinkedList<TestRelation>();
+    public final Collection<TestNode> nodes = new LinkedList<>();
+    public final Collection<TestWay> ways = new LinkedList<>();
+    public final Collection<TestRelation> relations = new LinkedList<>();
 
 

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/access/AccessRulesetReaderTest.java

@@ -101 +101 @@
 
     private static TagGroup createTagGroup(Tag... tags) {
-        Map<String, String> tagMap = new HashMap<String, String>();
+        Map<String, String> tagMap = new HashMap<>();
         for (Tag tag : tags) {
             tagMap.put(tag.key, tag.value);

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/util/TagConditionLogicTest.java

@@ -20 +20 @@
     @Before
     public void setUp() {
-        Map<String, String> mapA = new HashMap<String, String>();
+        Map<String, String> mapA = new HashMap<>();
         mapA.put("key1", "value1");
         mapA.put("key2", "value2");
@@ -26 +26 @@
         groupA = new MapBasedTagGroup(mapA);
 
-        Map<String, String> mapB = new HashMap<String, String>();
+        Map<String, String> mapB = new HashMap<>();
         mapB.put("key1", "value1");
         mapB.put("key4", "value4");

applications/editors/josm/plugins/graphview/test/unit/org/openstreetmap/josm/plugins/graphview/core/visualisation/FloatPropertyColorSchemeTest.java

@@ -18 +18 @@
     public void setUp() {
 
-        Map<Float, Color> colorMap = new HashMap<Float, Color>();
+        Map<Float, Color> colorMap = new HashMap<>();
         colorMap.put( 5f, new Color( 42,  42,  42));
         colorMap.put(10f, new Color(100, 100, 100));