Add calls to finalizeDBLoad2 into SCLUtil method.

gitlab #35

Change-Id: Iec99d89eb06d3dbfc9ff9b7e5926b945db22840c

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
index ae6bac4baeff7716b0795d16ceb8b780b2e6a88c..a27e76f2c83342dc2edba05f562d0047264b90e3 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
@@ -30,10 +30,12 @@ public class SCLUtil {
                        public P3DScriptNodeMap perform(ReadGraph graph) throws DatabaseException {
                                PipingRules.setEnabled(false);
                                IMappingSchema<Resource, Object> schema = SchemaBuilder.getSchema(graph);
-                               IMapping mapping = Mappings.createWithListening(schema);
+                               IMapping<Resource, Object> mapping = Mappings.createWithListening(schema);
                                P3DRootNode rootNode = (P3DRootNode)mapping.map(graph, root);
                                try {
                                        P3DUtil.finalizeDBLoad(rootNode);
+                                       // FIXME: Something needs to be done here...
+                                       P3DUtil.finalizeDBLoad2(rootNode);
                                } catch (Exception e) {
                                        throw new DatabaseException(e);
                                }
@@ -57,10 +59,11 @@ public class SCLUtil {
                        public P3DRootNode perform(ReadGraph graph) throws DatabaseException {
                                PipingRules.setEnabled(false);
                                IMappingSchema<Resource, Object> schema = SchemaBuilder.getSchema(graph);
-                               IMapping mapping = Mappings.createWithoutListening(schema);
+                               IMapping<Resource, Object> mapping = Mappings.createWithoutListening(schema);
                                P3DRootNode rootNode = (P3DRootNode)mapping.map(graph, root);
                                try {
                                        P3DUtil.finalizeDBLoad(rootNode);
+                                       P3DUtil.finalizeDBLoad2(rootNode);
                                } catch (Exception e) {
                                        throw new DatabaseException(e);
                                }