X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.ui%2Fsrc%2Forg%2Fsimantics%2Fui%2Fcontribution%2FOperationsMenuContribution.java;h=9f7990d848f0ad2954f6847bb2dcb13796e2e39b;hp=b194694b58e01a3868861dd0e82bd6847a6e533b;hb=e88be95edf1f80781646cfdf717ec1b663264179;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/contribution/OperationsMenuContribution.java b/bundles/org.simantics.ui/src/org/simantics/ui/contribution/OperationsMenuContribution.java
index b194694b5..9f7990d84 100644
--- a/bundles/org.simantics.ui/src/org/simantics/ui/contribution/OperationsMenuContribution.java
+++ b/bundles/org.simantics.ui/src/org/simantics/ui/contribution/OperationsMenuContribution.java
@@ -18,6 +18,7 @@ import java.util.Collection;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -26,8 +27,8 @@ import org.simantics.db.request.Read;
 import org.simantics.layer0.utils.collections.IContextualList;
 import org.simantics.layer0.utils.operations.IOperation;
 import org.simantics.project.IProject;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.icons.ImageUtil;
+import org.simantics.ui.selection.WorkbenchSelectionUtils;
 import org.simantics.ui.utils.ResourceAdaptionUtils;
 import org.simantics.utils.datastructures.persistent.ContextMap;
 
@@ -48,9 +49,9 @@ public abstract class OperationsMenuContribution extends DynamicMenuContribution
     }
 
     @Override
-    protected IAction[] getActions(ReadGraph g, Object[] selection) {
+    protected IAction[] getActions(ReadGraph g, Object[] selection) throws DatabaseException {
         if(selection.length == 1) {
-            final Resource r = ResourceAdaptionUtils.adaptToResource(selection[0]);
+            final Resource r = WorkbenchSelectionUtils.getPossibleResourceFromSelection(g, selection[0]);
             if(r == null)
             	return NO_ACTIONS;
             try {
@@ -67,7 +68,7 @@ public abstract class OperationsMenuContribution extends DynamicMenuContribution
                         }
                         final ContextMap parameters = new ContextMap();
                         parameters.put(IOperation.SUBJECT, r);
-                        IProject project = SimanticsUI.peekProject();
+                        IProject project = Simantics.peekProject();
                         if (project != null)
                             parameters.put(IOperation.PROJECT, project.get());
                         assignParameters(parameters);