Attachment 231380 Details for Bug 405942 – Fix for org.eclipse.ui.browser

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix for org.eclipse.ui.browser

eclipse.platform.ui.patch (text/plain), 2.89 KB, created by Dani Megert

on 2013-05-23 10:36:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2013-05-23 10:36:08 EDT

Size: 2.89 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.browser
>diff --git src/org/eclipse/ui/internal/browser/browsers/MozillaBrowser.java src/org/eclipse/ui/internal/browser/browsers/MozillaBrowser.java
>index 426a2b1..69d0f9f 100644
>--- src/org/eclipse/ui/internal/browser/browsers/MozillaBrowser.java
>+++ src/org/eclipse/ui/internal/browser/browsers/MozillaBrowser.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013 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
>@@ -13,8 +13,10 @@
> 
> import java.io.IOException;
> import java.net.URL;
>+import java.util.StringTokenizer;
> 
> import org.eclipse.core.runtime.Platform;
>+
> import org.eclipse.ui.browser.AbstractWebBrowser;
> import org.eclipse.ui.internal.browser.WebBrowserUIPlugin;
> import org.eclipse.ui.internal.browser.WebBrowserUtil;
>@@ -86,12 +88,19 @@
> 		}
> 
> 		/**
>-		 * @param browserCmd
>+		 * @param command the command
>+		 * @param parameters the parameters
> 		 * @return int 0 if success
> 		 */
>-		private int openBrowser(String browserCmd) {
>+		private int openBrowser(String command, String parameters) {
> 			try {
>-				Process pr = Runtime.getRuntime().exec(browserCmd);
>+				StringTokenizer tokenizer = new StringTokenizer(parameters);
>+				String[] commandArray = new String[tokenizer.countTokens() + 1];
>+				commandArray[0] = command;
>+				for (int i= 1; tokenizer.hasMoreTokens(); i++)
>+					commandArray[i] = tokenizer.nextToken();
>+
>+				Process pr = Runtime.getRuntime().exec(commandArray);
> 				StreamConsumer outputs = new StreamConsumer(pr.getInputStream());
> 				(outputs).start();
> 				StreamConsumer errors = new StreamConsumer(pr.getErrorStream());
>@@ -162,19 +171,19 @@
> 			if (exitRequested)
> 				return;
> 			if (firstLaunch && Platform.OS_WIN32.equals(Platform.getOS())) {
>-				if (openBrowser(executable + " " + WebBrowserUtil.createParameterString(parameters, url)) == 0) //$NON-NLS-1$
>+				if (openBrowser(executable, WebBrowserUtil.createParameterString(parameters, url)) == 0)
> 					return;
> 				browserFullyOpenedAt = System.currentTimeMillis() + DELAY;
> 				return;
> 			}
>-			if (openBrowser(executable + ' ' + parameters + " -remote openURL(" + url + ")") //$NON-NLS-1$ //$NON-NLS-2$
>+			if (openBrowser(executable, parameters + " -remote openURL(" + url + ")") //$NON-NLS-1$ //$NON-NLS-2$
> 					== 0)
> 				return;
> 			
> 			if (exitRequested)
> 				return;
> 			browserFullyOpenedAt = System.currentTimeMillis() + DELAY;
>-			openBrowser(executable + " " + WebBrowserUtil.createParameterString(parameters, url)); //$NON-NLS-1$
>+			openBrowser(executable, WebBrowserUtil.createParameterString(parameters, url));
> 		}
> 
> 		private void waitForBrowser() {

Actions: View | Diff

Attachments on bug 405942: 231340 | 231380