Enable Browser searching in Help view and Help Contents dialog

Fixes: #1999

Author: trancexpress

ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java

@@ -16,7 +16,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -121,7 +120,7 @@ public void controlResized(ControlEvent e) {
 			}
 		});
 
-		browser = new Browser(shell, SWT.NONE);
+		browser = new Browser(shell, SWT.SEARCH);
 		browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		initialize(browser);
 
@@ -254,8 +253,8 @@ private static void initializeShell(Shell s) {
 		s.setLayout(layout);
 		s.addDisposeListener(e -> {
 			if (shellImages != null) {
-				for (int i = 0; i < shellImages.length; i++) {
-					shellImages[i].dispose();
+				for (Image shellImage : shellImages) {
+					shellImage.dispose();
 				}
 			}
 		});
@@ -444,20 +443,20 @@ private static Image[] createImages() {
 		String[] productImageURLs = getProductImageURLs();
 		if (productImageURLs != null) {
 			ArrayList<Image> shellImgs = new ArrayList<>();
-			for (int i = 0; i < productImageURLs.length; i++) {
-				if ("".equals(productImageURLs[i])) { //$NON-NLS-1$
+			for (String productImageURL : productImageURLs) {
+				if ("".equals(productImageURL)) { //$NON-NLS-1$
 					continue;
 				}
 				URL imageURL = null;
 				try {
-					imageURL = new URL(productImageURLs[i]);
+					imageURL = new URL(productImageURL);
 				} catch (MalformedURLException mue) {
 					// must be a path relative to the product bundle
 					IProduct product = Platform.getProduct();
 					if (product != null) {
 						Bundle productBundle = product.getDefiningBundle();
 						if (productBundle != null) {
-							imageURL = FileLocator.find(productBundle, IPath.fromOSString(productImageURLs[i]), null);
+							imageURL = FileLocator.find(productBundle, IPath.fromOSString(productImageURL), null);
 						}
 					}
 				}
@@ -519,8 +518,7 @@ public void setSize(int width, int height) {
 		shell.setSize(w, h);
 	}
 	private void notifyCloseListners() {
-		for (Iterator<IBrowserCloseListener> it = closeListeners.iterator(); it.hasNext();) {
-			IBrowserCloseListener listener = it.next();
+		for (IBrowserCloseListener listener : closeListeners) {
 			listener.browserClosed();
 		}
 	}

ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java

@@ -97,7 +97,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 
 	public BrowserPart(final Composite parent, FormToolkit toolkit,
 			final IToolBarManager tbm, IMenuManager menuManager) {
-		browser = new Browser(parent, SWT.NULL);
+		browser = new Browser(parent, SWT.SEARCH);
 		browser.addLocationListener(new LocationListener() {
 
 			@Override