X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FmodelBrowser%2Fhandlers%2FContextualHelp.java;h=e7bfd35fa5477550aeb68fd0aead0342d9b2a406;hp=4491d75a0a9f1945ea0c8e5dc4c82fcb6d38cd6c;hb=c0941146a40af9df766b514fd4238aa20ec2ff4f;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/ContextualHelp.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/ContextualHelp.java
index 4491d75a0..e7bfd35fa 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/ContextualHelp.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/ContextualHelp.java
@@ -1,81 +1,72 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 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.modeling.ui.modelBrowser.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.simantics.Simantics;
-import org.simantics.databoard.Bindings;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.common.request.ResourceRead;
-import org.simantics.db.common.utils.Logger;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.variable.Variable;
-import org.simantics.modeling.ModelingResources;
-import org.simantics.modeling.PropertyVariables;
-import org.simantics.ui.selection.WorkbenchSelectionUtils;
-import org.simantics.utils.ui.AdaptionUtils;
-
-public class ContextualHelp extends AbstractHandler {
-
-    private static String getPossibleId(ExecutionEvent event) {
-        String id = null;
-        try {
-            Resource element = WorkbenchSelectionUtils.getPossibleResource(event);
-            id = Simantics.getSession().syncRequest(new ResourceRead<String>(element) {
-
-                @Override
-                public String perform(ReadGraph graph) throws DatabaseException {
-                    ModelingResources MOD = ModelingResources.getInstance(graph);
-                    Resource component = graph.getPossibleObject(element, MOD.ElementToComponent);
-                    if (component != null)
-                        return graph.getPossibleRelatedValue2(component, MOD.contextualHelpId, Bindings.STRING);
-
-                    Variable var = WorkbenchSelectionUtils.getPossibleVariable(event);
-                    if (var != null)
-                        return var.getPossiblePropertyValue(graph, MOD.contextualHelpId, Bindings.STRING);
-
-                    ISelection sel = HandlerUtil.getCurrentSelection(event);
-                    if (sel != null) {
-                        PropertyVariables vars = AdaptionUtils.adaptToSingle(sel, PropertyVariables.class);
-                        if (vars != null) {
-                            var = vars.getConfiguration();
-                            if (var != null)
-                                var.getPossiblePropertyValue(graph, MOD.contextualHelpId, Bindings.STRING);
-                        }
-                    }
-                    return null;
-                }
-            });
-        } catch (DatabaseException e) {
-            Logger.defaultLogError(e);
-        }
-        return id;
-    }
-
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-
-        String id = getPossibleId(event);
-        if (id != null)
-            PlatformUI.getWorkbench().getHelpSystem().displayHelp(id);
-
-        return null;
-
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 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
+ *     Semantum Oy - #7116 regression fix
+ *     Semantum Oy - gitlab #147 - expose getPossibleId implementation
+ *******************************************************************************/
+package org.simantics.modeling.ui.modelBrowser.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.Simantics;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.request.UniqueRead;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.modeling.help.HelpContexts;
+import org.simantics.ui.selection.WorkbenchSelectionUtils;
+import org.slf4j.LoggerFactory;
+
+public class ContextualHelp extends AbstractHandler {
+
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ContextualHelp.class);
+
+    private static String getPossibleId(ExecutionEvent event) {
+        try {
+            ISelection sel = HandlerUtil.getCurrentSelection(event);
+            Resource resource = WorkbenchSelectionUtils.getPossibleResource(sel);
+            Variable variable = WorkbenchSelectionUtils.getPossibleVariable(sel);
+            if (sel.isEmpty() && resource == null && variable == null)
+                return null;
+
+            return Simantics.getSession().syncRequest(new UniqueRead<String>() {
+                @Override
+                public String perform(ReadGraph graph) throws DatabaseException {
+                    return HelpContexts.getPossibleId(graph, resource, variable, sel);
+                }
+            });
+        } catch (DatabaseException e) {
+            LOGGER.error("", e);
+            return null;
+        }
+    }
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        String id = getPossibleId(event);
+        if (id != null)
+            PlatformUI.getWorkbench().getHelpSystem().displayHelp(id);
+        return null;
+    }
+
+    /**
+     * @deprecated use {@link HelpContexts#getPossibleId(ReadGraph, Resource, Variable, Object)} instead
+     */
+    @Deprecated
+    public static String getPossibleId(ReadGraph graph, Resource resource, Variable variable, ISelection sel) throws DatabaseException {
+        return HelpContexts.getPossibleId(graph, resource, variable, sel);
+    }
+
+}