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

Timestamp:

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

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

File:

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

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

@@ -114 +114 @@
 
     /** holds node level locks*/
-    protected final LongConcurrentHashMap<Thread> nodeLocks = new LongConcurrentHashMap<Thread>();
+    protected final LongConcurrentHashMap<Thread> nodeLocks = new LongConcurrentHashMap<>();
 
     /** maximal node size allowed in this BTree*/
@@ -963 +963 @@
     protected Entry<K, V> makeEntry(Object key, Object value) {
         if(value instanceof ValRef) throw new InternalError();
-        return new SimpleImmutableEntry<K, V>((K)key,  (V)value);
+        return new SimpleImmutableEntry<>((K)key,  (V)value);
     }
 
@@ -1336 +1336 @@
         if (fromKey == null || toKey == null)
             throw new NullPointerException();
-        return new SubMap<K,V>
+        return new SubMap<>
                 ( this, fromKey, fromInclusive, toKey, toInclusive);
     }
@@ -1345 +1345 @@
         if (toKey == null)
             throw new NullPointerException();
-        return new SubMap<K,V>
+        return new SubMap<>
                 (this, null, false, toKey, inclusive);
     }
@@ -1354 +1354 @@
         if (fromKey == null)
             throw new NullPointerException();
-        return new SubMap<K,V>
+        return new SubMap<>
                 (this, fromKey, inclusive, null, false);
     }
@@ -1421 +1421 @@
     static final <E> List<E> toList(Collection<E> c) {
         // Using size() here would be a pessimization.
-        List<E> list = new ArrayList<E>();
+        List<E> list = new ArrayList<>();
         for (E e : c){
             list.add(e);
@@ -1506 +1506 @@
                                       E toElement,
                                       boolean toInclusive) {
-            return new KeySet<E>(m.subMap(fromElement, fromInclusive,
+            return new KeySet<>(m.subMap(fromElement, fromInclusive,
                     toElement,   toInclusive),hasValues);
         }
         @Override
                 public NavigableSet<E> headSet(E toElement, boolean inclusive) {
-            return new KeySet<E>(m.headMap(toElement, inclusive),hasValues);
+            return new KeySet<>(m.headMap(toElement, inclusive),hasValues);
         }
         @Override
                 public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
-            return new KeySet<E>(m.tailMap(fromElement, inclusive),hasValues);
+            return new KeySet<>(m.tailMap(fromElement, inclusive),hasValues);
         }
         @Override
@@ -1937 +1937 @@
                 }
             }
-            return new SubMap<K,V>(m, fromKey, fromInclusive,
+            return new SubMap<>(m, fromKey, fromInclusive,
                     toKey, toInclusive);
         }
@@ -1989 +1989 @@
         @Override
         public NavigableSet<K> navigableKeySet() {
-            return new KeySet<K>((ConcurrentNavigableMap<K,Object>) this,m.hasValues);
+            return new KeySet<>((ConcurrentNavigableMap<K,Object>) this,m.hasValues);
         }
 
@@ -2032 +2032 @@
         @Override
         public NavigableSet<K> keySet() {
-            return new KeySet<K>((ConcurrentNavigableMap<K,Object>) this, m.hasValues);
+            return new KeySet<>((ConcurrentNavigableMap<K,Object>) this, m.hasValues);
         }
 
@@ -2044 +2044 @@
         @Override
         public Set<Entry<K, V>> entrySet() {
-            return new EntrySet<K, V>(this);
+            return new EntrySet<>(this);
         }
 
@@ -2123 +2123 @@
         Engine snapshot = SnapshotEngine.createSnapshotFor(engine);
 
-        return new BTreeMap<K, V>(snapshot,treeRecid, defaultSerializer);
+        return new BTreeMap<>(snapshot,treeRecid, defaultSerializer);
     }