X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fprocore%2Fcluster%2FResourceTable.java;h=1587bc8052eb4ae416f1b43e5e993786e56a5f79;hp=e997b731870159486a38cfebab9a2b7eb64f7c36;hb=7e66fdd1670687a56d8ef980d14d83bfc5f16583;hpb=6f11a60dee43d620d500c0cf5af34a1d91c80a8b

diff --git a/bundles/org.simantics.db.procore/src/org/simantics/db/procore/cluster/ResourceTable.java b/bundles/org.simantics.db.procore/src/org/simantics/db/procore/cluster/ResourceTable.java
index e997b7318..1587bc805 100644
--- a/bundles/org.simantics.db.procore/src/org/simantics/db/procore/cluster/ResourceTable.java
+++ b/bundles/org.simantics.db.procore/src/org/simantics/db/procore/cluster/ResourceTable.java
@@ -14,7 +14,6 @@ package org.simantics.db.procore.cluster;
 import java.util.ArrayList;
 
 import org.simantics.db.Resource;
-import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.ExternalValueException;
 import org.simantics.db.exception.ValidationException;
@@ -32,9 +31,11 @@ import org.simantics.db.impl.Table;
 import org.simantics.db.impl.TableFactory;
 import org.simantics.db.impl.TableSizeListener;
 import org.simantics.db.impl.graph.ReadGraphImpl;
-import org.simantics.db.procedure.AsyncContextMultiProcedure;
-import org.simantics.db.procedure.AsyncMultiProcedure;
+import org.simantics.db.procedure.SyncContextMultiProcedure;
+import org.simantics.db.procedure.SyncMultiProcedure;
 import org.simantics.db.procore.cluster.PredicateTable.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 final class ResourceElement {
@@ -413,7 +414,7 @@ final class ResourceElement {
     }
     
     public static void foreachObject(long[] table, int index,
-    		final ReadGraphImpl graph, final AsyncMultiProcedure<Resource> procedure,
+    		final ReadGraphImpl graph, final SyncMultiProcedure<Resource> procedure,
     		final ClusterSupport support, final int pRef, final ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, final Modifier modifier)
     throws DatabaseException {
         if (DEBUG)
@@ -506,7 +507,7 @@ final class ResourceElement {
     }
 
     public static <C> void foreachObject(long[] table, int index,
-    		final ReadGraphImpl graph, final C context, final AsyncContextMultiProcedure<C, Resource> procedure,
+    		final ReadGraphImpl graph, final C context, final SyncContextMultiProcedure<C, Resource> procedure,
     		final ClusterSupport support, final int pRef, final ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, final Modifier modifier)
     throws DatabaseException {
         if (DEBUG)
@@ -1021,14 +1022,14 @@ public final class ResourceTable extends Table<long[]> {
     }
 
     public void foreachObject(int resourceIndex, ReadGraphImpl graph,
-    		AsyncMultiProcedure<Resource> procedure, ClusterSupport support, int pRef, ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, Modifier modifier) throws DatabaseException {
+    		SyncMultiProcedure<Resource> procedure, ClusterSupport support, int pRef, ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, Modifier modifier) throws DatabaseException {
         int realIndex = checkIndexAndGetRealIndex(resourceIndex);
         ResourceElement.foreachObject(table, realIndex, graph, procedure, support,
         		pRef, pCompleteType, ct, modifier);
     }
 
     public <C> void foreachObject(int resourceIndex, ReadGraphImpl graph, C context,
-    		AsyncContextMultiProcedure<C, Resource> procedure, ClusterSupport support, int pRef, ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, Modifier modifier) throws DatabaseException {
+    		SyncContextMultiProcedure<C, Resource> procedure, ClusterSupport support, int pRef, ClusterI.CompleteTypeEnum pCompleteType, CompleteTable ct, Modifier modifier) throws DatabaseException {
         int realIndex = checkIndexAndGetRealIndex(resourceIndex);
         ResourceElement.foreachObject(table, realIndex, graph, context, procedure, support,
         		pRef, pCompleteType, ct, modifier);
@@ -1175,6 +1176,8 @@ class Statement {
 
 class CalculateStatements
 implements ClusterI.PredicateProcedure<CalculateStatements> {
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(CalculateStatements.class);
     private ObjectTable         ot;
     private final int           sRef;
 
@@ -1191,8 +1194,8 @@ implements ClusterI.PredicateProcedure<CalculateStatements> {
         try {
             oIndex = ClusterTraits.statementIndexGet(oIndex);
         } catch (DatabaseException e) {
-            Logger.getDefault().logError("Missing object set for s="
-                    + sRef + " p=" + pKey, null);
+            LOGGER.error("Missing object set for s="
+                    + sRef + " p=" + pKey, e);
             return false; // continue looping
         }
         int osize = ot.getObjectSetSize(oIndex);