Changeset 30568 in osm for applications/editors/josm/plugins/opendata/includes/org/jopendocument/util

Timestamp:

2014-08-06T19:33:57+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] add more unit tests, fix Java 7 warnings

Location:

applications/editors/josm/plugins/opendata/includes/org/jopendocument/util

Files:

• FileUtils.java (modified) (1 diff)
• StringUtils.java (modified) (1 diff)
• Tuple2.java (modified) (1 diff)
• cc/Transformer.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/FileUtils.java

@@ -31 +31 @@
     private static final Map<String, String> ext2mime;
     static {
-        ext2mime = new HashMap<String, String>();
+        ext2mime = new HashMap<>();
         ext2mime.put(".xml", "text/xml");
         ext2mime.put(".jpg", "image/jpeg");

applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/StringUtils.java

@@ -47 +47 @@
             super();
             this.esc = esc;
-            this.substitution = new LinkedHashMap<Character, Character>();
-            this.inv = new HashMap<Character, Character>();
+            this.substitution = new LinkedHashMap<>();
+            this.inv = new HashMap<>();
             this.add(esc, name);
         }

applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/Tuple2.java

@@ -31 +31 @@
     // just to make the code shorter
     public static final <A, B> Tuple2<A, B> create(A a, B b) {
-        return new Tuple2<A, B>(a, b);
+        return new Tuple2<>(a, b);
     }
 

applications/editors/josm/plugins/opendata/includes/org/jopendocument/util/cc/Transformer.java

@@ -21 +21 @@
 
     public static final <N> ITransformer<N, N> nopTransformer() {
-        return new ITransformerWrapper<N, N>(TransformerUtils.nopTransformer());
+        return new ITransformerWrapper<>(TransformerUtils.nopTransformer());
     }