Data corruption on editor startup.

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

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
index f7bb42306aad6690a9088d35e8eac79d5ccac054..510956efaa45edc772a31280182c631446a57ab2 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
@@ -265,7 +265,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                } else if (graph.isInstanceOf(r, P3D.PipeRun)) {
                    pipeRuns.add(r);
                } else {
-                   throw new DatabaseException("Unknown resource " + r);
+                   throw new DatabaseException("Unknown resource " + r+ " " + mapping.get(r));
                }
            }
            Set<Resource> nozzles = new HashSet<>();
@@ -274,7 +274,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                    if (graph.isInstanceOf(n, P3D.Nozzle)) {
                        nozzles.add(n);
                    } else {
-                       throw new DatabaseException("Unknown nozzle resource " + n);
+                       throw new DatabaseException("Unknown nozzle resource " + n+ " " + mapping.get(n));
                    }
                }
            }
@@ -285,7 +285,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                 if (graph.isInstanceOf(c, P3D.PipelineComponent)) {
                     components.add(c);
                 } else {
-                    throw new DatabaseException("Unknown component resource " + c);
+                    throw new DatabaseException("Unknown component resource " + c + " " + mapping.get(c));
                 }
             }
         }
@@ -293,11 +293,11 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
         for (Resource c : components) {
             for (Resource connected : graph.getObjects(c, P3D.Connects)) {
                 if (!components.contains(connected) && !nozzles.contains(connected)) {
-                    throw new DatabaseException("Unbrowsable component resource " + connected + " connected to " + c);
+                    throw new DatabaseException("Unbrowsable component resource " + connected + " " + mapping.get(connected) +" connected to " + c + " " + mapping.get(c));
                 }
                 Collection<Resource> connectedConnected = graph.getObjects(connected, P3D.Connects);
                 if (!connectedConnected.contains(c)) {
-                    throw new DatabaseException("Component resource " + c + " is connected to " + connected +", but its has no connection back.");
+                    throw new DatabaseException("Component resource " + c + " " + mapping.get(c) + " is connected to " + connected + " " + mapping.get(connected) +", but its has no connection back.");
                 }
             }
         }