Bug 262664 - [Help] On Cocoa Firefox cannot be used as the help browser

3 files changed, 8 insertions, 3 deletions

diff --git a/bundles/org.eclipse.ui.browser/plugin.xml b/bundles/org.eclipse.ui.browser/plugin.xml
index ddb5200ccb7..7ed3896fcbe 100644
--- a/bundles/org.eclipse.ui.browser/plugin.xml
+++ b/bundles/org.eclipse.ui.browser/plugin.xml
@@ -157,7 +157,7 @@
          os="MacOSX"
          executable="firefox-bin"
          factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
-         <location>Applications/Firefox.app/Contents/MacOS/firefox-bin</location>
+         <location>Applications/Firefox.app</location>
       </browser>
       <browser
          id="org.eclipse.ui.browser.camino"
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorDialog.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorDialog.java
index 0423ad7b0b0..d9dd93d803b 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorDialog.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -15,6 +15,7 @@ import java.io.File;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.util.Util;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -182,7 +183,7 @@ public class BrowserDescriptorDialog extends Dialog {
 		// do simple field validation to at least ensure target directory entered is valid pathname
 		try {
 		File file = new File(browser.getLocation());
-			if(!file.isFile()){
+			if(!file.isFile() && !Util.isMac()){
 				WebBrowserUtil.openError(Messages.locationInvalid);
 				return;
 			}
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java
index bcf0c4ea2d8..9a9bb50d1a7 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/ExternalBrowserInstance.java
@@ -12,6 +12,7 @@ package org.eclipse.ui.internal.browser;
 
 import java.net.URL;
 
+import org.eclipse.jface.util.Util;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.browser.AbstractWebBrowser;
@@ -43,6 +44,9 @@ public class ExternalBrowserInstance extends AbstractWebBrowser {
 		String params = WebBrowserUtil.createParameterString(parameters, urlText);
 
 		try {
+			if ( Util.isMac()) {
+			    location = "open -a " + location; //$NON-NLS-1$
+		     }
 			Trace.trace(Trace.FINEST, "Launching " + location + " " + params); //$NON-NLS-1$//$NON-NLS-2$
 			if (params == null || params.length() == 0)
 				process = Runtime.getRuntime().exec(location);