Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gatterweh2019-06-18 11:39:22 +0000
committerMatthias Becker2019-06-18 15:15:57 +0000
commitc78234040422d297034dba4aea2cbd8a374c3dde (patch)
tree2242554bffeba79d7ca09abc9c848969f6b7bff3 /org.eclipse.help.ui
parent265cc19eb1fae8962b47fc14c23751c555c26263 (diff)
downloadeclipse.platform.ua-c78234040422d297034dba4aea2cbd8a374c3dde.tar.gz
eclipse.platform.ua-c78234040422d297034dba4aea2cbd8a374c3dde.tar.xz
eclipse.platform.ua-c78234040422d297034dba4aea2cbd8a374c3dde.zip
Bug 548381 - Fix help search function for external help window
Correctly encode the search expression into the help URL that is used when an external windows is used for help (when "Open help search" is set to "In a browser"). Change-Id: Ia3a2d0ccb0a83e1c3f7189a4c9871f0b00d41fe7 Signed-off-by: Thomas Gatterweh <Thomas_Gatterweh@mentor.com>
Diffstat (limited to 'org.eclipse.help.ui')
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java9
1 files changed, 7 insertions, 2 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 96e8ca8b2..b99562e26 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
@@ -14,7 +14,9 @@
**************************************************************************************************/
package org.eclipse.help.ui.internal;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLEncoder;
import org.eclipse.core.runtime.Platform;
import org.eclipse.help.IContext;
@@ -199,8 +201,11 @@ public class DefaultHelpUI extends AbstractHelpUI {
if (searchFromBrowser) {
String parameters = "tab=search"; //$NON-NLS-1$
if (expression != null) {
- parameters += '&';
- parameters += expression;
+ try {
+ parameters += "&searchWord=" + URLEncoder.encode(expression, "UTF-8"); //$NON-NLS-1$ //$NON-NLS-2$
+ } catch (UnsupportedEncodingException e) {
+ // Should not happen: UTF-8 is a required encoding for every Java version
+ }
}
BaseHelpSystem.getHelpDisplay().displayHelpResource(parameters, false);
} else {

Back to the top