Changeset 30737 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/SerializerPojo.java

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

• applications/editors/josm/plugins/imagerycache/src/org/mapdb/SerializerPojo.java (modified) (7 diffs)

applications/editors/josm/plugins/imagerycache/src/org/mapdb/SerializerPojo.java

@@ -59 +59 @@
         @Override
                 public CopyOnWriteArrayList<ClassInfo> deserialize(DataInput in, int available) throws IOException{
-            if(available==0) return new CopyOnWriteArrayList<ClassInfo>();
+            if(available==0) return new CopyOnWriteArrayList<>();
 
             int size = Utils.unpackInt(in);
-            ArrayList<ClassInfo> ret = new ArrayList<ClassInfo>(size);
+            ArrayList<ClassInfo> ret = new ArrayList<>(size);
 
             for (int i = 0; i < size; i++) {
@@ -76 +76 @@
                 ret.add(new ClassInfo(className, fields,isEnum,isExternalizable));
             }
-            return new CopyOnWriteArrayList<ClassInfo>(ret);
+            return new CopyOnWriteArrayList<>(ret);
         }
     };
@@ -95 +95 @@
     public SerializerPojo(CopyOnWriteArrayList<ClassInfo> registered){
         if(registered == null)
-            this.registered = new CopyOnWriteArrayList<ClassInfo>();
+            this.registered = new CopyOnWriteArrayList<>();
         else
             this.registered = registered;
@@ -107 +107 @@
 
         private final String name;
-        private final List<FieldInfo> fields = new ArrayList<FieldInfo>();
-        private final Map<String, FieldInfo> name2fieldInfo = new HashMap<String, FieldInfo>();
-        private final Map<String, Integer> name2fieldId = new HashMap<String, Integer>();
+        private final List<FieldInfo> fields = new ArrayList<>();
+        private final Map<String, FieldInfo> name2fieldInfo = new HashMap<>();
+        private final Map<String, Integer> name2fieldId = new HashMap<>();
         private ObjectStreamField[] objectStreamFields;
 
@@ -290 +290 @@
 
     CopyOnWriteArrayList<ClassInfo> registered;
-    Map<Class<?>, Integer> class2classId = new HashMap<Class<?>, Integer>();
-    Map<Integer, Class<?>> classId2class = new HashMap<Integer, Class<?>>();
+    Map<Class<?>, Integer> class2classId = new HashMap<>();
+    Map<Integer, Class<?>> classId2class = new HashMap<>();
 
 
@@ -333 +333 @@
         if (fields == null) {
             ObjectStreamClass streamClass = ObjectStreamClass.lookup(clazz);
-            FastArrayList<ObjectStreamField> fieldsList = new FastArrayList<ObjectStreamField>();
+            FastArrayList<ObjectStreamField> fieldsList = new FastArrayList<>();
             while (streamClass != null) {
                 for (ObjectStreamField f : streamClass.getFields()) {
@@ -567 +567 @@
 
 
-    private static Map<Class<?>, Constructor<?>> class2constuctor = new ConcurrentHashMap<Class<?>, Constructor<?>>();
+    private static Map<Class<?>, Constructor<?>> class2constuctor = new ConcurrentHashMap<>();
 
     /**