Attachment #120456 for bug #107753

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

Lines 12-17 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java (-1 / +7 lines)
12		12
13	import org.eclipse.core.runtime.ISafeRunnable;	13	import org.eclipse.core.runtime.ISafeRunnable;
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
		15	import org.eclipse.osgi.util.NLS;
		16	import org.eclipse.ui.internal.WorkbenchMessages;
15	import org.eclipse.ui.internal.WorkbenchPlugin;	17	import org.eclipse.ui.internal.WorkbenchPlugin;
16	import org.eclipse.ui.internal.misc.StatusUtil;	18	import org.eclipse.ui.internal.misc.StatusUtil;
17		19
Lines 41-47 Link Here
41	public void handleException(Throwable exception) {	43	public void handleException(Throwable exception) {
42	IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception	44	IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
43	.getMessage(), exception);	45	.getMessage(), exception);
44	WorkbenchPlugin.log("Exception in Decorator", status); //$NON-NLS-1$	46	String message = WorkbenchMessages.DecoratorError
		47	+ " " //$NON-NLS-1$
		48	+ NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, decorator
		49	.getName());
		50	WorkbenchPlugin.log(message, status);
45	decorator.crashDisable();	51	decorator.crashDisable();
46	}	52	}
47		53

Lines 19-25 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java (-1 / +8 lines)
19	import org.eclipse.core.runtime.IStatus;	19	import org.eclipse.core.runtime.IStatus;
20	import org.eclipse.core.runtime.SafeRunner;	20	import org.eclipse.core.runtime.SafeRunner;
21	import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;	21	import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
		22	import org.eclipse.osgi.util.NLS;
22	import org.eclipse.ui.internal.ObjectContributorManager;	23	import org.eclipse.ui.internal.ObjectContributorManager;
		24	import org.eclipse.ui.internal.WorkbenchMessages;
23	import org.eclipse.ui.internal.WorkbenchPlugin;	25	import org.eclipse.ui.internal.WorkbenchPlugin;
24	import org.eclipse.ui.internal.misc.StatusUtil;	26	import org.eclipse.ui.internal.misc.StatusUtil;
25	import org.eclipse.ui.internal.util.Util;	27	import org.eclipse.ui.internal.util.Util;
Lines 58-64 Link Here
58	public void handleException(Throwable exception) {	60	public void handleException(Throwable exception) {
59	IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception	61	IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
60	.getMessage(), exception);	62	.getMessage(), exception);
61	WorkbenchPlugin.log("Exception in Decorator", status); //$NON-NLS-1$	63	String message = WorkbenchMessages.DecoratorError;
		64	if (decorator != null) {
		65	message += " " + NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, //$NON-NLS-1$
		66	decorator.getName());
		67	}
		68	WorkbenchPlugin.log(message, status);
62	if (decorator != null) {	69	if (decorator != null) {
63	decorator.crashDisable();	70	decorator.crashDisable();
64	}	71	}

Lines 493-498 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/messages.properties (+2 lines)
493	DecoratorsPreferencePage_description = Descriptio&n:	493	DecoratorsPreferencePage_description = Descriptio&n:
494	DecoratorsPreferencePage_decoratorsLabel = Available &label decorations:	494	DecoratorsPreferencePage_decoratorsLabel = Available &label decorations:
495	DecoratorsPreferencePage_explanation = Label decorations show extra information about an item on its label or icon.\nSelect which additional decorations should be displayed.	495	DecoratorsPreferencePage_explanation = Label decorations show extra information about an item on its label or icon.\nSelect which additional decorations should be displayed.
		496	DecoratorError = Exception in Decorator.
		497	DecoratorWillBeDisabled = The ''{0}'' decorator will be disabled.
496		498
497	# --- Startup preferences ---	499	# --- Startup preferences ---
498	StartupPreferencePage_label=&Plug-ins activated on startup:	500	StartupPreferencePage_label=&Plug-ins activated on startup:

Lines 526-531 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java (+2 lines)
526	public static String DecoratorsPreferencePage_description;	526	public static String DecoratorsPreferencePage_description;
527	public static String DecoratorsPreferencePage_decoratorsLabel;	527	public static String DecoratorsPreferencePage_decoratorsLabel;
528	public static String DecoratorsPreferencePage_explanation;	528	public static String DecoratorsPreferencePage_explanation;
		529	public static String DecoratorError;
		530	public static String DecoratorWillBeDisabled;
529		531
530	// --- Startup preferences ---	532	// --- Startup preferences ---
531	public static String StartupPreferencePage_label;	533	public static String StartupPreferencePage_label;

Return to bug 107753