mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Bug 319111 - Generate getters and setters fails on complex field types

Browse source
This commit is contained in:
Alena Laskavaia 2010-08-11 02:37:42 +00:00
parent 78fdb615a6
commit 1735b0d4ed
3 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTPointerOperator; import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
@ -128,12 +129,17 @@ public class FunctionFactory {
CPPASTLiteralExpression litExpr = new CPPASTLiteralExpression(); CPPASTLiteralExpression litExpr = new CPPASTLiteralExpression();
litExpr.setValue(Keywords.cTHIS); litExpr.setValue(Keywords.cTHIS);
fieldRef.setFieldOwner(litExpr); fieldRef.setFieldOwner(litExpr);
fieldRef.setFieldName(fieldDeclaration.getDeclarators()[0].getName().copy()); IASTDeclarator innerDeclarator = fieldDeclaration.getDeclarators()[0];
while (innerDeclarator.getNestedDeclarator() != null) {
innerDeclarator = innerDeclarator.getNestedDeclarator();
}
IASTName fieldName = innerDeclarator.getName();
fieldRef.setFieldName(fieldName.copy());
fieldRef.setIsPointerDereference(true); fieldRef.setIsPointerDereference(true);
binExpr.setOperand1(fieldRef); binExpr.setOperand1(fieldRef);
binExpr.setOperator(IASTBinaryExpression.op_assign); binExpr.setOperator(IASTBinaryExpression.op_assign);
CPPASTIdExpression idExpr = new CPPASTIdExpression(); CPPASTIdExpression idExpr = new CPPASTIdExpression();
idExpr.setName(fieldDeclaration.getDeclarators()[0].getName().copy()); idExpr.setName(fieldName.copy());
binExpr.setOperand2(idExpr); binExpr.setOperand2(idExpr);
exprStmt.setExpression(binExpr); exprStmt.setExpression(binExpr);
compound.addStatement(exprStmt); compound.addStatement(exprStmt);

25
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterAndSetterContext.java
View file

@ -18,6 +18,7 @@ import java.util.TreeSet;
import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
@ -55,12 +56,12 @@ public class GetterAndSetterContext implements ITreeContentProvider{
} }
public GetterSetterInsertEditProvider createGetterInserter(IASTSimpleDeclaration simpleDeclaration) { public GetterSetterInsertEditProvider createGetterInserter(IASTSimpleDeclaration simpleDeclaration) {
String varName = simpleDeclaration.getDeclarators()[0].getName().toString(); String varName = getFieldDeclarationName(simpleDeclaration).toString();
return new GetterSetterInsertEditProvider(varName, simpleDeclaration, Type.getter); return new GetterSetterInsertEditProvider(varName, simpleDeclaration, Type.getter);
} }
public GetterSetterInsertEditProvider createSetterInserter(IASTSimpleDeclaration simpleDeclaration) { public GetterSetterInsertEditProvider createSetterInserter(IASTSimpleDeclaration simpleDeclaration) {
String varName = simpleDeclaration.getDeclarators()[0].getName().toString(); String varName = getFieldDeclarationName(simpleDeclaration).toString();
return new GetterSetterInsertEditProvider(varName, simpleDeclaration, Type.setter); return new GetterSetterInsertEditProvider(varName, simpleDeclaration, Type.setter);
} }
@ -114,7 +115,7 @@ public class GetterAndSetterContext implements ITreeContentProvider{
private FunctionWrapper getGetterForField(IASTSimpleDeclaration currentField) { private FunctionWrapper getGetterForField(IASTSimpleDeclaration currentField) {
FunctionWrapper wrapper = new FunctionWrapper(); FunctionWrapper wrapper = new FunctionWrapper();
String trimmedName = NameHelper.trimFieldName(currentField.getDeclarators()[0].getName().toString()); String trimmedName = NameHelper.trimFieldName(getFieldDeclarationName(currentField).toString());
String getterName = "get" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$ String getterName = "get" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$
setFunctionToWrapper(wrapper, getterName); setFunctionToWrapper(wrapper, getterName);
@ -122,9 +123,17 @@ public class GetterAndSetterContext implements ITreeContentProvider{
return wrapper; return wrapper;
} }
private IASTName getFieldDeclarationName(IASTSimpleDeclaration fieldDeclaration) {
IASTDeclarator declarator = fieldDeclaration.getDeclarators()[0];
while (declarator.getNestedDeclarator() != null) {
declarator = declarator.getNestedDeclarator();
}
return declarator.getName();
}
private FunctionWrapper getSetterForField(IASTSimpleDeclaration currentField) { private FunctionWrapper getSetterForField(IASTSimpleDeclaration currentField) {
FunctionWrapper wrapper = new FunctionWrapper(); FunctionWrapper wrapper = new FunctionWrapper();
String trimmedName = NameHelper.trimFieldName(currentField.getDeclarators()[0].getName().toString()); String trimmedName = NameHelper.trimFieldName(getFieldDeclarationName(currentField).toString());
String setterName = "set" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$ String setterName = "set" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$
setFunctionToWrapper(wrapper, setterName); setFunctionToWrapper(wrapper, setterName);
@ -139,7 +148,7 @@ public class GetterAndSetterContext implements ITreeContentProvider{
} }
for(IASTSimpleDeclaration currentDeclaration : existingFunctionDeclarations){ for(IASTSimpleDeclaration currentDeclaration : existingFunctionDeclarations){
if(currentDeclaration.getDeclarators()[0].getName().toString().endsWith(getterName)){ if(getFieldDeclarationName(currentDeclaration).toString().endsWith(getterName)){
wrapper.functionDeclaration = currentDeclaration; wrapper.functionDeclaration = currentDeclaration;
} }
} }
@ -154,7 +163,11 @@ public class GetterAndSetterContext implements ITreeContentProvider{
@Override @Override
public String toString(){ public String toString(){
return field.getDeclarators()[0].getName().toString(); IASTDeclarator declarator = field.getDeclarators()[0];
while (declarator.getNestedDeclarator() != null) {
declarator = declarator.getNestedDeclarator();
}
return declarator.getName().toString();
} }
public ArrayList<GetterSetterInsertEditProvider> getChildNodes() { public ArrayList<GetterSetterInsertEditProvider> getChildNodes() {

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

@ -12,6 +12,7 @@
package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters;
import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
@ -52,7 +53,11 @@ public class GetterSetterInsertEditProvider implements Comparable<GetterSetterIn
@Override @Override
public String toString(){ public String toString(){
return functionDeclaration.getDeclarators()[0].getName().toString(); IASTDeclarator declarator = functionDeclaration.getDeclarators()[0];
while (declarator.getNestedDeclarator() != null) {
declarator = declarator.getNestedDeclarator();
}
return declarator.getName().toString();
} }
public IASTFunctionDefinition getFunctionDefinition(boolean qualifedName) { public IASTFunctionDefinition getFunctionDefinition(boolean qualifedName) {