code-template needs new context type

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / corext / template / php / CodeTemplateContextType.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java
index 57796de..1452f68 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java
@@ -32,19 +32,19 @@ import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
 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 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 GETTERCOMMENT_CONTEXTTYPE= "gettercomment_context"; //$NON-NLS-1$
-       public static final String SETTERCOMMENT_CONTEXTTYPE= "settercomment_context"; //$NON-NLS-1$
+       public static final String CATCHBLOCK_CONTEXTTYPE= "php_catchblock_context"; //$NON-NLS-1$
+       public static final String METHODBODY_CONTEXTTYPE= "php_methodbody_context"; //$NON-NLS-1$
+       public static final String CONSTRUCTORBODY_CONTEXTTYPE= "php_constructorbody_context"; //$NON-NLS-1$
+       public static final String GETTERBODY_CONTEXTTYPE= "php_getterbody_context"; //$NON-NLS-1$
+       public static final String SETTERBODY_CONTEXTTYPE= "php_setterbody_context"; //$NON-NLS-1$
+       public static final String NEWTYPE_CONTEXTTYPE= "php_newtype_context"; //$NON-NLS-1$
+       public static final String TYPECOMMENT_CONTEXTTYPE= "php_typecomment_context"; //$NON-NLS-1$
+       public static final String FIELDCOMMENT_CONTEXTTYPE= "php_fieldcomment_context"; //$NON-NLS-1$
+       public static final String METHODCOMMENT_CONTEXTTYPE= "php_methodcomment_context"; //$NON-NLS-1$
+       public static final String CONSTRUCTORCOMMENT_CONTEXTTYPE= "php_constructorcomment_context"; //$NON-NLS-1$
+       public static final String OVERRIDECOMMENT_CONTEXTTYPE= "php_overridecomment_context"; //$NON-NLS-1$
+       public static final String GETTERCOMMENT_CONTEXTTYPE= "php_gettercomment_context"; //$NON-NLS-1$
+       public static final String SETTERCOMMENT_CONTEXTTYPE= "php_settercomment_context"; //$NON-NLS-1$
 
        /* templates */
        public static final String COMMENT_SUFFIX= "comment"; //$NON-NLS-1$
@@ -234,10 +234,10 @@ public class CodeTemplateContextType extends TemplateContextType {
        protected void validateVariables(TemplateVariable[] variables) throws TemplateException {
                ArrayList required=  new ArrayList(5);
                String contextName= getId();
-               if (NEWTYPE_CONTEXTTYPE.equals(contextName)) {
-                       required.add(PACKAGE_DECLARATION);
-                       required.add(TYPE_DECLARATION);
-               }
+//             if (NEWTYPE_CONTEXTTYPE.equals(contextName)) {
+//                     required.add(PACKAGE_DECLARATION);
+//                     required.add(TYPE_DECLARATION);
+//             }
                for (int i= 0; i < variables.length; i++) {
                        String type= variables[i].getType();
                        if (getResolver(type) == null) {