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

Timestamp:

2013-04-07T17:07:27+02:00 (12 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/Serializer.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import java.io.DataOutput;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.zip.CRC32;
 
@@ -148 +149 @@
      */
     
-    public static final Serializer<byte[]> CRC32_CHECKSUM = new Serializer<byte[]>() {
+    Serializer<byte[]> CRC32_CHECKSUM = new Serializer<byte[]>() {
         @Override
         public void serialize(DataOutput out, byte[] value) throws IOException {
@@ -174 +175 @@
 
 
+    Serializer<byte[] > BYTE_ARRAY_SERIALIZER = new Serializer<byte[]>() {
+
+        @Override
+        public void serialize(DataOutput out, byte[] value) throws IOException {
+            out.write(value);
+        }
+
+        @Override
+        public byte[] deserialize(DataInput in, int available) throws IOException {
+            byte[] ret = new byte[available];
+            in.readFully(ret);
+            return ret;
+        }
+    } ;
+
+
+    class CompressSerializerWrapper<E> implements Serializer<E>, Serializable {
+        protected final Serializer<E> serializer;
+        public CompressSerializerWrapper(Serializer<E> serializer) {
+            this.serializer = serializer;
+        }
+
+        @Override
+        public void serialize(DataOutput out, E value) throws IOException {
+            //serialize to byte[]
+            DataOutput2 out2 = new DataOutput2();
+            serializer.serialize(out2, value);
+            byte[] b = out2.copyBytes();
+            CompressLZF.SERIALIZER.serialize(out, b);
+        }
+
+        @Override
+        public E deserialize(DataInput in, int available) throws IOException {
+            byte[] b = CompressLZF.SERIALIZER.deserialize(in, available);
+            DataInput2 in2 = new DataInput2(b);
+            return serializer.deserialize(in2, b.length);
+        }
+    }
 }