Attachment 92502 Details for Bug 222653 – Initial work

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

[patch] Initial work

218360Workbench (text/plain), 4.66 KB, created by Tod Creasey

on 2008-03-13 16:00:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2008-03-13 16:00:02 EDT

Size: 4.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/Workbench.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java,v
>retrieving revision 1.454
>diff -u -r1.454 Workbench.java
>--- Eclipse UI/org/eclipse/ui/internal/Workbench.java	29 Feb 2008 17:52:51 -0000	1.454
>+++ Eclipse UI/org/eclipse/ui/internal/Workbench.java	3 Mar 2008 20:11:48 -0000
>@@ -66,7 +66,6 @@
> import org.eclipse.jface.bindings.BindingManagerEvent;
> import org.eclipse.jface.bindings.IBindingManagerListener;
> import org.eclipse.jface.databinding.swt.SWTObservables;
>-import org.eclipse.jface.dialogs.ErrorDialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.dialogs.ProgressMonitorDialog;
>@@ -182,6 +181,8 @@
> import org.eclipse.ui.services.IServiceLocatorCreator;
> import org.eclipse.ui.services.ISourceProviderService;
> import org.eclipse.ui.splash.AbstractSplashHandler;
>+import org.eclipse.ui.statushandlers.IStatusAdapterConstants;
>+import org.eclipse.ui.statushandlers.StatusAdapter;
> import org.eclipse.ui.statushandlers.StatusManager;
> import org.eclipse.ui.swt.IFocusService;
> import org.eclipse.ui.themes.IThemeManager;
>@@ -195,7 +196,7 @@
> 
> /**
>  * The workbench class represents the top of the Eclipse user interface. Its
>- * primary responsability is the management of workbench windows, dialogs,
>+ * primary responsibility is the management of workbench windows, dialogs,
>  * wizards, and other workbench-related windows.
>  * <p>
>  * Note that any code that is run during the creation of a workbench instance
>@@ -1824,9 +1825,9 @@
> 			StartupThreading.runWithoutExceptions(new StartupRunnable() {
> 
> 				public void runWithException() throws Throwable {
>-					ErrorDialog.openError(null,
>-							WorkbenchMessages.Problems_Opening_Page, e.getMessage(), e
>-									.getStatus());
>+					StatusAdapter adapter = new StatusAdapter(StatusUtil.newStatus(PlatformUI.PLUGIN_ID, e));
>+					adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Problems_Opening_Page);
>+					StatusManager.getManager().handle(adapter,StatusManager.SHOW);
> 				}});
> 		}
> 	}
>@@ -1919,12 +1920,9 @@
> 							.runWithoutExceptions(new StartupRunnable() {
> 
> 								public void runWithException() throws Throwable {
>-									ErrorDialog
>-											.openError(
>-													null,
>-													WorkbenchMessages.Workspace_problemsTitle,
>-													WorkbenchMessages.Workbench_problemsRestoringMsg,
>-													restoreResult);
>+									StatusAdapter adapter = new StatusAdapter(restoreResult);
>+									adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Workspace_problemsTitle);
>+									StatusManager.getManager().handle(adapter, StatusManager.SHOW);
> 								}
> 							});
> 
>@@ -2034,9 +2032,9 @@
> 			StartupThreading.runWithoutExceptions(new StartupRunnable() {
> 
> 				public void runWithException() throws Throwable {
>-					ErrorDialog.openError(null,
>-							WorkbenchMessages.Workbench_problemsSaving,
>-							WorkbenchMessages.Workbench_problemsSavingMsg, status);
>+					StatusAdapter adapter = new StatusAdapter(status);
>+					adapter.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, WorkbenchMessages.Workbench_problemsSaving);
>+					StatusManager.getManager().handle(adapter, StatusManager.SHOW);
> 				}});
> 			
> 		}
>@@ -2108,7 +2106,7 @@
> 		IExtension[] extensions = point.getExtensions();
> 		ArrayList pluginIds = new ArrayList(extensions.length);
> 		for (int i = 0; i < extensions.length; i++) {
>-			String id = extensions[i].getNamespace();
>+			String id = extensions[i].getNamespaceIdentifier();
> 			if (!pluginIds.contains(id)) {
> 				pluginIds.add(id);
> 			}
>@@ -2161,8 +2159,8 @@
> 
> 					// if the plugin is not in the set of disabled plugins, then
> 					// execute the code to start it
>-					if (!disabledPlugins.contains(extension.getNamespace())) {
>-						monitor.subTask(extension.getNamespace());
>+					if (!disabledPlugins.contains(extension.getNamespaceIdentifier())) {
>+						monitor.subTask(extension.getNamespaceIdentifier());
> 						SafeRunner.run(new EarlyStartupRunnable(extension));
> 					}
> 					monitor.worked(1);
>@@ -3088,7 +3086,7 @@
> 				// if the plugin is not in the set of disabled plugins,
> 				// then
> 				// execute the code to start it
>-				if (disabledPlugins.indexOf(extension.getNamespace()) == -1) {
>+				if (disabledPlugins.indexOf(extension.getNamespaceIdentifier()) == -1) {
> 					SafeRunner.run(new EarlyStartupRunnable(extension));
> 				}
> 			}

Actions: View | Diff

Attachments on bug 222653: 92502