Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2011-08-15 21:08:56 +0000
committerChris Goldthorpe2011-08-15 21:08:56 +0000
commitf530237b47073cc6396d88ad6cc3ef62f85b14e8 (patch)
tree42566d0067d5d219b4c8104fcee521eeb2d66cbe
parent06e297c276381ecdd4f4f93ec3582bd0376a9c4d (diff)
downloadeclipse.platform.ua-f530237b47073cc6396d88ad6cc3ef62f85b14e8.tar.gz
eclipse.platform.ua-f530237b47073cc6396d88ad6cc3ef62f85b14e8.tar.xz
eclipse.platform.ua-f530237b47073cc6396d88ad6cc3ef62f85b14e8.zip
Bug 352077 - [Help] Trying to open Workbench Help shows an "XPCOM Error" dialog
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java10
1 files changed, 6 insertions, 4 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 a3bbcd76c..e604caa78 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 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
@@ -7,11 +7,13 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [352077] error dialogs when just probing browser
*******************************************************************************/
package org.eclipse.help.ui.internal.browser.embedded;
import org.eclipse.core.runtime.*;
import org.eclipse.help.browser.*;
+import org.eclipse.help.internal.HelpPlugin;
import org.eclipse.help.internal.base.*;
import org.eclipse.help.ui.internal.*;
import org.eclipse.osgi.service.environment.*;
@@ -75,9 +77,9 @@ public class EmbeddedBrowserFactory implements IBrowserFactory {
// Browser not implemented
available = false;
} else {
- HelpUIPlugin
- .logError(
- "An error occurred during creation of embedded help browser.", se); //$NON-NLS-1$
+ Status errorStatus = new Status(IStatus.WARNING, HelpUIPlugin.PLUGIN_ID, IStatus.OK,
+ "An error occurred during creation of embedded help browser.", new Exception(se)); //$NON-NLS-1$
+ HelpPlugin.getDefault().getLog().log(errorStatus);
}
} catch (Exception e) {
// Browser not implemented

Back to the top