[266680] [preferences] Code Templates for Java and JavaScript mixed up

2 files changed, 38 insertions, 38 deletions

diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/template/java/CodeTemplateContextType.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/template/java/CodeTemplateContextType.java
index 0ec6b3fd..58225f15 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/template/java/CodeTemplateContextType.java
+++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/corext/template/java/CodeTemplateContextType.java
@@ -33,25 +33,25 @@ import org.eclipse.wst.jsdt.internal.corext.util.Messages;
 public class CodeTemplateContextType extends TemplateContextType {
 	
 	/* context types */
-	public static final String CATCHBLOCK_CONTEXTTYPE= "catchblock_context"; //$NON-NLS-1$
-	public static final String METHODBODY_CONTEXTTYPE= "methodbody_context"; //$NON-NLS-1$
-	public static final String CONSTRUCTORBODY_CONTEXTTYPE= "constructorbody_context"; //$NON-NLS-1$
-	public static final String GETTERBODY_CONTEXTTYPE= "getterbody_context"; //$NON-NLS-1$
-	public static final String SETTERBODY_CONTEXTTYPE= "setterbody_context"; //$NON-NLS-1$
-	public static final String NEWTYPE_CONTEXTTYPE= "newtype_context"; //$NON-NLS-1$
-	public static final String CLASSBODY_CONTEXTTYPE= "classbody_context"; //$NON-NLS-1$
-	public static final String INTERFACEBODY_CONTEXTTYPE= "interfacebody_context"; //$NON-NLS-1$
-	public static final String ENUMBODY_CONTEXTTYPE= "enumbody_context"; //$NON-NLS-1$
-	public static final String ANNOTATIONBODY_CONTEXTTYPE= "annotationbody_context"; //$NON-NLS-1$
-	public static final String FILECOMMENT_CONTEXTTYPE= "filecomment_context"; //$NON-NLS-1$
-	public static final String TYPECOMMENT_CONTEXTTYPE= "typecomment_context"; //$NON-NLS-1$
-	public static final String FIELDCOMMENT_CONTEXTTYPE= "fieldcomment_context"; //$NON-NLS-1$
-	public static final String METHODCOMMENT_CONTEXTTYPE= "methodcomment_context"; //$NON-NLS-1$
-	public static final String CONSTRUCTORCOMMENT_CONTEXTTYPE= "constructorcomment_context"; //$NON-NLS-1$
-	public static final String OVERRIDECOMMENT_CONTEXTTYPE= "overridecomment_context"; //$NON-NLS-1$
-	public static final String DELEGATECOMMENT_CONTEXTTYPE= "delegatecomment_context"; //$NON-NLS-1$
-	public static final String GETTERCOMMENT_CONTEXTTYPE= "gettercomment_context"; //$NON-NLS-1$
-	public static final String SETTERCOMMENT_CONTEXTTYPE= "settercomment_context"; //$NON-NLS-1$
+	public static final String CATCHBLOCK_CONTEXTTYPE= "org.eclipse.jsdt.catchblock_context"; //$NON-NLS-1$
+	public static final String METHODBODY_CONTEXTTYPE= "org.eclipse.jsdt.methodbody_context"; //$NON-NLS-1$
+	public static final String CONSTRUCTORBODY_CONTEXTTYPE= "org.eclipse.jsdt.constructorbody_context"; //$NON-NLS-1$
+	public static final String GETTERBODY_CONTEXTTYPE= "org.eclipse.jsdt.getterbody_context"; //$NON-NLS-1$
+	public static final String SETTERBODY_CONTEXTTYPE= "org.eclipse.jsdt.setterbody_context"; //$NON-NLS-1$
+	public static final String NEWTYPE_CONTEXTTYPE= "org.eclipse.jsdt.newtype_context"; //$NON-NLS-1$
+	public static final String CLASSBODY_CONTEXTTYPE= "org.eclipse.jsdt.classbody_context"; //$NON-NLS-1$
+	public static final String INTERFACEBODY_CONTEXTTYPE= "org.eclipse.jsdt.interfacebody_context"; //$NON-NLS-1$
+	public static final String ENUMBODY_CONTEXTTYPE= "org.eclipse.jsdt.enumbody_context"; //$NON-NLS-1$
+	public static final String ANNOTATIONBODY_CONTEXTTYPE= "org.eclipse.jsdt.annotationbody_context"; //$NON-NLS-1$
+	public static final String FILECOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.filecomment_context"; //$NON-NLS-1$
+	public static final String TYPECOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.typecomment_context"; //$NON-NLS-1$
+	public static final String FIELDCOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.fieldcomment_context"; //$NON-NLS-1$
+	public static final String METHODCOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.methodcomment_context"; //$NON-NLS-1$
+	public static final String CONSTRUCTORCOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.constructorcomment_context"; //$NON-NLS-1$
+	public static final String OVERRIDECOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.overridecomment_context"; //$NON-NLS-1$
+	public static final String DELEGATECOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.delegatecomment_context"; //$NON-NLS-1$
+	public static final String GETTERCOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.gettercomment_context"; //$NON-NLS-1$
+	public static final String SETTERCOMMENT_CONTEXTTYPE= "org.eclipse.jsdt.settercomment_context"; //$NON-NLS-1$
 
 	/* templates */
 	
diff --git a/bundles/org.eclipse.wst.jsdt.ui/templates/default-codetemplates.xml b/bundles/org.eclipse.wst.jsdt.ui/templates/default-codetemplates.xml
index 6df2faaa..0660bc6a 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/templates/default-codetemplates.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/templates/default-codetemplates.xml
@@ -15,76 +15,76 @@
 -->
 
 <templates>
-<template name="gettercomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" description="%CodeTemplates.gettercomment" context="gettercomment_context" enabled="true">/**
+<template name="gettercomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" description="%CodeTemplates.gettercomment" context="org.eclipse.jsdt.gettercomment_context" enabled="true">/**
  * @return %CodeTemplates.gettercomment.returntagcontent
  */</template>
 
-<template name="settercomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" description="%CodeTemplates.settercomment" context="settercomment_context" enabled="true">/**
+<template name="settercomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" description="%CodeTemplates.settercomment" context="org.eclipse.jsdt.settercomment_context" enabled="true">/**
  * @param ${param} %CodeTemplates.settercomment.paramtagcontent
  */</template>
 
-<template name="constructorcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" description="%CodeTemplates.constructorcomment" context="constructorcomment_context" enabled="true">/**
+<template name="constructorcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" description="%CodeTemplates.constructorcomment" context="org.eclipse.jsdt.constructorcomment_context" enabled="true">/**
  * ${tags}
  */</template>
 
-<template name="filecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" description="%CodeTemplates.filecomment" context="filecomment_context" enabled="true">/**
+<template name="filecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" description="%CodeTemplates.filecomment" context="org.eclipse.jsdt.filecomment_context" enabled="true">/**
  * 
  */</template>
 
-<template name="typecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" description="%CodeTemplates.typecomment" context="typecomment_context" enabled="true">/**
+<template name="typecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" description="%CodeTemplates.typecomment" context="org.eclipse.jsdt.typecomment_context" enabled="true">/**
  * @author ${user}
  *
  * ${tags}
  */</template>
  
-<template name="fieldcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" description="%CodeTemplates.fieldcomment" context="fieldcomment_context" enabled="true">/**
+<template name="fieldcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" description="%CodeTemplates.fieldcomment" context="org.eclipse.jsdt.fieldcomment_context" enabled="true">/**
  * 
  */</template>
  
-<template name="methodcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" description="%CodeTemplates.nonoverridingcomment" context="methodcomment_context" enabled="true">/**
+<template name="methodcomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" description="%CodeTemplates.nonoverridingcomment" context="org.eclipse.jsdt.methodcomment_context" enabled="true">/**
  * ${tags}
  */</template>
 
-<template name="overridecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" description="%CodeTemplates.overridecomment" context="overridecomment_context" enabled="true">/* %CodeTemplates.overridecomment.nonjd
+<template name="overridecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" description="%CodeTemplates.overridecomment" context="org.eclipse.jsdt.overridecomment_context" enabled="true">/* %CodeTemplates.overridecomment.nonjd
  * ${see_to_overridden}
  */</template>
 
-<template name="delegatecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" description="%CodeTemplates.delegatecomment" context="delegatecomment_context" enabled="true">/**
+<template name="delegatecomment" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" description="%CodeTemplates.delegatecomment" context="org.eclipse.jsdt.delegatecomment_context" enabled="true">/**
  * ${tags}
  * ${see_to_target}
  */</template>
 
-<template name="newtype" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" description="%CodeTemplates.newfile" context="newtype_context" enabled="true">${filecomment}
+<template name="newtype" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" description="%CodeTemplates.newfile" context="org.eclipse.jsdt.newtype_context" enabled="true">${filecomment}
 ${package_declaration}
 
 ${typecomment}
 ${type_declaration}</template>
 
-<template name="classbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" description="%CodeTemplates.classbody" context="classbody_context" enabled="true">
+<template name="classbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" description="%CodeTemplates.classbody" context="org.eclipse.jsdt.classbody_context" enabled="true">
 </template>
 
 <!--
-<template name="interfacebody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" description="%CodeTemplates.interfacebody" context="interfacebody_context" enabled="true">
+<template name="interfacebody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" description="%CodeTemplates.interfacebody" context="org.eclipse.jsdt.interfacebody_context" enabled="true">
 </template>
 
-<template name="enumbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" description="%CodeTemplates.enumbody" context="enumbody_context" enabled="true">
+<template name="enumbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" description="%CodeTemplates.enumbody" context="org.eclipse.jsdt.enumbody_context" enabled="true">
 </template>
 
-<template name="annotationbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" description="%CodeTemplates.annotationbody" context="annotationbody_context" enabled="true">
+<template name="annotationbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" description="%CodeTemplates.annotationbody" context="org.eclipse.jsdt.annotationbody_context" enabled="true">
 </template>
 -->
 
-<template name="catchblock" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" description="%CodeTemplates.catchblock" context="catchblock_context" enabled="true">// ${todo} %CodeTemplates.catchblock.tododesc
+<template name="catchblock" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" description="%CodeTemplates.catchblock" context="org.eclipse.jsdt.catchblock_context" enabled="true">// ${todo} %CodeTemplates.catchblock.tododesc
 ${exception_var}.printStackTrace();</template>
 
-<template name="methodbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" description="%CodeTemplates.methodstub" context="methodbody_context" enabled="true">// ${todo} %CodeTemplates.methodstub.tododesc
+<template name="methodbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" description="%CodeTemplates.methodstub" context="org.eclipse.jsdt.methodbody_context" enabled="true">// ${todo} %CodeTemplates.methodstub.tododesc
 ${body_statement}</template>
 
-<template name="constructorbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" description="%CodeTemplates.constructorstub" context="constructorbody_context" enabled="true">${body_statement}
+<template name="constructorbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" description="%CodeTemplates.constructorstub" context="org.eclipse.jsdt.constructorbody_context" enabled="true">${body_statement}
 // ${todo} %CodeTemplates.constructorstub.tododesc</template>
 
-<template name="getterbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" description="%CodeTemplates.getterstub" context="getterbody_context" enabled="true">return ${field};</template>
+<template name="getterbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" description="%CodeTemplates.getterstub" context="org.eclipse.jsdt.getterbody_context" enabled="true">return ${field};</template>
 
-<template name="setterbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" description="%CodeTemplates.setterstub" context="setterbody_context" enabled="true">${field} = ${param};</template>
+<template name="setterbody" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" description="%CodeTemplates.setterstub" context="org.eclipse.jsdt.setterbody_context" enabled="true">${field} = ${param};</template>
 
 </templates>
\ No newline at end of file