Merge "Use generics type variable for mapping db object."

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scl / SCLUtil.java

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 8418ae4d2c19d3f198e56e3e743cb76dde1a4b2b..1070803046ec1e38eed5279682c03bc2320dc805 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
@@ -31,10 +31,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);
                                }
@@ -58,10 +60,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);
                                }