Attachment 120545 Details for Bug 107753 – Is this better?

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

[patch] Is this better?

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

on 2008-12-16 03:49:29 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-12-16 03:49:29 EST

Size: 3.43 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.8
>diff -u -r1.8 FullDecoratorRunnable.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java	15 Dec 2008 11:50:38 -0000	1.8
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java	16 Dec 2008 08:47:51 -0000
>@@ -43,10 +43,8 @@
>     public void handleException(Throwable exception) {
>         IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
>                 .getMessage(), exception);
>-		String message = WorkbenchMessages.DecoratorError
>-				+ " " //$NON-NLS-1$
>-				+ NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, decorator
>-						.getName());
>+		String message = 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.32
>diff -u -r1.32 LightweightDecoratorManager.java
>--- Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java	15 Dec 2008 11:50:38 -0000	1.32
>+++ Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java	16 Dec 2008 08:47:51 -0000
>@@ -60,10 +60,12 @@
> 		public void handleException(Throwable exception) {
> 			IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
> 					.getMessage(), exception);
>-			String message = WorkbenchMessages.DecoratorError;
>-			if (decorator != null) {
>-				message += " " + NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, //$NON-NLS-1$
>-										decorator.getName());
>+			String message;
>+			if (decorator == null) {
>+				message = WorkbenchMessages.DecoratorError;
>+			} else {
>+				message = NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled,
>+						decorator.getName());
> 			}
> 			WorkbenchPlugin.log(message, status);
> 			if (decorator != null) {
>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.388
>diff -u -r1.388 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	15 Dec 2008 13:57:44 -0000	1.388
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	16 Dec 2008 08:47:51 -0000
>@@ -494,7 +494,7 @@
> 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.
>+DecoratorWillBeDisabled = Exception in Decorator. The ''{0}'' decorator will be disabled.
> 
> # --- Startup preferences ---
> StartupPreferencePage_label=&Plug-ins activated on startup:

Actions: View | Diff

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