diff options
author | Chris Goldthorpe | 2011-10-10 22:37:57 +0000 |
---|---|---|
committer | Chris Goldthorpe | 2011-10-10 22:39:01 +0000 |
commit | 69cba0235c7d439497c1f29178ac9404dc918f10 (patch) | |
tree | b4095faa3e0c920f7b5f53cbc70b015a6e0967db /org.eclipse.help.ui | |
parent | 5e2f540e9f1f5bff6840915cfc55b0188c4fb713 (diff) | |
download | eclipse.platform.ua-69cba0235c7d439497c1f29178ac9404dc918f10.tar.gz eclipse.platform.ua-69cba0235c7d439497c1f29178ac9404dc918f10.tar.xz eclipse.platform.ua-69cba0235c7d439497c1f29178ac9404dc918f10.zip |
Bug 290377 - [Help][Context] Dynamic help view does not respect
IContextProvider upon open
Diffstat (limited to 'org.eclipse.help.ui')
-rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java index 1638d9187..e8e9c9a33 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java @@ -19,7 +19,6 @@ import org.eclipse.help.browser.IBrowser; import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.base.HelpBasePlugin; import org.eclipse.help.internal.base.IHelpBaseConstants; -import org.eclipse.help.internal.context.Context; import org.eclipse.help.ui.internal.util.ErrorUtil; import org.eclipse.help.ui.internal.util.FontUtils; import org.eclipse.help.ui.internal.views.ContextHelpPart; @@ -43,7 +42,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.browser.IWebBrowser; import org.eclipse.ui.browser.IWorkbenchBrowserSupport; import org.eclipse.ui.help.AbstractHelpUI; -import org.eclipse.ui.internal.IWorkbenchHelpContextIds; import org.eclipse.ui.intro.IIntroManager; import org.eclipse.ui.intro.IIntroPart; @@ -389,10 +387,11 @@ public class DefaultHelpUI extends AbstractHelpUI { if (activePart != null) { IContextProvider provider = (IContextProvider) activePart .getAdapter(IContextProvider.class); - if (provider != null - && (context == null || ((context instanceof Context) && IWorkbenchHelpContextIds.MISSING - .equals(((Context) context).getId())))) { - context = provider.getContext(c); + if (provider != null ) { + IContext providerContext = provider.getContext(c); + if ( providerContext != null ) { + context = providerContext; + } } } if (context != null) { |