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-04-05 05:10:09 +00:00
parent d44a0b76f7
commit 99cdc84b19
3 changed files with 37 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FunctionFactory.java
View file

@ -41,8 +41,8 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper;
public class FunctionFactory { public class FunctionFactory {
public static IASTFunctionDefinition createGetterDefinition(String varName, IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { public static IASTFunctionDefinition createGetterDefinition(String varName,
IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) {
IASTFunctionDefinition getter = new CPPASTFunctionDefinition(); IASTFunctionDefinition getter = new CPPASTFunctionDefinition();
getter.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy(CopyStyle.withLocations)); getter.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy(CopyStyle.withLocations));
@ -52,9 +52,7 @@ public class FunctionFactory {
getterDeclarator = getterDeclarator.getNestedDeclarator(); getterDeclarator = getterDeclarator.getNestedDeclarator();
} }
getter.setDeclarator((IASTFunctionDeclarator) getterDeclarator); getter.setDeclarator((IASTFunctionDeclarator) getterDeclarator);
getter.setBody(getGetterBody(varName)); getter.setBody(getGetterBody(varName));
return getter; return getter;
} }
@ -72,7 +70,6 @@ public class FunctionFactory {
private static IASTDeclarator getGetterDeclarator(String varName, private static IASTDeclarator getGetterDeclarator(String varName,
IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) {
CPPASTName getterName = new CPPASTName(); CPPASTName getterName = new CPPASTName();
String varPartOfGetterName = NameHelper.makeFirstCharUpper(NameHelper.trimFieldName(varName)); String varPartOfGetterName = NameHelper.makeFirstCharUpper(NameHelper.trimFieldName(varName));
getterName.setName("get".concat(varPartOfGetterName).toCharArray()); //$NON-NLS-1$ getterName.setName("get".concat(varPartOfGetterName).toCharArray()); //$NON-NLS-1$
@ -107,18 +104,15 @@ public class FunctionFactory {
IASTDeclarator parent = (IASTDeclarator) innermost.getParent(); IASTDeclarator parent = (IASTDeclarator) innermost.getParent();
parent.setNestedDeclarator(functionDeclarator); parent.setNestedDeclarator(functionDeclarator);
return topDeclarator; return topDeclarator;
} }
} }
public static IASTFunctionDefinition createSetterDefinition(String varName, IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { public static IASTFunctionDefinition createSetterDefinition(String varName,
IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) {
IASTFunctionDefinition setter = new CPPASTFunctionDefinition(); IASTFunctionDefinition setter = new CPPASTFunctionDefinition();
setter.setDeclSpecifier(getVoidDeclSpec()); setter.setDeclSpecifier(getVoidDeclSpec());
setter.setDeclarator(getSetterDeclarator(varName, fieldDeclaration, name)); setter.setDeclarator(getSetterDeclarator(varName, fieldDeclaration, name));
setter.setBody(getSetterBody(fieldDeclaration)); setter.setBody(getSetterBody(fieldDeclaration));
return setter; return setter;
} }
@ -160,8 +154,7 @@ public class FunctionFactory {
declarator.setName(setterName); declarator.setName(setterName);
} }
CPPASTParameterDeclaration parameterDeclaration = new CPPASTParameterDeclaration(); CPPASTParameterDeclaration parameterDeclaration = new CPPASTParameterDeclaration();
parameterDeclaration parameterDeclaration.setDeclarator(fieldDeclaration.getDeclarators()[0].copy(CopyStyle.withLocations));
.setDeclarator(fieldDeclaration.getDeclarators()[0].copy(CopyStyle.withLocations));
parameterDeclaration.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy( parameterDeclaration.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy(
CopyStyle.withLocations)); CopyStyle.withLocations));
declarator.addParameterDeclaration(parameterDeclaration.copy(CopyStyle.withLocations)); declarator.addParameterDeclaration(parameterDeclaration.copy(CopyStyle.withLocations));
@ -190,5 +183,4 @@ public class FunctionFactory {
setter.addDeclarator(getSetterDeclarator(name, fieldDeclaration, null)); setter.addDeclarator(getSetterDeclarator(name, fieldDeclaration, null));
return setter; return setter;
} }
} }

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java
View file

@ -35,7 +35,6 @@ public class GetterSetterInsertEditProvider implements Comparable<GetterSetterIn
public GetterSetterInsertEditProvider(String name, IASTSimpleDeclaration fieldDeclaration, Type type) { public GetterSetterInsertEditProvider(String name, IASTSimpleDeclaration fieldDeclaration, Type type) {
switch (type) { switch (type) {
case getter: case getter:
this.functionDeclaration = FunctionFactory.createGetterDeclaration(name, fieldDeclaration); this.functionDeclaration = FunctionFactory.createGetterDeclaration(name, fieldDeclaration);
break; break;
case setter: case setter:

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NamespaceHelper.java
View file

@ -34,10 +34,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTypeId;
/** /**
* Helper class to find Namespace informations. * Helper class to find Namespace informations.
* @author Mirko Stocker * @author Mirko Stocker
*
*/ */
public class NamespaceHelper { public class NamespaceHelper {
/** /**
* Returns the qualified name of all namespaces that are defined at the specified file and offset. * Returns the qualified name of all namespaces that are defined at the specified file and offset.
* *
@ -46,12 +44,11 @@ public class NamespaceHelper {
* @return ICPPASTQualifiedName with the names of all namespaces * @return ICPPASTQualifiedName with the names of all namespaces
* @throws CoreException * @throws CoreException
*/ */
public static ICPPASTQualifiedName getSurroundingNamespace(final IFile insertFile, final int offset) throws CoreException { public static ICPPASTQualifiedName getSurroundingNamespace(final IFile insertFile, final int offset)
throws CoreException {
final CPPASTQualifiedName qualifiedName = new CPPASTQualifiedName(); final CPPASTQualifiedName qualifiedName = new CPPASTQualifiedName();
TranslationUnitHelper.loadTranslationUnit(insertFile, false).accept(new CPPASTAllVisitor() { TranslationUnitHelper.loadTranslationUnit(insertFile, false).accept(new CPPASTAllVisitor() {
@Override @Override
public int visit(IASTDeclSpecifier declSpec) { public int visit(IASTDeclSpecifier declSpec) {
if (declSpec instanceof ICPPASTCompositeTypeSpecifier && checkFileNameAndLocation(insertFile, offset, declSpec)) { if (declSpec instanceof ICPPASTCompositeTypeSpecifier && checkFileNameAndLocation(insertFile, offset, declSpec)) {