--- a/dwtx/jface/text/templates/TemplateCompletionProcessor.d	Sun Aug 24 21:34:15 2008 +0200
+++ b/dwtx/jface/text/templates/TemplateCompletionProcessor.d	Sun Aug 24 22:31:00 2008 +0200
@@ -93,14 +93,14 @@
 
         List matches= new ArrayList();
         for (int i= 0; i < templates.length; i++) {
-            Template template= templates[i];
+            Template template_= templates[i];
             try {
-                context.getContextType().validate(template.getPattern());
+                context.getContextType().validate(template_.getPattern());
             } catch (TemplateException e) {
                 continue;
             }
-            if (template.matches(prefix, context.getContextType().getId()))
-                matches.add(createProposal(template, context, cast(IRegion) region, getRelevance(template, prefix)));
+            if (template_.matches(prefix, context.getContextType().getId()))
+                matches.add(createProposal(template_, context, cast(IRegion) region, getRelevance(template_, prefix)));
         }
 
         Collections.sort(matches, fgProposalComparator);
@@ -124,8 +124,8 @@
      * @deprecated use the version specifying <code>IRegion</code> as third parameter
      * @since 3.1
      */
-    protected ICompletionProposal createProposal(Template template, TemplateContext context, Region region, int relevance) {
-        return createProposal(template, context, cast(IRegion) region, relevance);
+    protected ICompletionProposal createProposal(Template template_, TemplateContext context, Region region, int relevance) {
+        return createProposal(template_, context, cast(IRegion) region, relevance);
     }
 
     /**
@@ -143,8 +143,8 @@
      * @return a new <code>ICompletionProposal</code> for
      *         <code>template</code>
      */
-    protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) {
-        return new TemplateProposal(template, context, region, getImage(template), relevance);
+    protected ICompletionProposal createProposal(Template template_, TemplateContext context, IRegion region, int relevance) {
+        return new TemplateProposal(template_, context, region, getImage(template_), relevance);
     }
 
     /**
@@ -193,8 +193,8 @@
      * @return the relevance of <code>template</code>
      * @see #extractPrefix(ITextViewer, int)
      */
-    protected int getRelevance(Template template, String prefix) {
-        if (template.getName().startsWith(prefix))
+    protected int getRelevance(Template template_, String prefix) {
+        if (template_.getName().startsWith(prefix))
             return 90;
         return 0;
     }
@@ -235,7 +235,7 @@
      * @param template the template for which an image should be returned
      * @return the image for <code>template</code>
      */
-    protected abstract Image getImage(Template template);
+    protected abstract Image getImage(Template template_);
 
     /*
      * @see dwtx.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(dwtx.jface.text.ITextViewer, int)