Cluster loading problem fix made by Antti

[simantics/platform.git] / bundles / org.simantics.db.procore / src / fi / vtt / simantics / procore / internal / ExternalValueSupportImpl.java

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ExternalValueSupportImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ExternalValueSupportImpl.java
index a4f8d599a0fee9e69c40914650ae26aee46c26d4..bee7425c228f50620fb7d04dcb9d64aa289d1722 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ExternalValueSupportImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/ExternalValueSupportImpl.java
@@ -1,84 +1,84 @@
-package fi.vtt.simantics.procore.internal;\r
-\r
-import org.simantics.db.ExternalValueSupport;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.impl.ClusterI;\r
-import org.simantics.db.impl.ClusterTranslator;\r
-import org.simantics.db.impl.ResourceImpl;\r
-\r
-import fi.vtt.simantics.procore.DebugPolicy;\r
-\r
-public class ExternalValueSupportImpl implements ExternalValueSupport {\r
-    private final boolean DEBUG = DebugPolicy.REPORT_CLUSTER_EVENTS;\r
-    private final SessionImplSocket session;\r
-    private ClusterTranslator clusterTranslator;\r
-    private final ClusterTable clusterTable;\r
-    ExternalValueSupportImpl(SessionImplSocket session) {\r
-        this.session = session;\r
-        this.clusterTranslator = session.clusterTranslator;\r
-        this.clusterTable = session.getClusterTable();\r
-    }\r
-    private final void check4Translator() {\r
-        if (null == clusterTranslator)\r
-            this.clusterTranslator = session.clusterTranslator;\r
-    }\r
-    @Override\r
-    public void writeValue(WriteGraph graph, Resource resource, long offset, int length, byte[] bytes)\r
-    throws DatabaseException {\r
-        check4Translator();\r
-        assert(length <= bytes.length);\r
-        ResourceImpl resourceImpl = (ResourceImpl)resource;\r
-        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);\r
-        cluster.modiValueEx(resourceImpl.id, offset, length, bytes, 0, clusterTranslator);\r
-    }\r
-// This breaks undo.\r
-//    @Override\r
-//    public void moveValue(WriteGraph graph, Resource resource)\r
-//    throws DatabaseException {\r
-//        this.writeValue(graph, resource, (1L<<58)-1, 0, new byte[0]);\r
-//    }\r
-// This breaks undo.\r
-//    @Override\r
-//    public void commitAndContinue(WriteGraph graph, WriteTraits wtraits, Resource resource)\r
-//    throws DatabaseException {\r
-//        XSupport xs = graph.getService(XSupport.class);\r
-//        xs.commitAndContinue(graph, wtraits);\r
-//        clusterTranslator.wait4RequestsLess(1);\r
-//    }\r
-    @Override\r
-    public byte[] readValue(ReadGraph graph, Resource resource, long offset, int length)\r
-    throws DatabaseException {\r
-        check4Translator();\r
-        ResourceImpl resourceImpl = (ResourceImpl)resource;\r
-        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);\r
-        return cluster.readValueEx(resourceImpl.id, offset, length, clusterTranslator);\r
-    }\r
-    public long getValueSize(ReadGraph graph, Resource resource)\r
-    throws DatabaseException {\r
-        check4Translator();\r
-        ResourceImpl resourceImpl = (ResourceImpl)resource;\r
-        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);\r
-        long size = cluster.getValueSizeEx(resourceImpl.id, clusterTranslator);\r
-        if (DEBUG)\r
-            System.out.println("DEBUG:  resource=" + resource + " value length=" + size + ".");\r
-        return size;\r
-    }\r
-    @Override\r
-    public void removeValue(WriteGraph graph, Resource resource)\r
-    throws DatabaseException {\r
-        check4Translator();\r
-        ResourceImpl resourceImpl = (ResourceImpl)resource;\r
-        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);\r
-        cluster.modiValueEx(resourceImpl.id, 0, 0, new byte[0], 0, clusterTranslator);\r
-        cluster.removeValue(resourceImpl.id, clusterTranslator);\r
-    }\r
-    @Override\r
-    public int wait4RequestsLess(int limit)\r
-    throws DatabaseException {\r
-        check4Translator();\r
-        return clusterTranslator.wait4RequestsLess(limit);\r
-    }\r
-}\r
+package fi.vtt.simantics.procore.internal;
+
+import org.simantics.db.ExternalValueSupport;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.impl.ClusterI;
+import org.simantics.db.impl.ClusterTranslator;
+import org.simantics.db.impl.ResourceImpl;
+
+import fi.vtt.simantics.procore.DebugPolicy;
+
+public class ExternalValueSupportImpl implements ExternalValueSupport {
+    private final boolean DEBUG = DebugPolicy.REPORT_CLUSTER_EVENTS;
+    private final SessionImplSocket session;
+    private ClusterTranslator clusterTranslator;
+    private final ClusterTable clusterTable;
+    ExternalValueSupportImpl(SessionImplSocket session) {
+        this.session = session;
+        this.clusterTranslator = session.clusterTranslator;
+        this.clusterTable = session.getClusterTable();
+    }
+    private final void check4Translator() {
+        if (null == clusterTranslator)
+            this.clusterTranslator = session.clusterTranslator;
+    }
+    @Override
+    public void writeValue(WriteGraph graph, Resource resource, long offset, int length, byte[] bytes)
+    throws DatabaseException {
+        check4Translator();
+        assert(length <= bytes.length);
+        ResourceImpl resourceImpl = (ResourceImpl)resource;
+        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);
+        cluster.modiValueEx(resourceImpl.id, offset, length, bytes, 0, clusterTranslator);
+    }
+// This breaks undo.
+//    @Override
+//    public void moveValue(WriteGraph graph, Resource resource)
+//    throws DatabaseException {
+//        this.writeValue(graph, resource, (1L<<58)-1, 0, new byte[0]);
+//    }
+// This breaks undo.
+//    @Override
+//    public void commitAndContinue(WriteGraph graph, WriteTraits wtraits, Resource resource)
+//    throws DatabaseException {
+//        XSupport xs = graph.getService(XSupport.class);
+//        xs.commitAndContinue(graph, wtraits);
+//        clusterTranslator.wait4RequestsLess(1);
+//    }
+    @Override
+    public byte[] readValue(ReadGraph graph, Resource resource, long offset, int length)
+    throws DatabaseException {
+        check4Translator();
+        ResourceImpl resourceImpl = (ResourceImpl)resource;
+        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);
+        return cluster.readValueEx(resourceImpl.id, offset, length, clusterTranslator);
+    }
+    public long getValueSize(ReadGraph graph, Resource resource)
+    throws DatabaseException {
+        check4Translator();
+        ResourceImpl resourceImpl = (ResourceImpl)resource;
+        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);
+        long size = cluster.getValueSizeEx(resourceImpl.id, clusterTranslator);
+        if (DEBUG)
+            System.out.println("DEBUG:  resource=" + resource + " value length=" + size + ".");
+        return size;
+    }
+    @Override
+    public void removeValue(WriteGraph graph, Resource resource)
+    throws DatabaseException {
+        check4Translator();
+        ResourceImpl resourceImpl = (ResourceImpl)resource;
+        ClusterI cluster = clusterTable.getClusterByResourceKey(resourceImpl.id);
+        cluster.modiValueEx(resourceImpl.id, 0, 0, new byte[0], 0, clusterTranslator);
+        cluster.removeValue(resourceImpl.id, clusterTranslator);
+    }
+    @Override
+    public int wait4RequestsLess(int limit)
+    throws DatabaseException {
+        check4Translator();
+        return clusterTranslator.wait4RequestsLess(limit);
+    }
+}