merged svn revision 33114 and added desktop and help plugins

[simantics/platform.git] / bundles / org.simantics.debug.ui / src / org / simantics / debug / ui / GraphDebugger.java

diff --git a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java
index ca2fa2190c97a99ef6c029cb63a6b97c9a194fc2..4d2a19dfee2aee2a23f995036fd527aeeb39c902 100644 (file)
--- a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java
+++ b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/GraphDebugger.java
@@ -963,8 +963,10 @@ public class GraphDebugger extends Composite {
             Layer0 L0 = Layer0.getInstance(graph);\r
             if (graph.isInstanceOf(r, L0.Assertion)) {\r
                 Resource pred = graph.getSingleObject(r, L0.HasPredicate);\r
-                Resource obj = graph.getSingleObject(r, L0.HasObject);\r
-                String tmp = htmlEscape( getResourceName(graph, pred) + " -> " + getResourceName(graph, obj) + " (Assertion)" );\r
+                // Don't know how I encountered this but it seems to be possible in some cases..\r
+                // Resource obj = graph.getSingleObject(r, L0.HasObject);\r
+                Resource obj = graph.getPossibleObject(r, L0.HasObject);\r
+                String tmp = htmlEscape( getResourceName(graph, pred) + " -> " + (obj == null ? "No object ?" : getResourceName(graph, obj)) + " (Assertion)" );\r
                 name = tmp.substring(0, Math.min(80, tmp.length()));\r
             } else {\r
                 String resourceName = getResourceName(graph, r);\r