Changeset 29484 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/SerializerBase.java

Timestamp:

2013-04-07T17:07:27+02:00 (13 years ago)

Author:

akks

Message:

JOSM/ImageryCache: updated MapDB (no more deadlocks, Java 1.6 compatible), less crashes, multiple-JOSM support

File:

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

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

@@ -34 +34 @@
 
 
-    static final Set knownSerializable = new HashSet(Arrays.asList(
+    static final class knownSerializable{
+        static final Set get = new HashSet(Arrays.asList(
             BTreeKeySerializer.STRING,
             BTreeKeySerializer.ZERO_OR_POSITIVE_LONG,
             BTreeKeySerializer.ZERO_OR_POSITIVE_INT,
-
             Utils.COMPARABLE_COMPARATOR, Utils.COMPARABLE_COMPARATOR_WITH_NULLS,
 
@@ -44 +44 @@
             Serializer.EMPTY_SERIALIZER, Serializer.BASIC_SERIALIZER, Serializer.CRC32_CHECKSUM
     ));
+    }
 
     public static void assertSerializable(Object o){
         if(o!=null && !(o instanceof Serializable)
-                && !knownSerializable.contains(o)){
+                && !knownSerializable.get.contains(o)){
             throw new IllegalArgumentException("Not serializable: "+o.getClass());
         }
@@ -55 +56 @@
      * Utility class similar to ArrayList, but with fast identity search.
      */
-    final static class FastArrayList<K> {
+    protected final static class FastArrayList<K> {
 
         private int size = 0;
@@ -303 +304 @@
             if(((BTreeKeySerializer.BasicKeySerializer)obj).defaultSerializer!=this) throw new InternalError();
             return;
-        } else if(clazz == CompressLZF.SerializerCompressWrapper.class){
+        } else if(clazz == CompressSerializerWrapper.class){
             out.write(SERIALIZER_COMPRESSION_WRAPPER);
-            serialize(out, ((CompressLZF.SerializerCompressWrapper)obj).serializer, objectStack);
+            serialize(out, ((CompressSerializerWrapper)obj).serializer, objectStack);
             return;
 
@@ -1111 +1112 @@
                 break;
             case SERIALIZER_COMPRESSION_WRAPPER:
-                ret = CompressLZF.serializerCompressWrapper((Serializer) deserialize(is, objectStack));
+                ret = CompressLZF.CompressionWrapper((Serializer) deserialize(is, objectStack));
                 break;
             default: