From: Antti Villberg <antti.villberg@semantum.fi>
Date: Fri, 16 Nov 2018 13:11:00 +0000 (+0200)
Subject: Required changes in Spreadsheet
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=38ba0e2f0b89d7bfbd78bf03e4a8a66fd4bcf757;p=simantics%2Fplatform.git

Required changes in Spreadsheet

gitlab #206

Change-Id: I2366b6e7395750cc9b6649abd3e77ef1661d2d1f
---

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
index d741d4c7a..88fea35da 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetBook.java
@@ -24,12 +24,12 @@ import org.simantics.spreadsheet.graph.synchronization.LineUpdater;
 import org.simantics.spreadsheet.graph.synchronization.NullUpdater;
 import org.simantics.spreadsheet.graph.synchronization.SheetLineComponent;
 import org.simantics.spreadsheet.graph.synchronization.StyleUpdater;
-import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
-import org.simantics.structural.synchronization.base.ModuleUpdaterFactoryBase;
-import org.simantics.structural.synchronization.base.SolverNameUtil;
 import org.simantics.structural.synchronization.utils.ComponentFactory;
 import org.simantics.structural.synchronization.utils.MappingBase;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterBase;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterFactoryBase;
 import org.simantics.structural.synchronization.utils.Solver;
+import org.simantics.structural.synchronization.utils.SolverNameUtil;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import it.unimi.dsi.fastutil.longs.AbstractLongList;
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetReferenceResolver.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetReferenceResolver.java
index 6c3c0b17c..8bb3a9b9b 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetReferenceResolver.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetReferenceResolver.java
@@ -1,7 +1,7 @@
 package org.simantics.spreadsheet.graph;
 
 import org.simantics.spreadsheet.graph.synchronization.SheetLineComponent;
-import org.simantics.structural.synchronization.base.ReferenceResolverBase;
+import org.simantics.structural.synchronization.utils.ReferenceResolverBase;
 import org.simantics.structural.synchronization.utils.Solver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineCommandBuilder.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineCommandBuilder.java
index 90c96cc2d..a7e5f87b1 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineCommandBuilder.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineCommandBuilder.java
@@ -17,7 +17,7 @@ import org.simantics.spreadsheet.graph.function.LineContentBeanCell;
 import org.simantics.spreadsheet.graph.parser.SheetFormulaParser;
 import org.simantics.spreadsheet.graph.parser.ast.AstArrayFormulaReference;
 import org.simantics.spreadsheet.graph.parser.ast.AstValue;
-import org.simantics.structural.synchronization.base.CommandBuilder;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
 import org.simantics.structural.synchronization.utils.Solver;
 
 public class LineCommandBuilder implements CommandBuilder {
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineNodeUpdater.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineNodeUpdater.java
index 811a35c23..c731c4437 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineNodeUpdater.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineNodeUpdater.java
@@ -4,10 +4,10 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.simantics.databoard.binding.mutable.Variant;
-import org.simantics.structural.synchronization.base.CommandBuilder;
-import org.simantics.structural.synchronization.base.ModuleUpdateContext;
-import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
-import org.simantics.structural.synchronization.base.PropertyUpdateRule;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
+import org.simantics.structural.synchronization.utils.ModuleUpdateContext;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterBase;
+import org.simantics.structural.synchronization.utils.PropertyUpdateRule;
 
 public class LineNodeUpdater extends ModuleUpdaterBase<SheetLineComponent> {
 	
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineUpdater.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineUpdater.java
index baa0851b2..66acdcefe 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineUpdater.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LineUpdater.java
@@ -6,11 +6,10 @@ import java.util.Map;
 import org.simantics.databoard.adapter.AdaptException;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.spreadsheet.graph.function.LineContentBean;
-import org.simantics.structural.synchronization.base.CommandBuilder;
-import org.simantics.structural.synchronization.base.ModuleUpdateContext;
-import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
-import org.simantics.structural.synchronization.base.PropertyUpdateRule;
-import org.simantics.structural.synchronization.utils.Solver;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
+import org.simantics.structural.synchronization.utils.ModuleUpdateContext;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterBase;
+import org.simantics.structural.synchronization.utils.PropertyUpdateRule;
 
 public class LineUpdater extends ModuleUpdaterBase<SheetLineComponent> {
 	
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LinesCommandBuilder.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LinesCommandBuilder.java
index 4cf804c2d..cd1a6f36a 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LinesCommandBuilder.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/LinesCommandBuilder.java
@@ -2,7 +2,7 @@ package org.simantics.spreadsheet.graph.synchronization;
 
 import org.simantics.spreadsheet.graph.SpreadsheetBook;
 import org.simantics.spreadsheet.graph.SpreadsheetLines;
-import org.simantics.structural.synchronization.base.CommandBuilder;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
 import org.simantics.structural.synchronization.utils.Solver;
 
 public class LinesCommandBuilder implements CommandBuilder {
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullCommandBuilder.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullCommandBuilder.java
index 80ed1ca13..ea37490ff 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullCommandBuilder.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullCommandBuilder.java
@@ -1,6 +1,6 @@
 package org.simantics.spreadsheet.graph.synchronization;
 
-import org.simantics.structural.synchronization.base.CommandBuilder;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
 import org.simantics.structural.synchronization.utils.Solver;
 
 public class NullCommandBuilder implements CommandBuilder {
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullUpdater.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullUpdater.java
index e03169fd4..3fa3379aa 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullUpdater.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/NullUpdater.java
@@ -1,7 +1,7 @@
 package org.simantics.spreadsheet.graph.synchronization;
 
-import org.simantics.structural.synchronization.base.CommandBuilder;
-import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterBase;
 
 public class NullUpdater extends ModuleUpdaterBase<SheetLineComponent> {
 	
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/SpreadsheetSynchronizationEventHandler.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/SpreadsheetSynchronizationEventHandler.java
index 716086b63..4d943fb34 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/SpreadsheetSynchronizationEventHandler.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/SpreadsheetSynchronizationEventHandler.java
@@ -3,7 +3,7 @@ package org.simantics.spreadsheet.graph.synchronization;
 import org.simantics.db.ReadGraph;
 import org.simantics.spreadsheet.graph.SpreadsheetBook;
 import org.simantics.spreadsheet.graph.SpreadsheetReferenceResolver;
-import org.simantics.structural.synchronization.base.SynchronizationEventHandlerBase;
+import org.simantics.structural.synchronization.utils.SynchronizationEventHandlerBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java
index 4451d1314..be020a625 100644
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/synchronization/StyleUpdater.java
@@ -8,10 +8,10 @@ import org.simantics.datatypes.literal.Font;
 import org.simantics.datatypes.literal.RGB;
 import org.simantics.spreadsheet.graph.SpreadsheetBook;
 import org.simantics.spreadsheet.graph.SpreadsheetStyle;
-import org.simantics.structural.synchronization.base.CommandBuilder;
-import org.simantics.structural.synchronization.base.ModuleUpdateContext;
-import org.simantics.structural.synchronization.base.ModuleUpdaterBase;
-import org.simantics.structural.synchronization.base.PropertyUpdateRule;
+import org.simantics.structural.synchronization.utils.CommandBuilder;
+import org.simantics.structural.synchronization.utils.ModuleUpdateContext;
+import org.simantics.structural.synchronization.utils.ModuleUpdaterBase;
+import org.simantics.structural.synchronization.utils.PropertyUpdateRule;
 import org.simantics.structural.synchronization.utils.Solver;
 
 public class StyleUpdater extends ModuleUpdaterBase<SheetLineComponent> {
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/CommandBuilder.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/CommandBuilder.java
deleted file mode 100644
index 57b8d9a06..000000000
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/CommandBuilder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.simantics.structural.synchronization.base;
-
-import org.simantics.structural.synchronization.utils.Solver;
-
-public interface CommandBuilder {
-
-	void apply(Solver solver);
-	<T> T getConcrete();
-	
-}
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterFactoryBase.java b/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterFactoryBase.java
deleted file mode 100644
index f30527e3d..000000000
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterFactoryBase.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.simantics.structural.synchronization.base;
-
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.structural.synchronization.utils.ComponentBase;
-
-
-public interface ModuleUpdaterFactoryBase<T extends ComponentBase<T>> {
-
-    public ModuleUpdaterBase<T> createUpdater(String id) throws DatabaseException;
-
-}
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/internal/Policy.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/internal/Policy.java
similarity index 100%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/internal/Policy.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/internal/Policy.java
diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/CommandBuilder.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/CommandBuilder.java
new file mode 100644
index 000000000..84409004b
--- /dev/null
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/CommandBuilder.java
@@ -0,0 +1,8 @@
+package org.simantics.structural.synchronization.utils;
+
+public interface CommandBuilder {
+
+	void apply(Solver solver);
+	<T> T getConcrete();
+	
+}
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ConnectionUpdateRule.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ConnectionUpdateRule.java
similarity index 73%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ConnectionUpdateRule.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ConnectionUpdateRule.java
index 144833a7a..a7f42a737 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ConnectionUpdateRule.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ConnectionUpdateRule.java
@@ -1,10 +1,9 @@
-package org.simantics.structural.synchronization.base;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.Collection;
 import java.util.Map;
 
 import org.simantics.databoard.binding.mutable.Variant;
-import org.simantics.structural.synchronization.utils.ComponentBase;
 
 public interface ConnectionUpdateRule<T extends ComponentBase<T>> {
 
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleCallback.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleCallback.java
similarity index 61%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleCallback.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleCallback.java
index d74182e2f..2fcd60453 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleCallback.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleCallback.java
@@ -1,4 +1,4 @@
-package org.simantics.structural.synchronization.base;
+package org.simantics.structural.synchronization.utils;
 
 public interface ModuleCallback {
 
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdateContext.java
similarity index 96%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdateContext.java
index 854a22d23..dc0588669 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdateContext.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdateContext.java
@@ -1,12 +1,10 @@
-package org.simantics.structural.synchronization.base;
-
-import gnu.trove.map.hash.THashMap;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.ArrayList;
 
 import org.simantics.databoard.binding.mutable.Variant;
-import org.simantics.structural.synchronization.utils.ComponentBase;
-import org.simantics.structural.synchronization.utils.Solver;
+
+import gnu.trove.map.hash.THashMap;
 
 public class ModuleUpdateContext<T extends ComponentBase<T>> {
 
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterBase.java
similarity index 97%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterBase.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterBase.java
index 45ea7400f..46af213f2 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ModuleUpdaterBase.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterBase.java
@@ -1,6 +1,4 @@
-package org.simantics.structural.synchronization.base;
-
-import gnu.trove.map.hash.THashMap;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -9,7 +7,8 @@ import java.util.Map;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.structural.synchronization.protocol.Connection;
 import org.simantics.structural.synchronization.protocol.SerializedVariable;
-import org.simantics.structural.synchronization.utils.ComponentBase;
+
+import gnu.trove.map.hash.THashMap;
 
 abstract public class ModuleUpdaterBase<T extends ComponentBase<T>> {
 
diff --git a/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterFactoryBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterFactoryBase.java
new file mode 100644
index 000000000..670ab007f
--- /dev/null
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ModuleUpdaterFactoryBase.java
@@ -0,0 +1,7 @@
+package org.simantics.structural.synchronization.utils;
+
+public interface ModuleUpdaterFactoryBase<T extends ComponentBase<T>> {
+
+    public ModuleUpdaterBase<T> createUpdater(String id) throws Exception;
+
+}
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/PropertyUpdateRule.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/PropertyUpdateRule.java
similarity index 77%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/PropertyUpdateRule.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/PropertyUpdateRule.java
index a0b734d15..7c30ec20d 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/PropertyUpdateRule.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/PropertyUpdateRule.java
@@ -1,10 +1,9 @@
-package org.simantics.structural.synchronization.base;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.Collection;
 import java.util.Map;
 
 import org.simantics.databoard.binding.mutable.Variant;
-import org.simantics.structural.synchronization.utils.ComponentBase;
 
 
 public interface PropertyUpdateRule<T extends ComponentBase<T>> {
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ReferenceResolverBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ReferenceResolverBase.java
similarity index 96%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ReferenceResolverBase.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ReferenceResolverBase.java
index 33b5d9bdc..6f16cbd64 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/ReferenceResolverBase.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/ReferenceResolverBase.java
@@ -1,17 +1,15 @@
-package org.simantics.structural.synchronization.base;
-
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.procedure.TObjectObjectProcedure;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
 import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.structural.synchronization.protocol.SynchronizationEventHandler;
-import org.simantics.structural.synchronization.utils.ComponentBase;
-import org.simantics.structural.synchronization.utils.Solver;
 import org.slf4j.Logger;
 
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.procedure.TObjectObjectProcedure;
+
 abstract public class ReferenceResolverBase<T extends ComponentBase<T>> {
 	
     protected SynchronizationEventHandler eventHandler;
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SolverNameUtil.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SolverNameUtil.java
similarity index 95%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SolverNameUtil.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SolverNameUtil.java
index 70c9ff7ae..9f3b38064 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SolverNameUtil.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SolverNameUtil.java
@@ -1,4 +1,4 @@
-package org.simantics.structural.synchronization.base;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.function.BiConsumer;
 
diff --git a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SynchronizationEventHandlerBase.java
similarity index 97%
rename from bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java
rename to bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SynchronizationEventHandlerBase.java
index 7be353a02..2ffb69635 100644
--- a/bundles/org.simantics.structural.synchronization.client/src/org/simantics/structural/synchronization/base/SynchronizationEventHandlerBase.java
+++ b/bundles/org.simantics.structural.synchronization/src/org/simantics/structural/synchronization/utils/SynchronizationEventHandlerBase.java
@@ -1,4 +1,4 @@
-package org.simantics.structural.synchronization.base;
+package org.simantics.structural.synchronization.utils;
 
 import java.util.ArrayDeque;
 import java.util.Collection;
@@ -8,17 +8,12 @@ import java.util.Queue;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.adapter.AdaptException;
-import org.simantics.db.exception.DatabaseException;
 import org.simantics.structural.synchronization.internal.Policy;
 import org.simantics.structural.synchronization.protocol.ChildInfo;
 import org.simantics.structural.synchronization.protocol.Connection;
 import org.simantics.structural.synchronization.protocol.SerializedVariable;
 import org.simantics.structural.synchronization.protocol.SynchronizationEventHandler;
 import org.simantics.structural.synchronization.protocol.SynchronizationException;
-import org.simantics.structural.synchronization.utils.ComponentBase;
-import org.simantics.structural.synchronization.utils.ComponentFactory;
-import org.simantics.structural.synchronization.utils.MappingBase;
-import org.simantics.structural.synchronization.utils.Solver;
 import org.slf4j.Logger;
 
 import gnu.trove.map.hash.THashMap;
@@ -379,7 +374,7 @@ public abstract class SynchronizationEventHandlerBase<T extends ComponentBase<T>
             ModuleUpdaterBase<T> updater;
             try {
                 updater = moduleUpdaterFactory.createUpdater(id);
-            } catch (DatabaseException e) {
+            } catch (Exception e) {
                 throw new RuntimeException(e);
             }
             if(updater == null)