mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-08 06:12:24 +00:00
parent bcd45d7218
commit dbf3690c8b
1 changed files with 52 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java
View file

@ -21,10 +21,7 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility; import org.eclipse.cdt.internal.corext.codemanipulation.StubUtility;
/**
*/
public class CodeTemplateContextType extends FileTemplateContextType { public class CodeTemplateContextType extends FileTemplateContextType {
/* context types */ /* context types */
private static final String CONTEXTTYPE_PREFIX= "org.eclipse.cdt.ui.text.codetemplates."; //$NON-NLS-1$ private static final String CONTEXTTYPE_PREFIX= "org.eclipse.cdt.ui.text.codetemplates."; //$NON-NLS-1$
@ -79,7 +76,6 @@ public class CodeTemplateContextType extends FileTemplateContextType {
public static final String TYPE_COMMENT= "typecomment"; //$NON-NLS-1$ public static final String TYPE_COMMENT= "typecomment"; //$NON-NLS-1$
public static final String FILE_COMMENT= "filecomment"; //$NON-NLS-1$ public static final String FILE_COMMENT= "filecomment"; //$NON-NLS-1$
/** /**
* Resolver that resolves to the variable defined in the context. * Resolver that resolves to the variable defined in the context.
*/ */
@ -93,7 +89,6 @@ public class CodeTemplateContextType extends FileTemplateContextType {
* Resolver for task tags. * Resolver for task tags.
*/ */
protected static class Todo extends TemplateVariableResolver { protected static class Todo extends TemplateVariableResolver {
public Todo() { public Todo() {
super("todo", TemplateMessages.CodeTemplateContextType_variable_description_todo); //$NON-NLS-1$ super("todo", TemplateMessages.CodeTemplateContextType_variable_description_todo); //$NON-NLS-1$
} }
@ -127,37 +122,37 @@ public class CodeTemplateContextType extends FileTemplateContextType {
addResolver(new Todo()); addResolver(new Todo());
if (CPPSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) { if (CPPSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration)); addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment)); addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment)); addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
addTranslationUnitVariables(); addTranslationUnitVariables();
} else if (CPPHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) { } else if (CPPHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol)); 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(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment)); addResolver(new CodeTemplateVariableResolver(TYPE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_typecomment));
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment)); addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
addTranslationUnitVariables(); addTranslationUnitVariables();
} else if (CSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) { } else if (CSOURCEFILE_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration)); addResolver(new CodeTemplateVariableResolver(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment)); addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
addTranslationUnitVariables(); addTranslationUnitVariables();
} else if (CHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) { } else if (CHEADERFILE_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(INCLUDE_GUARD_SYMBOL, TemplateMessages.CodeTemplateContextType_variable_description_include_guard_symbol)); 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(DECLARATIONS, TemplateMessages.CodeTemplateContextType_variable_description_typedeclaration));
addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment)); addResolver(new CodeTemplateVariableResolver(FILE_COMMENT, TemplateMessages.CodeTemplateContextType_variable_description_filecomment));
addTranslationUnitVariables(); addTranslationUnitVariables();
} else if (METHODBODY_CONTEXTTYPE.equals(contextTypeId)) { } else if (METHODBODY_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement)); addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
} else if (CONSTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) { } else if (CONSTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement)); addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
} else if (DESTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) { } else if (DESTRUCTORBODY_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement)); addResolver(new CodeTemplateVariableResolver(BODY_STATEMENT, TemplateMessages.CodeTemplateContextType_variable_description_bodystatement));
} else if (TYPECOMMENT_CONTEXTTYPE.equals(contextTypeId)) { } 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(); addTranslationUnitVariables();
fIsComment= true; fIsComment= true;
} else if (FILECOMMENT_CONTEXTTYPE.equals(contextTypeId)) { } else if (FILECOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
@ -169,17 +164,17 @@ public class CodeTemplateContextType extends FileTemplateContextType {
addTranslationUnitVariables(); addTranslationUnitVariables();
fIsComment= true; fIsComment= true;
} else if (METHODCOMMENT_CONTEXTTYPE.equals(contextTypeId)) { } else if (METHODCOMMENT_CONTEXTTYPE.equals(contextTypeId)) {
addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_enclosingtype));
addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod)); addResolver(new CodeTemplateVariableResolver(ENCLOSING_METHOD, TemplateMessages.CodeTemplateContextType_variable_description_enclosingmethod));
addResolver(new CodeTemplateVariableResolver(RETURN_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_returntype)); addResolver(new CodeTemplateVariableResolver(RETURN_TYPE, TemplateMessages.CodeTemplateContextType_variable_description_returntype));
addTranslationUnitVariables(); addTranslationUnitVariables();
fIsComment= true; fIsComment= true;
} else if (CONSTRUCTORCOMMENT_CONTEXTTYPE.equals(contextTypeId)) { } 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(); addTranslationUnitVariables();
fIsComment= true; fIsComment= true;
} else if (DESTRUCTORCOMMENT_CONTEXTTYPE.equals(contextTypeId)) { } 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(); addTranslationUnitVariables();
fIsComment= true; fIsComment= true;
} else { } else {
@ -205,7 +200,7 @@ public class CodeTemplateContextType extends FileTemplateContextType {
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_csource_name)); registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_csource_name));
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CHEADERFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_cheader_name)); registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.CHEADERFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_cheader_name));
FileTemplateContextType asmContextType= new FileTemplateContextType(CodeTemplateContextType.ASMSOURCEFILE_CONTEXTTYPE, TemplateMessages.CodeTemplateContextType_asmsource_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(asmContextType);
registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.METHODBODY_CONTEXTTYPE)); registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.METHODBODY_CONTEXTTYPE));
@ -230,7 +225,6 @@ public class CodeTemplateContextType extends FileTemplateContextType {
} }
} }
private boolean isValidComment(String template) { private boolean isValidComment(String template) {
// IScanner scanner= ToolFactory.createScanner(true, false, false, false); // IScanner scanner= ToolFactory.createScanner(true, false, false, false);
// scanner.setSource(template.toCharArray()); // scanner.setSource(template.toCharArray());
@ -245,5 +239,4 @@ public class CodeTemplateContextType extends FileTemplateContextType {
// return false; // return false;
return true; return true;
} }
} }