Attachment 110346 Details for Bug 107753 – Fix

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

[patch] Fix

decorators.txt (text/plain), 5.75 KB, created by Krzysztof Daniel

on 2008-08-19 11:09:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-08-19 11:09:26 EDT

Size: 5.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java,v
>retrieving revision 1.7
>diff -u -r1.7 FullDecoratorRunnable.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java	16 Mar 2007 18:00:40 -0000	1.7
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java	19 Aug 2008 15:07:56 -0000
>@@ -12,8 +12,11 @@
> 
> import org.eclipse.core.runtime.ISafeRunnable;
> import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.ui.internal.WorkbenchPlugin;
>-import org.eclipse.ui.internal.misc.StatusUtil;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.internal.WorkbenchMessages;
>+import org.eclipse.ui.statushandlers.StatusManager;
> 
> /**
>  * The FullDecoratorRunnable is the ISafeRunnable that runs
>@@ -39,10 +42,14 @@
>      * @see ISafeRunnable.handleException(Throwable).
>      */
>     public void handleException(Throwable exception) {
>-        IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
>-                .getMessage(), exception);
>-        WorkbenchPlugin.log("Exception in Decorator", status); //$NON-NLS-1$
>-        decorator.crashDisable();
>+		String message = WorkbenchMessages.DecoratorError
>+				+ " " //$NON-NLS-1$
>+				+ NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, decorator
>+						.getName());
>+		StatusManager.getManager().handle(
>+				new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, message,
>+						exception), StatusManager.LOG | StatusManager.SHOW);
>+		decorator.crashDisable();
>     }
> 
> }
>Index: Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java,v
>retrieving revision 1.31
>diff -u -r1.31 LightweightDecoratorManager.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java	12 May 2008 19:35:20 -0000	1.31
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java	19 Aug 2008 15:07:56 -0000
>@@ -18,11 +18,14 @@
> import org.eclipse.core.runtime.ISafeRunnable;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.SafeRunner;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.internal.ObjectContributorManager;
>-import org.eclipse.ui.internal.WorkbenchPlugin;
>-import org.eclipse.ui.internal.misc.StatusUtil;
>+import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.util.Util;
>+import org.eclipse.ui.statushandlers.StatusManager;
> 
> /**
>  * The LightweightDecoratorManager is a decorator manager that encapsulates the
>@@ -56,9 +59,14 @@
> 		 * @see ISafeRunnable.handleException(Throwable).
> 		 */
> 		public void handleException(Throwable exception) {
>-			IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
>-					.getMessage(), exception);
>-			WorkbenchPlugin.log("Exception in Decorator", status); //$NON-NLS-1$
>+			String message = WorkbenchMessages.DecoratorError;
>+			if (decorator != null) {
>+				message += " " + NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, //$NON-NLS-1$
>+										decorator.getName());
>+			}
>+			StatusManager.getManager().handle(
>+					new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID, message,
>+							exception), StatusManager.LOG | StatusManager.SHOW);
> 			if (decorator != null) {
> 				decorator.crashDisable();
> 			}
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.383
>diff -u -r1.383 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	30 May 2008 17:10:15 -0000	1.383
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	19 Aug 2008 15:07:56 -0000
>@@ -467,6 +467,8 @@
> DecoratorsPreferencePage_description = Descriptio&n:
> DecoratorsPreferencePage_decoratorsLabel = Available &label decorations:
> DecoratorsPreferencePage_explanation = Label decorations show extra information about an item on its label or icon.\nSelect which additional decorations should be displayed.
>+DecoratorError = Exception in Decorator.
>+DecoratorWillBeDisabled = The ''{0}'' decorator will be disabled.
> 
> # --- Startup preferences ---
> StartupPreferencePage_label=&Plug-ins activated on startup:
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java,v
>retrieving revision 1.106
>diff -u -r1.106 WorkbenchMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	14 May 2008 17:11:06 -0000	1.106
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	19 Aug 2008 15:07:56 -0000
>@@ -501,6 +501,8 @@
> 	public static String DecoratorsPreferencePage_description;
> 	public static String DecoratorsPreferencePage_decoratorsLabel;
> 	public static String DecoratorsPreferencePage_explanation;
>+	public static String DecoratorError;
>+	public static String DecoratorWillBeDisabled;
> 
> 	// --- Startup preferences ---
> 	public static String StartupPreferencePage_label;

Actions: View | Diff

Attachments on bug 107753: 110346 | 115371 | 115915 | 120456 | 120545