Bug 57331 - [Help] Closing help browser should shut down standalone help

1 files changed, 21 insertions, 0 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
index 3b357b3b6..231b20e69 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/standalone/StandaloneHelp.java
@@ -91,6 +91,20 @@ public class StandaloneHelp extends EclipseController {
 	public void displayHelp(String href) throws Exception {
 		sendHelpCommand("displayHelp", new String[]{"href=" + href}); //$NON-NLS-1$ //$NON-NLS-2$
 	}
+	
+	/**
+	 * @see org.eclipse.help.standalone.Help#displayHelp()
+	 */
+	public void displayHelpWindow() throws Exception {
+		sendHelpCommand("displayHelpWindow", new String[0]); //$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.help.standalone.Help#displayHelp(java.lang.String)
+	 */
+	public void displayHelpWindow(String href) throws Exception {
+		sendHelpCommand("displayHelpWindow", new String[]{"href=" + href}); //$NON-NLS-1$ //$NON-NLS-2$
+	}
 
 	/**
 	 * @return true if commands contained a known command and it was executed
@@ -115,6 +129,13 @@ public class StandaloneHelp extends EclipseController {
 				displayHelp();
 			}
 			return true;
+		} else if ("displayHelpWindow".equalsIgnoreCase(command)) { //$NON-NLS-1$
+			if (helpCommands.size() >= 2) {
+				displayHelpWindow((String) helpCommands.get(1));
+			} else {
+				displayHelpWindow();
+			}
+			return true;
 		} else if (CMD_INSTALL.equalsIgnoreCase(command)
 				|| CMD_ENABLE.equalsIgnoreCase(command)
 				|| CMD_DISABLE.equalsIgnoreCase(command)