Attachment 85976 Details for Bug 212252 – Proposed patch

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

[patch] Proposed patch

patch-templatelog.txt (text/plain), 2.64 KB, created by Stephan Wahlbrink

on 2008-01-02 04:38:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Wahlbrink

Created: 2008-01-02 04:38:03 EST

Size: 2.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.editors
>Index: src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java,v
>retrieving revision 1.35
>diff -u -r1.35 EditorsPlugin.java
>--- src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java	29 May 2007 13:33:26 -0000	1.35
>+++ src/org/eclipse/ui/internal/editors/text/EditorsPlugin.java	2 Jan 2008 09:36:44 -0000
>@@ -68,6 +68,12 @@
> 		log(multi);
> 	}
> 
>+	public static void log(String message, Throwable e) {
>+		if (message == null)
>+				message= ""; //$NON-NLS-1$
>+		log(new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IEditorsStatusConstants.INTERNAL_ERROR, message, e));
>+	}
>+
> 	public static void log(Throwable e) {
> 		log(new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IEditorsStatusConstants.INTERNAL_ERROR, TextEditorMessages.EditorsPlugin_internal_error, e));
> 	}
>Index: src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java,v
>retrieving revision 1.23
>diff -u -r1.23 ContributionTemplateStore.java
>--- src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java	17 May 2006 11:16:41 -0000	1.23
>+++ src/org/eclipse/ui/editors/text/templates/ContributionTemplateStore.java	2 Jan 2008 09:36:44 -0000
>@@ -147,10 +147,7 @@
> 								EditorsPlugin.logErrorMessage(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_no_id, data.getTemplate().getName()));
> 							else
> 								EditorsPlugin.logErrorMessage(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_deleted, data.getTemplate().getName()));
>-						} else if (!validateTemplate(data.getTemplate())) {
>-							if (contextExists(data.getTemplate().getContextTypeId()))
>-								EditorsPlugin.logErrorMessage(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_validation_failed, data.getTemplate().getName()));
>-						} else {
>+						} else if (validateTemplate(data.getTemplate())) {
> 							templates.add(data);
> 						}
> 					}
>@@ -190,6 +187,7 @@
> 			try {
> 				getRegistry().getContextType(contextTypeId).validate(template.getPattern());
> 			} catch (TemplateException e) {
>+				EditorsPlugin.log(NLSUtility.format(ContributionTemplateMessages.ContributionTemplateStore_ignore_validation_failed, template.getName()), e);
> 				return false;
> 			}
> 		}

Actions: View | Diff

Attachments on bug 212252: 85976