X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FPlant3DEditor.java;h=a97be312f5e3605947f3a45a80c2c2a735bce984;hb=e9988b476c8634d67cae75c53a8d084f463d5419;hp=4059d938f0d939f754dd0204190cf1452703d487;hpb=96b67feb92c117c72fb823b6fff5f89afa7ee631;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 4059d938..a97be312 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -179,7 +179,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 				
 				@Override
 				public void run(ReadGraph graph) throws DatabaseException {
-				    System.out.println("START PLANT3D LOAD");
+				    //System.out.println("START PLANT3D LOAD");
 					PipingRules.setEnabled(false);
 					IMappingSchema<Resource,INode> schema = getSchema(graph);
 					mapping = Mappings.createWithListening(schema);
@@ -195,7 +195,7 @@ public class Plant3DEditor extends ResourceEditorPart {
                         throw new DatabaseException(e);
                     }
 					
-					System.out.println("END PLANT3D LOAD");
+					//System.out.println("END PLANT3D LOAD");
 				}
 			});
 			
@@ -293,6 +293,7 @@ public class Plant3DEditor extends ResourceEditorPart {
                             if (nodeMap.isRangeModified());
                                 nodeMap.commit("Load sync");
                         } catch (Exception e) {
+                            ExceptionUtils.logAndShowError("Failed to load model correctly", e);
                             //throw new DatabaseException(e);
                         }
                         panel.removeListener(this);  
@@ -418,9 +419,10 @@ public class Plant3DEditor extends ResourceEditorPart {
 		}
 		try {
 			if (selected.size() == 0) {
-				for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
-					m.add(new AddEquipmentAction(rootNode, eq));
-				}
+			    m.add(new AddEquipmentAction(rootNode, getLibraryUri()));
+//				for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
+//					m.add(new AddEquipmentAction(rootNode, eq));
+//				}
 			} else if (selected.size() == 1) {
 				IP3DNode node = (IP3DNode)selected.get(0);
 				if (node instanceof Equipment) {