Sync git svn branch with SVN repository r33345.

[simantics/platform.git] / bundles / org.simantics.browsing.ui.model / src / org / simantics / browsing / ui / model / browsecontexts / BrowseContext.java

diff --git a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
index a1eaf78a8f87b4c64fb3eca61ca3a33cc9acd93f..8d5a427c2502bf573e22a87fd682f3eccd69ec34 100644 (file)
--- a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
+++ b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
@@ -261,7 +261,11 @@ public class BrowseContext {
     public static ArrayList<NodeContext> augment(ReadGraph graph, BrowseContext bc, Collection<NodeContext> contexts, boolean resolveABC) throws DatabaseException {\r
         ArrayList<NodeContext> result = new ArrayList<NodeContext>();\r
         for(NodeContext context : contexts) {\r
-            ActionBrowseContext abc = resolveABC ? graph.syncRequest(new ResolveActionBrowseContext(context)) : null;\r
+               ActionBrowseContext abc = null;\r
+               if(resolveABC) {\r
+                       abc = graph.syncRequest(new ResolveActionBrowseContext(context));\r
+                       if(abc == null) abc = (ActionBrowseContext)context.getConstant(BuiltinKeys.ACTION_BROWSE_CONTEXT);\r
+               }\r
             result.add(NodeContextBuilder.buildWithData(NodeType.KEY_SEQUENCE_EXT,\r
                     new Object[] {\r
                     context.getConstant(BuiltinKeys.INPUT), \r