diff options
| author | Chris Goldthorpe | 2010-12-17 19:48:40 +0000 |
|---|---|---|
| committer | Chris Goldthorpe | 2010-12-17 19:48:40 +0000 |
| commit | 572e0e38b94b2493d0ac0749332f70c06ac7b3ae (patch) | |
| tree | e988c4b2b1ecd4019cc3d8093cfaf31c56b33959 /org.eclipse.help.ui | |
| parent | 6bc0207e10521e35f647a1ff79c4a363145e1867 (diff) | |
| download | eclipse.platform.ua-572e0e38b94b2493d0ac0749332f70c06ac7b3ae.tar.gz eclipse.platform.ua-572e0e38b94b2493d0ac0749332f70c06ac7b3ae.tar.xz eclipse.platform.ua-572e0e38b94b2493d0ac0749332f70c06ac7b3ae.zip | |
Bug 57331 - [Help] Closing help browser should shut down standalone help
Diffstat (limited to 'org.eclipse.help.ui')
| -rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java index 85c4f2065..7c0049257 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2010 IBM Corporation and others. * 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 @@ -12,6 +12,7 @@ package org.eclipse.help.ui.internal.browser.embedded; import org.eclipse.core.runtime.Platform; import org.eclipse.help.browser.IBrowser; import org.eclipse.help.internal.base.BaseHelpSystem; +import org.eclipse.help.internal.base.HelpApplication; import org.eclipse.osgi.service.environment.Constants; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; @@ -86,7 +87,9 @@ public class EmbeddedBrowserAdapter implements IBrowser, IBrowserCloseListener{ * @see IBrowser#displayURL(String) */ public synchronized void displayURL(final String url) { - close(); + if (!HelpApplication.isShutdownOnClose()) { + close(); + } if (getBrowserDisplay() == Display.getCurrent()) { uiDisplayURL(url); } else { |