mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Cosmetics.
This commit is contained in:
parent
bcd45d7218
commit
dbf3690c8b
1 changed files with 52 additions and 59 deletions
|
@ -21,10 +21,7 @@ import org.eclipse.cdt.core.model.ICProject;
|
|||
|
||||
import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility;
|
||||
|
||||
/**
|
||||
*/
|
||||
public class CodeTemplateContextType extends FileTemplateContextType {
|
||||
|
||||
/* context types */
|
||||
private static final String CONTEXTTYPE_PREFIX= "org.eclipse.cdt.ui.text.codetemplates."; //$NON-NLS-1$
|
||||
|
||||
|
@ -33,7 +30,7 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
public static final String CSOURCEFILE_CONTEXTTYPE= CCorePlugin.CONTENT_TYPE_CSOURCE + FileTemplateContextType.CONTEXTTYPE_SUFFIX;
|
||||
public static final String CHEADERFILE_CONTEXTTYPE= CCorePlugin.CONTENT_TYPE_CHEADER + FileTemplateContextType.CONTEXTTYPE_SUFFIX;
|
||||
public static final String ASMSOURCEFILE_CONTEXTTYPE= CCorePlugin.CONTENT_TYPE_ASMSOURCE + FileTemplateContextType.CONTEXTTYPE_SUFFIX;
|
||||
|
||||
|
||||
public static final String METHODBODY_CONTEXTTYPE= CONTEXTTYPE_PREFIX + "methodbody_context"; //$NON-NLS-1$
|
||||
public static final String CONSTRUCTORBODY_CONTEXTTYPE= CONTEXTTYPE_PREFIX + "constructorbody_context"; //$NON-NLS-1$
|
||||
public static final String DESTRUCTORBODY_CONTEXTTYPE= CONTEXTTYPE_PREFIX + "destructorbody_context"; //$NON-NLS-1$
|
||||
|
@ -47,13 +44,13 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
/* templates */
|
||||
private static final String CODETEMPLATES_PREFIX= "org.eclipse.cdt.ui.text.codetemplates."; //$NON-NLS-1$
|
||||
public static final String COMMENT_SUFFIX= "comment"; //$NON-NLS-1$
|
||||
|
||||
public static final String ASM_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "asmsourcefile"; //$NON-NLS-1$
|
||||
public static final String CPP_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "cppsourcefile"; //$NON-NLS-1$
|
||||
public static final String CPP_HEADERFILE_ID= CODETEMPLATES_PREFIX + "cppheaderfile"; //$NON-NLS-1$
|
||||
public static final String C_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "csourcefile"; //$NON-NLS-1$
|
||||
public static final String C_HEADERFILE_ID= CODETEMPLATES_PREFIX + "cheaderfile"; //$NON-NLS-1$
|
||||
public static final String METHODSTUB_ID= CODETEMPLATES_PREFIX + "methodbody"; //$NON-NLS-1$
|
||||
|
||||
public static final String ASM_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "asmsourcefile"; //$NON-NLS-1$
|
||||
public static final String CPP_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "cppsourcefile"; //$NON-NLS-1$
|
||||
public static final String CPP_HEADERFILE_ID= CODETEMPLATES_PREFIX + "cppheaderfile"; //$NON-NLS-1$
|
||||
public static final String C_SOURCEFILE_ID= CODETEMPLATES_PREFIX + "csourcefile"; //$NON-NLS-1$
|
||||
public static final String C_HEADERFILE_ID= CODETEMPLATES_PREFIX + "cheaderfile"; //$NON-NLS-1$
|
||||
public static final String METHODSTUB_ID= CODETEMPLATES_PREFIX + "methodbody"; //$NON-NLS-1$
|
||||
public static final String CONSTRUCTORSTUB_ID= CODETEMPLATES_PREFIX + "constructorbody"; //$NON-NLS-1$
|
||||
public static final String DESTRUCTORSTUB_ID= CODETEMPLATES_PREFIX + "destructorbody"; //$NON-NLS-1$
|
||||
public static final String FILECOMMENT_ID= CODETEMPLATES_PREFIX + "file" + COMMENT_SUFFIX; //$NON-NLS-1$
|
||||
|
@ -62,24 +59,23 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
public static final String METHODCOMMENT_ID= CODETEMPLATES_PREFIX + "method" + COMMENT_SUFFIX; //$NON-NLS-1$
|
||||
public static final String CONSTRUCTORCOMMENT_ID= CODETEMPLATES_PREFIX + "constructor" + COMMENT_SUFFIX; //$NON-NLS-1$
|
||||
public static final String DESTRUCTORCOMMENT_ID= CODETEMPLATES_PREFIX + "destructor" + COMMENT_SUFFIX; //$NON-NLS-1$
|
||||
|
||||
|
||||
/* resolver types */
|
||||
public static final String ENCLOSING_METHOD= "enclosing_method"; //$NON-NLS-1$
|
||||
public static final String ENCLOSING_TYPE= "enclosing_type"; //$NON-NLS-1$
|
||||
public static final String BODY_STATEMENT= "body_statement"; //$NON-NLS-1$
|
||||
public static final String FIELD= "field"; //$NON-NLS-1$
|
||||
public static final String FIELD_TYPE= "field_type"; //$NON-NLS-1$
|
||||
|
||||
|
||||
public static final String RETURN_TYPE= "return_type"; //$NON-NLS-1$
|
||||
|
||||
|
||||
public static final String TYPENAME= "type_name"; //$NON-NLS-1$
|
||||
public static final String INCLUDE_GUARD_SYMBOL= "include_guard_symbol"; //$NON-NLS-1$
|
||||
|
||||
public static final String DECLARATIONS= "declarations"; //$NON-NLS-1$
|
||||
public static final String TYPE_COMMENT= "typecomment"; //$NON-NLS-1$
|
||||
public static final String FILE_COMMENT= "filecomment"; //$NON-NLS-1$
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Resolver that resolves to the variable defined in the context.
|
||||
*/
|
||||
|
@ -88,16 +84,15 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
super(type, description);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Resolver for task tags.
|
||||
*/
|
||||
protected static class Todo extends TemplateVariableResolver {
|
||||
|
||||
public Todo() {
|
||||
super("todo", TemplateMessages.CodeTemplateContextType_variable_description_todo); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected String resolve(TemplateContext context) {
|
||||
ICProject cProject = null;
|
||||
|
@ -107,57 +102,57 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
String todoTaskTag= StubUtility.getTodoTaskTag(cProject);
|
||||
if (todoTaskTag == null)
|
||||
return "XXX"; //$NON-NLS-1$
|
||||
|
||||
|
||||
return todoTaskTag;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private boolean fIsComment;
|
||||
|
||||
|
||||
public CodeTemplateContextType(String contextTypeId) {
|
||||
this(contextTypeId, contextTypeId);
|
||||
}
|
||||
|
||||
public CodeTemplateContextType(String contextTypeId, String contextName) {
|
||||
super(contextTypeId, contextName);
|
||||
|
||||
|
||||
fIsComment= false;
|
||||
|
||||
|
||||
// global
|
||||
addResolver(new Todo());
|
||||
|
||||
|
||||
if (CPPSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addTranslationUnitVariables();
|
||||
} else if (CPPHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addTranslationUnitVariables();
|
||||
} else if (CSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addTranslationUnitVariables();
|
||||
} else if (CHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol));
|
||||
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
|
||||
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
addTranslationUnitVariables();
|
||||
} else if (METHODBODY_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
} else if (CONSTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
} else if (DESTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
|
||||
} else if (TYPECOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(TYPENAME, TemplateMessages.CodeTemplateContextType_variable_description_typename));
|
||||
addResolver(new CodeTemplateVariableResolver(TYPENAME, TemplateMessages.CodeTemplateContextType_variable_description_typename));
|
||||
addTranslationUnitVariables();
|
||||
fIsComment= true;
|
||||
} else if (FILECOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
|
@ -169,24 +164,24 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
addTranslationUnitVariables();
|
||||
fIsComment= true;
|
||||
} else if (METHODCOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
|
||||
addResolver(new CodeTemplateVariableResolver(RETURN_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_returntype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
|
||||
addResolver(new CodeTemplateVariableResolver(RETURN_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_returntype));
|
||||
addTranslationUnitVariables();
|
||||
fIsComment= true;
|
||||
} else if (CONSTRUCTORCOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addTranslationUnitVariables();
|
||||
fIsComment= true;
|
||||
} else if (DESTRUCTORCOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
|
||||
addTranslationUnitVariables();
|
||||
fIsComment= true;
|
||||
} else {
|
||||
addTranslationUnitVariables();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* @see org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType#addResourceVariables()
|
||||
*/
|
||||
|
@ -194,24 +189,24 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
protected void addResourceVariables() {
|
||||
// don't add resource variables by default
|
||||
}
|
||||
|
||||
|
||||
private void addTranslationUnitVariables() {
|
||||
super.addResourceVariables();
|
||||
}
|
||||
|
||||
|
||||
public static void registerContextTypes(ContextTypeRegistry registry) {
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CPPSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_cppsource_name));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CPPHEADERFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_cppheader_name));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_csource_name));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CHEADERFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_cheader_name));
|
||||
FileTemplateContextType asmContextType= new FileTemplateContextType(CodeTemplateContextType.ASMSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_asmsource_name);
|
||||
asmContextType.addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
asmContextType.addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
|
||||
registry.addContextType(asmContextType);
|
||||
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.METHODBODY_CONTEXTTYPE));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CONSTRUCTORBODY_CONTEXTTYPE));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.DESTRUCTORBODY_CONTEXTTYPE));
|
||||
|
||||
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.FILECOMMENT_CONTEXTTYPE));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.TYPECOMMENT_CONTEXTTYPE));
|
||||
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.FIELDCOMMENT_CONTEXTTYPE));
|
||||
|
@ -229,8 +224,7 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private boolean isValidComment(String template) {
|
||||
// IScanner scanner= ToolFactory.createScanner(true, false, false, false);
|
||||
// scanner.setSource(template.toCharArray());
|
||||
|
@ -244,6 +238,5 @@ public class CodeTemplateContextType extends FileTemplateContextType {
|
|||
// }
|
||||
// return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue