Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 107753 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse UI/org/eclipse/ui/internal/decorators/FullDecoratorRunnable.java (-4 / +2 lines)
Lines 43-52 Link Here
43
    public void handleException(Throwable exception) {
43
    public void handleException(Throwable exception) {
44
        IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
44
        IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
45
                .getMessage(), exception);
45
                .getMessage(), exception);
46
		String message = WorkbenchMessages.DecoratorError
46
		String message = NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled,
47
				+ " " //$NON-NLS-1$
47
				decorator.getName());
48
				+ NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, decorator
49
						.getName());
50
        WorkbenchPlugin.log(message, status);
48
        WorkbenchPlugin.log(message, status);
51
        decorator.crashDisable();
49
        decorator.crashDisable();
52
    }
50
    }
(-)Eclipse UI/org/eclipse/ui/internal/decorators/LightweightDecoratorManager.java (-4 / +6 lines)
Lines 60-69 Link Here
60
		public void handleException(Throwable exception) {
60
		public void handleException(Throwable exception) {
61
			IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
61
			IStatus status = StatusUtil.newStatus(IStatus.ERROR, exception
62
					.getMessage(), exception);
62
					.getMessage(), exception);
63
			String message = WorkbenchMessages.DecoratorError;
63
			String message;
64
			if (decorator != null) {
64
			if (decorator == null) {
65
				message += " " + NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled, //$NON-NLS-1$
65
				message = WorkbenchMessages.DecoratorError;
66
										decorator.getName());
66
			} else {
67
				message = NLS.bind(WorkbenchMessages.DecoratorWillBeDisabled,
68
						decorator.getName());
67
			}
69
			}
68
			WorkbenchPlugin.log(message, status);
70
			WorkbenchPlugin.log(message, status);
69
			if (decorator != null) {
71
			if (decorator != null) {
(-)Eclipse UI/org/eclipse/ui/internal/messages.properties (-1 / +1 lines)
Lines 494-500 Link Here
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.
496
DecoratorError = Exception in Decorator.
497
DecoratorWillBeDisabled = The ''{0}'' decorator will be disabled.
497
DecoratorWillBeDisabled = Exception in Decorator. The ''{0}'' decorator will be disabled.
498
498
499
# --- Startup preferences ---
499
# --- Startup preferences ---
500
StartupPreferencePage_label=&Plug-ins activated on startup:
500
StartupPreferencePage_label=&Plug-ins activated on startup:

Return to bug 107753