Changeset 30532 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/EngineWrapper.java

Timestamp:

2014-07-14T04:18:06+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

File:

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

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

@@ -14 +14 @@
  *  limitations under the License.
  */
-
 package org.mapdb;
-
 
 import java.io.IOError;
@@ -26 +24 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-
 /**
  * EngineWrapper adapter. It implements all methods on Engine interface.
@@ -293 +290 @@
     }
 
-
     /**
      * check if Record Instances were not modified while in cache.
      * Usuful to diagnose strange problems with Instance Cache.
      */
-    public static class ImmutabilityCheckEngine extends EngineWrapper{
-
-        protected static class Item {
-            final Serializer serializer;
-            final Object item;
+    public static class ImmutabilityCheckEngine extends EngineWrapper {
+
+        protected static class Item<E> {
+            final Serializer<E> serializer;
+            final E item;
             final int oldChecksum;
 
-            public Item(Serializer serializer, Object item) {
+            public Item(Serializer<E> serializer, E item) {
                 if(item==null || serializer==null) throw new AssertionError("null");
                 this.serializer = serializer;
@@ -313 +309 @@
             }
 
-            private int checksum(){
+            private int checksum() {
                 try {
                     DataOutput2 out = new DataOutput2();
@@ -324 +320 @@
             }
 
-            void check(){
+            void check() {
                 int newChecksum = checksum();
                 if(oldChecksum!=newChecksum) throw new AssertionError("Record instance was modified: \n  "+item+"\n  "+serializer);
@@ -330 +326 @@
         }
 
-        protected LongConcurrentHashMap<Item> items = new LongConcurrentHashMap<Item>();
+        protected LongConcurrentHashMap<Item<?>> items = new LongConcurrentHashMap<>();
 
         protected ImmutabilityCheckEngine(Engine engine) {
@@ -338 +334 @@
         @Override
         public <A> A get(long recid, Serializer<A> serializer) {
-            Item item = items.get(recid);
+            Item<?> item = items.get(recid);
             if(item!=null) item.check();
             A ret = super.get(recid, serializer);
-            if(ret!=null) items.put(recid, new Item(serializer,ret));
+            if(ret!=null) items.put(recid, new Item<A>(serializer,ret));
             return ret;
         }
@@ -348 +344 @@
         public <A> long put(A value, Serializer<A> serializer) {
             long ret =  super.put(value, serializer);
-            if(value!=null) items.put(ret, new Item(serializer,value));
+            if(value!=null) items.put(ret, new Item<A>(serializer,value));
             return ret;
         }
@@ -354 +350 @@
         @Override
         public <A> void update(long recid, A value, Serializer<A> serializer) {
-            Item item = items.get(recid);
+            Item<?> item = items.get(recid);
             if(item!=null) item.check();
             super.update(recid, value, serializer);
-            if(value!=null) items.put(recid, new Item(serializer,value));
-        }
-
+            if(value!=null) items.put(recid, new Item<A>(serializer,value));
+        }
+
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         @Override
         public <A> boolean compareAndSwap(long recid, A expectedOldValue, A newValue, Serializer<A> serializer) {
-            Item item = items.get(recid);
+            Item<?> item = items.get(recid);
             if(item!=null) item.check();
             boolean ret = super.compareAndSwap(recid, expectedOldValue, newValue, serializer);
@@ -372 +369 @@
         public void close() {
             super.close();
-            for(Iterator<Item> iter = items.valuesIterator(); iter.hasNext();){
+            for(Iterator<Item<?>> iter = items.valuesIterator(); iter.hasNext();){
                 iter.next().check();
             }
@@ -378 +375 @@
         }
     }
-    
     
     /** Engine wrapper with all methods synchronized on global lock, useful to diagnose concurrency issues.*/ 
@@ -442 +438 @@
         }
     }
-
 }