From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Fri, 25 Oct 2019 14:42:56 +0000 (+0300)
Subject: Add calls to finalizeDBLoad2 into SCLUtil method.
X-Git-Tag: v1.43.0~164^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b7de6cac8cc67d2e9355f700ea813c7ed0d75bd4;p=simantics%2F3d.git

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 ae6bac4b..a27e76f2 100644
--- 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);
 				}