X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.graph%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Frepresentation%2FTransferableGraphFileReader.java;h=ae1ec711ce676e9d3932cbbbc10485601cbb2f1d;hp=7f4cc3e9b03216074e1ed31fd09073e4ceb50098;hb=1dfeb7d5c49b1391cd9d877e1eddab18995cb151;hpb=c13c4179bda758e77fe1f2032d3c4268bb9e3120

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..ae1ec711c 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;
 		}
 		
@@ -164,11 +168,11 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 		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++) {
@@ -215,15 +219,15 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 
 		}
 
-//		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,12 +246,12 @@ 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]; 
 
@@ -262,13 +266,13 @@ final public class TransferableGraphFileReader extends ByteFileReader {
 			        .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 +288,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) {