Remove usage of deprecated SimanticsUI-methods

[simantics/platform.git] / bundles / org.simantics.ui / src / org / simantics / ui / workbench / action / PerformDefaultAction.java

diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/action/PerformDefaultAction.java b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/action/PerformDefaultAction.java
index 640e58f56cd9b273dcadf2c51bff16207472db82..46facb59ea4896dc5a2093959c2c5812000b8006 100644 (file)
--- a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/action/PerformDefaultAction.java
+++ b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/action/PerformDefaultAction.java
@@ -1,53 +1,65 @@
-/*******************************************************************************\r
- * Copyright (c) 2012 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.ui.workbench.action;\r
-\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Shell;\r
-import org.eclipse.ui.IWorkbench;\r
-import org.eclipse.ui.IWorkbenchWindow;\r
-import org.eclipse.ui.PlatformUI;\r
-import org.simantics.db.Resource;\r
-import org.simantics.ui.SimanticsUI;\r
-import org.simantics.utils.ui.workbench.WorkbenchUtils;\r
-\r
-/**\r
- * @author Tuukka Lehtonen\r
- */\r
-public class PerformDefaultAction extends Action {\r
-\r
-    private Control  control;\r
-    private Resource component;\r
-\r
-    public PerformDefaultAction(String name, Control control, Resource component) {\r
-        super(name);\r
-        this.control = control;\r
-        this.component = component;\r
-    }\r
-\r
-    @Override\r
-    public void run() {\r
-        final String perspectiveId = WorkbenchUtils.getCurrentPerspectiveId();\r
-        Shell shell = null;\r
-        if (control != null) {\r
-            shell = control.getShell();\r
-        } else {\r
-            IWorkbench wb = PlatformUI.getWorkbench();\r
-            IWorkbenchWindow window = wb.getActiveWorkbenchWindow();\r
-            if (window != null)\r
-                shell = window.getShell();\r
-        }\r
-        SimanticsUI.getSession().asyncRequest(new ChooseActionRequest(shell, control, component, perspectiveId));\r
-    }\r
-\r
+/*******************************************************************************
+ * Copyright (c) 2012, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.ui.workbench.action;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.Action;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.simantics.Simantics;
+import org.simantics.db.common.procedure.adapter.ProcedureAdapter;
+import org.simantics.ui.internal.Activator;
+import org.simantics.utils.ui.workbench.WorkbenchUtils;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class PerformDefaultAction extends Action {
+
+    private Control  control;
+    private Object   input;
+
+    public PerformDefaultAction(String name, Control control, Object input) {
+        super(name);
+        this.control = control;
+        this.input = input;
+    }
+
+    @Override
+    public void run() {
+        final String perspectiveId = WorkbenchUtils.getCurrentPerspectiveId();
+        Shell shell = null;
+        if (control != null) {
+            shell = control.getShell();
+        } else {
+            IWorkbench wb = PlatformUI.getWorkbench();
+            IWorkbenchWindow window = wb.getActiveWorkbenchWindow();
+            if (window != null)
+                shell = window.getShell();
+        }
+        Simantics.getSession().asyncRequest(
+                new ChooseActionRequest(shell, control, input, perspectiveId),
+                new ProcedureAdapter<Object>() {
+                    @Override
+                    public void exception(Throwable t) {
+                        Activator.getDefault().getLog().log(
+                                new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                                        "Failed to choose action for input " + input + ", see exception for details.", t));
+                    }
+                });
+    }
+
 }
\ No newline at end of file