From 0d20c954e0bbb485d20b302702b8ed5fd7b47eb0 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Apr 2011 19:27:19 +0000 Subject: [PATCH] Renamed GetterAndSetterContext to GetterSetterContext. --- .../gettersandsetters/GenerateGettersAndSettersTest.java | 4 ++-- .../GenerateGettersAndSettersInputPage.java | 6 +++--- .../GenerateGettersAndSettersRefactoring.java | 6 +++--- ...GetterAndSetterContext.java => GetterSetterContext.java} | 2 +- .../eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java | 4 +++- 5 files changed, 12 insertions(+), 10 deletions(-) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/{GetterAndSetterContext.java => GetterSetterContext.java} (98%) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java index ace833623a3..7c9b90d2eb2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/gettersandsetters/GenerateGettersAndSettersTest.java @@ -30,7 +30,7 @@ import org.eclipse.cdt.ui.tests.refactoring.RefactoringTest; import org.eclipse.cdt.ui.tests.refactoring.TestSourceFile; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GenerateGettersAndSettersRefactoring; -import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterAndSetterContext; +import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterContext; /** * @author Thomas Corbat @@ -86,7 +86,7 @@ public class GenerateGettersAndSettersTest extends RefactoringTest { } private void selectFields() { - GetterAndSetterContext context = refactoring.getContext(); + GetterSetterContext context = refactoring.getContext(); for (IASTSimpleDeclaration currentDecl : context.existingFields) { String name = currentDecl.getDeclarators()[0].getName().getRawSignature(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java index 48624481448..52766bd1a4a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersInputPage.java @@ -27,15 +27,15 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; -import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterAndSetterContext.FieldWrapper; +import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterContext.FieldWrapper; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterInsertEditProvider.AccessorKind; public class GenerateGettersAndSettersInputPage extends UserInputWizardPage { - private GetterAndSetterContext context; + private GetterSetterContext context; private ContainerCheckedTreeViewer variableSelectionView; private GetterSetterLabelProvider labelProvider; - public GenerateGettersAndSettersInputPage(GetterAndSetterContext context) { + public GenerateGettersAndSettersInputPage(GetterSetterContext context) { super(Messages.GettersAndSetters_Name); this.context = context; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java index f4dac3c3ebf..674491ba813 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java @@ -89,13 +89,13 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring2 { } private static final String MEMBER_DECLARATION = "MEMBER_DECLARATION"; //$NON-NLS-1$ - private final GetterAndSetterContext context; + private final GetterSetterContext context; private InsertLocation definitionInsertLocation; public GenerateGettersAndSettersRefactoring(ICElement element, ISelection selection, ICProject project, RefactoringASTCache astCache) { super(element, selection, project, astCache); - context = new GetterAndSetterContext(); + context = new GetterSetterContext(); } @Override @@ -261,7 +261,7 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring2 { rewrite = rewrite.insertBefore(parent, nodeToInsertBefore, cont, null); } - public GetterAndSetterContext getContext() { + public GetterSetterContext getContext() { return context; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterAndSetterContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java similarity index 98% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterAndSetterContext.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java index 7888123c7f3..8d70806bdf2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterAndSetterContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterContext.java @@ -26,7 +26,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.internal.ui.refactoring.gettersandsetters.GetterSetterInsertEditProvider.AccessorKind; -public class GetterAndSetterContext implements ITreeContentProvider { +public class GetterSetterContext implements ITreeContentProvider { public ArrayList existingFields = new ArrayList(); public ArrayList existingFunctionDefinitions = new ArrayList(); public ArrayList existingFunctionDeclarations = new ArrayList(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java index 364c948afca..9dc1e15ff17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java @@ -116,9 +116,10 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { protected static final int METHOD_STUBS_ID = 16; protected static final int HEADER_FILE_ID = 32; protected static final int SOURCE_FILE_ID = 64; +// protected static final int TEST_FILE_ID = 128; XXX protected static final int ALL_FIELDS = SOURCE_FOLDER_ID | NAMESPACE_ID | CLASS_NAME_ID | BASE_CLASSES_ID | METHOD_STUBS_ID - | HEADER_FILE_ID | SOURCE_FILE_ID; + | HEADER_FILE_ID | SOURCE_FILE_ID/* | TEST_FILE_ID*/; protected int fLastFocusedField = 0; protected StringButtonDialogField fSourceFolderDialogField; @@ -130,6 +131,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { protected SelectionButtonDialogField fUseDefaultSelection; protected StringButtonDialogField fHeaderFileDialogField; protected StringButtonDialogField fSourceFileDialogField; +// protected StringButtonDialogField fTestFileDialogField; XXX protected IStatus fSourceFolderStatus; protected IStatus fNamespaceStatus;