Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2020-09-18 07:05:40 +0000
committerLars Vogel2020-09-18 07:05:40 +0000
commitb2e3864455b6eb00613cdd4bc460d4c446bd05a9 (patch)
tree15a6001af562f1b5f2aed7db78bb807b4f6522c4
parentdceb611a11f5a802a124e1473cc6578b2b56ccad (diff)
downloadeclipse.platform.ua-b2e3864455b6eb00613cdd4bc460d4c446bd05a9.tar.gz
eclipse.platform.ua-b2e3864455b6eb00613cdd4bc460d4c446bd05a9.tar.xz
eclipse.platform.ua-b2e3864455b6eb00613cdd4bc460d4c446bd05a9.zip
Minor cleanup in HelpView
Removes a few unnecessary line breaks Combines return checks via || Uses JFace Util#isValid instead of own null and dispose check Change-Id: Iaafa8f416221206a74c3f24bdcba8abf74ce841a Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java21
1 files changed, 9 insertions, 12 deletions
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
index ab20767a8..ce58ea629 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.help.ui.internal.views;
+import static org.eclipse.jface.util.Util.isValid;
+
import org.eclipse.help.IContext;
import org.eclipse.help.IContextProvider;
import org.eclipse.help.IHelpResource;
@@ -58,14 +60,12 @@ public class HelpView extends ViewPart implements IPartListener2, ISelectionChan
@Override
public void createPartControl(Composite parent) {
toolkit = new FormToolkit(parent.getDisplay());
- toolkit.getHyperlinkGroup().setHyperlinkUnderlineMode(
- HyperlinkGroup.UNDERLINE_HOVER);
+ toolkit.getHyperlinkGroup().setHyperlinkUnderlineMode(HyperlinkGroup.UNDERLINE_HOVER);
toolkit.getColors().initializeSectionToolBarColors();
reusableHelpPart.createControl(parent, toolkit);
reusableHelpPart.setDefaultContextHelpText(Messages.HelpView_defaultText);
reusableHelpPart.showPage(getFirstPage());
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
- "org.eclipse.help.ui.helpView"); //$NON-NLS-1$
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.eclipse.help.ui.helpView"); //$NON-NLS-1$
IWorkbenchWindow window = getSite().getPage().getWorkbenchWindow();
if (window == null)
return;
@@ -195,15 +195,12 @@ public class HelpView extends ViewPart implements IPartListener2, ISelectionChan
}
private void updateActivePart() {
- if (reusableHelpPart == null)
- return;
- if (!reusableHelpPart.isMonitoringContextHelp())
+ if (reusableHelpPart == null || !reusableHelpPart.isMonitoringContextHelp() || monitoredPart == null) {
return;
- if (monitoredPart == null)
- return;
- Control c = monitoredPart.getSite().getShell().getDisplay()
- .getFocusControl();
- if (c != null && c.isDisposed() == false && visible) {
+ }
+ Control c = monitoredPart.getSite().getShell().getDisplay().getFocusControl();
+
+ if (isValid(c) && visible) {
IContextProvider provider = monitoredPart.getAdapter(IContextProvider.class);
if (provider != null)
reusableHelpPart.update(provider, null, monitoredPart, c, false);

Back to the top