X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FPlant3DEditor.java;h=f80d3be8d63086c436116f8973e1cceea506697f;hb=refs%2Fchanges%2F13%2F3413%2F1;hp=2c94b5daea3fa4d191f7dda53dbc7960f350063d;hpb=bbf50fc505117a5269f0aaff504eaa3dc57b9d31;p=simantics%2F3d.git

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 2c94b5da..f80d3be8 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -46,6 +46,7 @@ import org.simantics.plant3d.actions.AddNozzleAction;
 import org.simantics.plant3d.actions.RemoveAndSplitAction;
 import org.simantics.plant3d.actions.RoutePipeAction;
 import org.simantics.plant3d.actions.TranslateInlineAction;
+import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.Equipment;
 import org.simantics.plant3d.scenegraph.IP3DNode;
@@ -139,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);
@@ -231,6 +232,10 @@ public class Plant3DEditor extends ResourceEditorPart {
 	    return new SelectionHighlighter<INode>(panel,nodeMap);
 	}
 	
+	protected String getLibraryUri() {
+	    return Plant3D.URIs.Builtin;
+	}
+	
 	protected void createActions() {
 		translateAction = new TranslateAction(panel,nodeMap);
 		translateInlineAction = new TranslateInlineAction(panel, nodeMap);
@@ -243,7 +248,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 		
 		removeSplitAction = new RemoveAndSplitAction(nodeMap);
 		routePipeAction = new RoutePipeAction(panel,rootNode);
-		addComponentAction = new AddComponentAction(panel, rootNode);
+		addComponentAction = new AddComponentAction(panel, rootNode, getLibraryUri());
 	}
 	
 	public void populate() {
@@ -356,7 +361,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 		List<IG3DNode> selected = selectionProvider.getSelectedNodes();
 		try {
 			if (selected.size() == 0) {
-				for (Item eq : P3DUtil.getEquipments()) {
+				for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
 					m.add(new AddEquipmentAction(rootNode, eq));
 				}
 			} else if (selected.size() == 1) {
@@ -364,7 +369,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 				if (node instanceof Equipment) {
 					m.add(translateAction);
 					m.add(rotateAction);
-					for (Item eq : P3DUtil.getNozzles()) {
+					for (Item eq : P3DUtil.getNozzles(getLibraryUri())) {
 						AddNozzleAction add = new AddNozzleAction(rootNode, eq);
 						add.setEquipment((Equipment)node);
 						m.add(add);