not using NewWindow event for M5

2 files changed, 37 insertions, 27 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
index 3025060e8..8881e7c7a 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java
@@ -27,6 +27,9 @@ public class EmbeddedBrowserFactory implements IBrowserFactory {
 	 * @see IBrowserFactory#isAvailable()
 	 */
 	public boolean isAvailable() {
+		// TODO enable for all OSes after 46751 is fixed
+		if (true)
+			return System.getProperty("os.name").startsWith("Win");
 		if (!tested) {
 			tested = true;
 			Shell sh = new Shell();
@@ -37,10 +40,12 @@ public class EmbeddedBrowserFactory implements IBrowserFactory {
 				if (se.code == SWT.ERROR_NO_HANDLES) {
 					// Browser not implemented
 					available = false;
+				} else {
+					HelpUIPlugin.logError(
+						HelpUIResources.getString(
+							"EmbeddedBrowserFactory.error"),
+						se);
 				}
-				HelpUIPlugin.logError(
-					HelpUIResources.getString("EmbeddedBrowserFactory.error"),
-					se);
 			}
 			if (sh != null && !sh.isDisposed())
 				sh.dispose();
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserHost.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserHost.java
index b423874bb..6c7692bd1 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserHost.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserHost.java
@@ -252,31 +252,36 @@ public class EmbeddedBrowserHost implements Runnable {
 		shell.setSize(w, h);
 		if (store.getBoolean(BROWSER_MAXIMIZED))
 			shell.setMaximized(true);
-		webBrowser.addNewWindowListener(new NewWindowListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.browser.NewWindowListener#newWindow(org.eclipse.swt.browser.NewWindowEvent)
-			 */
-			public void newWindow(NewWindowEvent event) {
-				int dw=300;
-				int dh=300;
-				int dx=x+(w-dw)/2;
-				int dy=y+(h-dh)/2;
-				if(dy>50) dy-=50;
-				EmbeddedBrowserDialog workingSetManagerDialog =
-					new EmbeddedBrowserDialog(
-						shell,
-						productName,
-						createImage(),
-						dx,
-						dy,
-						dw,
-						dh);
-				event.browser = workingSetManagerDialog.getBrowser();
+		
+		// TODO enable on Windows after 46751 is fixed
+		if (!System.getProperty("os.name").startsWith("Win")) {
+			webBrowser.addNewWindowListener(new NewWindowListener() {
+				/*
+				 * (non-Javadoc)
+				 * 
+				 * @see org.eclipse.swt.browser.NewWindowListener#newWindow(org.eclipse.swt.browser.NewWindowEvent)
+				 */
+				public void newWindow(NewWindowEvent event) {
+					int dw = 300;
+					int dh = 300;
+					int dx = x + (w - dw) / 2;
+					int dy = y + (h - dh) / 2;
+					if (dy > 50)
+						dy -= 50;
+					EmbeddedBrowserDialog workingSetManagerDialog =
+						new EmbeddedBrowserDialog(
+							shell,
+							productName,
+							createImage(),
+							dx,
+							dy,
+							dw,
+							dh);
+					event.browser = workingSetManagerDialog.getBrowser();
 
-			}
-		});
+				}
+			});
+		}
 		shell.open();
 	}
 	/**