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

Variable name adjustments.

Browse source
This commit is contained in:
Sergey Prigogin 2011-12-27 15:00:04 -08:00
parent 336c95dacc
commit cc7de08d92
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java
View file

@ -51,20 +51,19 @@ public class GenerateGettersAndSettersInputPage extends UserInputWizardPage impl
@Override @Override
public void createControl(Composite parent) { public void createControl(Composite parent) {
Composite comp = new Composite(parent, SWT.NONE);
setTitle(Messages.GettersAndSetters_Name); setTitle(Messages.GettersAndSetters_Name);
setMessage(Messages.GenerateGettersAndSettersInputPage_header); setMessage(Messages.GenerateGettersAndSettersInputPage_header);
Composite comp = new Composite(parent, SWT.NONE);
comp.setLayout(new GridLayout(2, false)); comp.setLayout(new GridLayout(2, false));
createTree(comp); createTree(comp);
GridData gd = new GridData(GridData.FILL_BOTH); GridData gd = new GridData(GridData.FILL_BOTH);
variableSelectionView.getTree().setLayoutData(gd); variableSelectionView.getTree().setLayoutData(gd);
Composite btComp = createButtonComposite(comp); Composite buttonContainer = createButtonComposite(comp);
gd = new GridData(); gd = new GridData();
gd.verticalAlignment = SWT.TOP; gd.verticalAlignment = SWT.TOP;
btComp.setLayoutData(gd); buttonContainer.setLayoutData(gd);
final Button definitionSeparate = new Button(comp, SWT.CHECK); final Button definitionSeparate = new Button(comp, SWT.CHECK);
definitionSeparate.setText(Messages.GenerateGettersAndSettersInputPage_SeparateDefinition); definitionSeparate.setText(Messages.GenerateGettersAndSettersInputPage_SeparateDefinition);
@ -134,7 +133,7 @@ public class GenerateGettersAndSettersInputPage extends UserInputWizardPage impl
selectGetter.addSelectionListener(new SelectionAdapter(){ selectGetter.addSelectionListener(new SelectionAdapter(){
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
selectMethods(AccessorKind.GETTER); selectAccessors(AccessorKind.GETTER);
} }
}); });
@ -143,23 +142,23 @@ public class GenerateGettersAndSettersInputPage extends UserInputWizardPage impl
selectSetter.addSelectionListener(new SelectionAdapter(){ selectSetter.addSelectionListener(new SelectionAdapter(){
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {
selectMethods(AccessorKind.SETTER); selectAccessors(AccessorKind.SETTER);
} }
}); });
return btComp; return btComp;
} }
private void selectMethods(AccessorKind type) { private void selectAccessors(AccessorKind type) {
for (Object treeItem : context.getElements(null)) { for (Object treeItem : context.getElements(null)) {
if (treeItem instanceof FieldWrapper) { if (treeItem instanceof FieldWrapper) {
FieldWrapper field = (FieldWrapper) treeItem; FieldWrapper field = (FieldWrapper) treeItem;
Object[] accessors = context.getChildren(field); Object[] children = context.getChildren(field);
for (Object accessor : accessors) { for (Object child : children) {
if (accessor instanceof GetterSetterInsertEditProvider) { if (child instanceof GetterSetterInsertEditProvider) {
GetterSetterInsertEditProvider getSet = (GetterSetterInsertEditProvider) accessor; GetterSetterInsertEditProvider accessor = (GetterSetterInsertEditProvider) child;
if (getSet.getType() == type) { if (accessor.getType() == type) {
variableSelectionView.setChecked(getSet, true); variableSelectionView.setChecked(accessor, true);
} }
} }
} }
@ -199,9 +198,9 @@ public class GenerateGettersAndSettersInputPage extends UserInputWizardPage impl
private void updateSelectedFunctions() { private void updateSelectedFunctions() {
context.selectedFunctions.clear(); context.selectedFunctions.clear();
for (Object currentElement : variableSelectionView.getCheckedElements()) { for (Object element : variableSelectionView.getCheckedElements()) {
if (currentElement instanceof GetterSetterInsertEditProvider) { if (element instanceof GetterSetterInsertEditProvider) {
context.selectedFunctions.add((GetterSetterInsertEditProvider) currentElement); context.selectedFunctions.add((GetterSetterInsertEditProvider) element);
} }
} }
setPageComplete(!context.selectedFunctions.isEmpty()); setPageComplete(!context.selectedFunctions.isEmpty());