Attachment 120456 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

clipboard.txt (text/plain), 4.90 KB, created by Krzysztof Daniel

on 2008-12-15 06:49:15 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-12-15 06:49:15 EST

Size: 4.90 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	15 Dec 2008 11:48:14 -0000
>@@ -12,6 +12,8 @@
> 
> import org.eclipse.core.runtime.ISafeRunnable;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.WorkbenchPlugin;
> import org.eclipse.ui.internal.misc.StatusUtil;
> 
>@@ -41,7 +43,11 @@
>     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
>+				+ " " //$NON-NLS-1$
>+				+ NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, decorator
>+						.getName());
>+        WorkbenchPlugin.log(message, status);
>         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	15 Dec 2008 11:48:14 -0000
>@@ -19,7 +19,9 @@
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.SafeRunner;
> import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
>+import org.eclipse.osgi.util.NLS;
> import org.eclipse.ui.internal.ObjectContributorManager;
>+import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.WorkbenchPlugin;
> import org.eclipse.ui.internal.misc.StatusUtil;
> import org.eclipse.ui.internal.util.Util;
>@@ -58,7 +60,12 @@
> 		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());
>+			}
>+			WorkbenchPlugin.log(message, status);
> 			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.386
>diff -u -r1.386 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	1 Dec 2008 22:07:41 -0000	1.386
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	15 Dec 2008 11:48:14 -0000
>@@ -493,6 +493,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.109
>diff -u -r1.109 WorkbenchMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	1 Dec 2008 22:07:41 -0000	1.109
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	15 Dec 2008 11:48:14 -0000
>@@ -526,6 +526,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