Equipment/Component library customization requires proper preloading.

Without preloaded components/control points, ObjMap is not able load the
data (causes nested read transaction)

Change-Id: I07b7a0f3500cc9b2a843441f10779316be6a4b70

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
index 51e03ad36530828b74ebad223bd29af5e1f41e94..f80d3be8d63086c436116f8973e1cceea506697f 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -140,7 +140,7 @@ public class Plant3DEditor extends ResourceEditorPart {
                panel.setPickType(4);
                
                try {
-                       ControlPointFactory.preloadCache();
+                       ControlPointFactory.preloadCache(getLibraryUri());
                        ComponentUtils.preloadCache();
                } catch (Exception e) {
                        ExceptionUtils.logAndShowError("Cannot open Plant3D editor",e);

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
index ae71b7afa9e5da1734a382e93903e40a8fc31938..6b92e4479aa1a8fe34cb7681bcd94255a83055d7 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
@@ -20,11 +20,11 @@ public class ControlPointFactory {
        private static Map<String,Instruction> cache = new HashMap<String, Instruction>();
        
        
-       public static void preloadCache() throws Exception {
-               List<Item> items = P3DUtil.getEnds(Plant3D.URIs.Builtin);
-               items.addAll(P3DUtil.getInlines(Plant3D.URIs.Builtin));
-               items.addAll(P3DUtil.getNozzles(Plant3D.URIs.Builtin));
-               items.addAll(P3DUtil.getTurns(Plant3D.URIs.Builtin));
+       public static void preloadCache(String libUri) throws Exception {
+               List<Item> items = P3DUtil.getEnds(libUri);
+               items.addAll(P3DUtil.getInlines(libUri));
+               items.addAll(P3DUtil.getNozzles(libUri));
+               items.addAll(P3DUtil.getTurns(libUri));
                
                for (Item item : items) {
                        Instruction inst = createInstruction(item.getUri());

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..8418ae4d2c19d3f198e56e3e743cb76dde1a4b2b 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
@@ -9,6 +9,7 @@ import org.simantics.db.request.Read;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.Mappings;
 import org.simantics.objmap.graph.schema.IMappingSchema;
+import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.P3DRootNode;
 import org.simantics.plant3d.scenegraph.SchemaBuilder;
 import org.simantics.plant3d.scenegraph.controlpoint.ControlPointFactory;
@@ -20,7 +21,7 @@ public class SCLUtil {
        
        public static P3DScriptNodeMap load(final Resource root) throws DatabaseException {
                try {
-                       ControlPointFactory.preloadCache();
+                       ControlPointFactory.preloadCache(Plant3D.URIs.Builtin);
                        ComponentUtils.preloadCache();
                } catch (Exception e) {
                        throw new DatabaseException(e);
@@ -47,7 +48,7 @@ public class SCLUtil {
        
        public static P3DRootNode loadReadOnly(final Resource root) throws DatabaseException {
                try {
-                       ControlPointFactory.preloadCache();
+                       ControlPointFactory.preloadCache(Plant3D.URIs.Builtin);
                        ComponentUtils.preloadCache();
                } catch (Exception e) {
                        throw new DatabaseException(e);