X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Frepresentation%2FTransferableGraphFileReader.java;h=077eb6617a1703f3cbffa913633e2b4c738f95ab;hb=69d8f2b115a832560eca0d56903c8977178b71ab;hp=7f4cc3e9b03216074e1ed31fd09073e4ceb50098;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphFileReader.java b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphFileReader.java
index 7f4cc3e9b..077eb6617 100644
--- a/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphFileReader.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/representation/TransferableGraphFileReader.java
@@ -18,10 +18,14 @@ import org.simantics.databoard.container.DataContainers;
 import org.simantics.databoard.serialization.RuntimeSerializerConstructionException;
 import org.simantics.databoard.serialization.Serializer;
 import org.simantics.databoard.type.Datatype;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 final public class TransferableGraphFileReader extends ByteFileReader {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(TransferableGraphFileReader.class);
+
 	InputStream in = new InputStream() {
 
         @Override
@@ -68,7 +72,7 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 			int pos = dst.position();
 			int limit = dst.limit();
 			int i=stream.read(dst.array(), pos, limit-pos);
-			//System.err.println("Read " + i + " (expected " + dst.array().length + ")");
+			//LOGGER.warn("Read " + i + " (expected " + dst.array().length + ")");
 			return i;
 		}
 		
@@ -157,40 +161,40 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 
 		int resourceCount = safeInt();
 		
-		List<Object> idcontext = new ArrayList<Object>(); 
+		List<Object> idcontext = new ArrayList<>(); 
 		dis = new DataInputStream(in);
 		Extensions extensions = (Extensions)Bindings.getSerializerUnchecked(Extensions.class).deserialize((DataInput)dis, idcontext);
 		
 		int identities = safeInt();
 		Identity[] ids = new Identity[identities];
 
-//		System.err.println("rc: " + resourceCount);
-//		System.err.println("ids: " + identities);
+//		LOGGER.warn("rc: " + resourceCount);
+//		LOGGER.warn("ids: " + identities);
 		
 //		long duration = System.nanoTime() - start;
-//		System.err.println("start in " + 1e-9*duration + "s.");
+//		LOGGER.warn("start in " + 1e-9*duration + "s.");
 //		start = System.nanoTime();
-		
+
 		for(int i=0;i<identities;i++) {
 			int rid = safeInt();
 			byte type = bytes[byteIndex++];
 			// External
 			if(type == 1) {
-				
+
 				int parent = safeInt();
 				int nameLen = getDynamicUInt32();
-				
+
 				if(byteIndex+nameLen < SIZE) {
 					ids[i] = new Identity(rid, new External(parent, utf(bytes, byteIndex, byteIndex + nameLen)));
 					byteIndex += nameLen;
 				} else {
 					ids[i] = new Identity(rid, new External(parent, utf(safeBytes(nameLen), 0, nameLen)));
 				}
-				
+
 			} 
 			// Internal
 			else if(type == 3) {
-				
+
 				int parent = safeInt();
 				int nameLen = getDynamicUInt32();
 				if(byteIndex+nameLen < SIZE) {
@@ -211,19 +215,21 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 
 			} else if(type == 2) {
 				throw new UnsupportedOperationException();
+			} else {
+				throw new IllegalStateException();
 			}
 
 		}
 
-//		for(Identity id : ids) System.err.println("id: " + id);
+//		for(Identity id : ids) LOGGER.warn("id: " + id);
 
 		
 //		duration = System.nanoTime() - start;
-//		System.err.println("ids in " + 1e-9*duration + "s.");
+//		LOGGER.warn("ids in " + 1e-9*duration + "s.");
 //		start = System.nanoTime();
 
 		int stmLength = safeInt();
-//		System.err.println("statements: " + stmLength + " (" + byteIndex + ")");
+//		LOGGER.warn("statements: " + stmLength + " (" + byteIndex + ")");
 		
 		int[] statements = new int[stmLength];
 
@@ -242,33 +248,33 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 		}
 
 //		duration = System.nanoTime() - start;
-//		System.err.println("stms in " + 1e-9*duration + "s.");
+//		LOGGER.warn("stms in " + 1e-9*duration + "s.");
 //		
 //		start = System.nanoTime();
 
 		int valueLength = safeInt();
-//		System.err.println("values: " + valueLength + " (" + byteIndex + ")");
+//		LOGGER.warn("values: " + valueLength + " (" + byteIndex + ")");
 
 		Value[] values = new Value[valueLength]; 
 
 		Serializer variantSerializer = Bindings.getSerializerUnchecked(Bindings.VARIANT);
 		
-		idcontext = new ArrayList<Object>(); 
 		dis = new DataInputStream(in);
 		
 		for(int i=0;i<valueLength;i++) {
 			int resource = safeInt();
+			idcontext.clear();
 			Variant value = (Variant)variantSerializer
 			        .deserialize((DataInput)dis, idcontext);
 			values[i] = new Value(resource, value);
 			
-			//System.err.println("read variant[" + resource + "]: " + value.toString().substring(0, Math.min(100, value.toString().length())));
+			//LOGGER.warn("read variant[" + resource + "]: " + value.toString().substring(0, Math.min(100, value.toString().length())));
 			
 		}
 
 		
 //		duration = System.nanoTime() - start;
-//		System.err.println("values in " + 1e-9*duration + "s.");
+//		LOGGER.warn("values in " + 1e-9*duration + "s.");
 		
 		return new TransferableGraph1(resourceCount, ids, statements, values, extensions.map);
 
@@ -284,7 +290,7 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 			long s = System.nanoTime();
 			reader.readTG();
 			long d = System.nanoTime() - s;
-			System.err.println("Duration=" + 1e-9*d + "s.");
+			LOGGER.warn("Duration=" + 1e-9*d + "s.");
 			
 			
 		} catch (Throwable t) {