Enable model loading using an existing transaction.

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / Plant3DEditor.java

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 2c626c95a00dd91b46eaff7f98b808bbf694ec34..a7559f8009b35a599469a6d7d45cc7845b698a43 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -19,6 +19,7 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -183,8 +184,8 @@ public class Plant3DEditor extends ResourceEditorPart {
                panel.setPickType(4);
                
                try {
-                       ControlPointFactory.preloadCache(getLibraryUri());
-                       ComponentUtils.preloadCache();
+                       ControlPointFactory.preloadCache(Simantics.getSession(), getLibraryUri());
+                       ComponentUtils.preloadCache(Simantics.getSession());
                } catch (Exception e) {
                        ExceptionUtils.logAndShowError("Cannot open Plant3D editor",e);
                        return;
@@ -449,7 +450,7 @@ public class Plant3DEditor extends ResourceEditorPart {
                                if (node instanceof Equipment) {
                                        m.add(translateAction);
                                        m.add(rotateAction);
-                                       for (Item eq : P3DUtil.getNozzles(getLibraryUri())) {
+                                       for (Item eq : P3DUtil.getNozzles(Simantics.getSession(), getLibraryUri())) {
                                                AddNozzleAction add = new AddNozzleAction(rootNode, eq);
                                                add.setEquipment((Equipment)node);
                                                m.add(add);