API cleanup

2 files changed, 13 insertions, 13 deletions

diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
index b691e581e..ecd51c6fa 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.templates.ContextType;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
 
@@ -78,7 +78,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	/**
 	 * Return the XML context type that is supported by this plugin. 
 	 */
-	protected ContextType getContextType(ITextViewer viewer, IRegion region) {
+	protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
 		return TemplateEditorUI.getDefault().getContextTypeRegistry().getContextType(XMLContextType.XML_CONTEXT_TYPE);
 	}
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
index 01a6484a7..c25e00fe7 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLContextType.java
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.ui.examples.templateeditor.template;
 
-import org.eclipse.jface.text.templates.ContextType;
-import org.eclipse.jface.text.templates.GlobalVariables;
+import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.GlobalTemplateVariables;
 
 
 /**
  * A very simple context type.
  */
-public class XMLContextType extends ContextType {
+public class XMLContextType extends TemplateContextType {
 
 	/** This context's id */
 	public static final String XML_CONTEXT_TYPE= "org.eclipse.ui.examples.templateeditor.xml"; //$NON-NLS-1$
@@ -30,14 +30,14 @@ public class XMLContextType extends ContextType {
 	}
 
 	private void addGlobalResolvers() {
-		addResolver(new GlobalVariables.Cursor());
-		addResolver(new GlobalVariables.WordSelection());
-		addResolver(new GlobalVariables.LineSelection());
-		addResolver(new GlobalVariables.Dollar());
-		addResolver(new GlobalVariables.Date());
-		addResolver(new GlobalVariables.Year());
-		addResolver(new GlobalVariables.Time());
-		addResolver(new GlobalVariables.User());
+		addResolver(new GlobalTemplateVariables.Cursor());
+		addResolver(new GlobalTemplateVariables.WordSelection());
+		addResolver(new GlobalTemplateVariables.LineSelection());
+		addResolver(new GlobalTemplateVariables.Dollar());
+		addResolver(new GlobalTemplateVariables.Date());
+		addResolver(new GlobalTemplateVariables.Year());
+		addResolver(new GlobalTemplateVariables.Time());
+		addResolver(new GlobalTemplateVariables.User());
 	}
 
 }