mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 13:55:39 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-01-08 01:18:34 +00:00
parent cd19464169
commit c961b374f4
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,6 @@ import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterIns
import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper;
public class GetterAndSetterContext implements ITreeContentProvider{ public class GetterAndSetterContext implements ITreeContentProvider{
public ArrayList<IASTSimpleDeclaration> existingFields = new ArrayList<IASTSimpleDeclaration>(); public ArrayList<IASTSimpleDeclaration> existingFields = new ArrayList<IASTSimpleDeclaration>();
public ArrayList<IASTFunctionDefinition> existingFunctionDefinitions = new ArrayList<IASTFunctionDefinition>(); public ArrayList<IASTFunctionDefinition> existingFunctionDefinitions = new ArrayList<IASTFunctionDefinition>();
public ArrayList<IASTSimpleDeclaration> existingFunctionDeclarations = new ArrayList<IASTSimpleDeclaration>(); public ArrayList<IASTSimpleDeclaration> existingFunctionDeclarations = new ArrayList<IASTSimpleDeclaration>();
@ -37,7 +36,6 @@ public class GetterAndSetterContext implements ITreeContentProvider{
private boolean implementationInHeader = false; private boolean implementationInHeader = false;
public Object[] getChildren(Object parentElement) { public Object[] getChildren(Object parentElement) {
ArrayList<GetterSetterInsertEditProvider> children = new ArrayList<GetterSetterInsertEditProvider>(); ArrayList<GetterSetterInsertEditProvider> children = new ArrayList<GetterSetterInsertEditProvider>();
if (parentElement instanceof FieldWrapper) { if (parentElement instanceof FieldWrapper) {
FieldWrapper wrapper = (FieldWrapper) parentElement; FieldWrapper wrapper = (FieldWrapper) parentElement;
@ -72,14 +70,12 @@ public class GetterAndSetterContext implements ITreeContentProvider{
public boolean hasChildren(Object element) { public boolean hasChildren(Object element) {
if (element instanceof FieldWrapper) { if (element instanceof FieldWrapper) {
FieldWrapper wrapper = (FieldWrapper) element; FieldWrapper wrapper = (FieldWrapper) element;
return wrapper.missingGetterOrSetter(); return wrapper.missingGetterOrSetter();
} }
return false; return false;
} }
public Object[] getElements(Object inputElement) { public Object[] getElements(Object inputElement) {
return getWrappedFields().toArray(); return getWrappedFields().toArray();
} }
@ -119,7 +115,6 @@ public class GetterAndSetterContext implements ITreeContentProvider{
String getterName = "get" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$ String getterName = "get" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$
setFunctionToWrapper(wrapper, getterName); setFunctionToWrapper(wrapper, getterName);
return wrapper; return wrapper;
} }
@ -137,9 +132,9 @@ public class GetterAndSetterContext implements ITreeContentProvider{
String setterName = "set" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$ String setterName = "set" + NameHelper.makeFirstCharUpper(trimmedName); //$NON-NLS-1$
setFunctionToWrapper(wrapper, setterName); setFunctionToWrapper(wrapper, setterName);
return wrapper; return wrapper;
} }
private void setFunctionToWrapper(FunctionWrapper wrapper, String getterName) { private void setFunctionToWrapper(FunctionWrapper wrapper, String getterName) {
for (IASTFunctionDefinition currentDefinition : existingFunctionDefinitions){ for (IASTFunctionDefinition currentDefinition : existingFunctionDefinitions){
if (currentDefinition.getDeclarator().getName().toString().endsWith(getterName)){ if (currentDefinition.getDeclarator().getName().toString().endsWith(getterName)){
@ -184,7 +179,6 @@ public class GetterAndSetterContext implements ITreeContentProvider{
protected IASTFunctionDefinition functionDefinition; protected IASTFunctionDefinition functionDefinition;
public boolean exists() { public boolean exists() {
return functionDeclaration != null || functionDefinition != null; return functionDeclaration != null || functionDefinition != null;
} }
} }