diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java index 011aa7ccbe4..102a944c669 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java @@ -337,9 +337,9 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild if (parentConfig != null) { name = parentConfig.getName(); - // If this contructor is called to clone an existing + // If this constructor is called to clone an existing // configuration, the parent of the parent should be stored. - // As of 2.1, there is still one single level of inheritence to + // As of 2.1, there is still one single level of inheritance to // worry about parent = parentConfig.getParent() == null ? parentConfig : parentConfig.getParent(); } @@ -485,7 +485,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild // if(!baseCfg.isExtensionConfig) // cloneChildren = true; - // If this contructor is called to clone an existing + // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. parent = baseCfg.isExtensionConfig || baseCfg.getParent() == null ? baseCfg : baseCfg.getParent(); @@ -633,7 +633,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild if(!cloneConfig.isExtensionConfig) cloneChildren = true; - // If this contructor is called to clone an existing + // If this constructor is called to clone an existing // configuration, the parent of the cloning config should be stored. parent = cloneConfig.isExtensionConfig || cloneConfig.getParent() == null ? cloneConfig : cloneConfig.getParent(); parentId = parent.getId(); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java index c0d16049b3c..5de06044fcc 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ClassMembersInitializationChecker.java @@ -98,8 +98,8 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { public int visit(IASTExpression expression) { if (!constructorsStack.empty() && expression instanceof IASTFunctionCallExpression) { - Set actualContructorFields = constructorsStack.peek(); - if (!actualContructorFields.isEmpty()) { + Set actualConstructorFields = constructorsStack.peek(); + if (!actualConstructorFields.isEmpty()) { boolean skipCurrentConstructor = false; IASTFunctionCallExpression fCall = (IASTFunctionCallExpression)expression; IASTExpression fNameExp = fCall.getFunctionNameExpression(); @@ -108,7 +108,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { IBinding fBinding = fName.getName().resolveBinding(); if (fBinding instanceof ICPPMethod) { ICPPMethod method = (ICPPMethod)fBinding; - ICompositeType constructorOwner = actualContructorFields.iterator().next().getCompositeTypeOwner(); + ICompositeType constructorOwner = actualConstructorFields.iterator().next().getCompositeTypeOwner(); if (constructorOwner == method.getClassOwner() && !method.getType().isConst()) { skipCurrentConstructor = true; } @@ -152,12 +152,12 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { public int visit(IASTName name) { if (!constructorsStack.empty()) { - Set actualContructorFields = constructorsStack.peek(); - if (!actualContructorFields.isEmpty()) { + Set actualConstructorFields = constructorsStack.peek(); + if (!actualConstructorFields.isEmpty()) { IBinding binding = name.resolveBinding(); - if (actualContructorFields.contains(binding)) { + if (actualConstructorFields.contains(binding)) { if ((CPPVariableReadWriteFlags.getReadWriteFlags(name) & PDOMName.WRITE_ACCESS) != 0) { - actualContructorFields.remove(binding); + actualConstructorFields.remove(binding); } } } diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java index a0b261b1db6..343a37d16ae 100644 --- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java +++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java @@ -53,7 +53,7 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase { // int m; // C() { m = 0; } // No warnings. // }; - public void testAssignmentsInContructorShouldBeChecked() { + public void testAssignmentsInConstructorShouldBeChecked() { loadCodeAndRun(getAboveComment()); checkNoErrors(); } @@ -171,7 +171,7 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase { // int i1, i2; // }; // C::C() : i1(0) {} // 1 warning for: i2. - public void testExternalContructorHandling() { + public void testExternalConstructorHandling() { loadCodeAndRun(getAboveComment()); checkErrorLines(5); } @@ -184,7 +184,7 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase { // T2 t2; // }; // C::C() : i1(0), t1(T1()) {} // 1 warning for: i2. - public void testExternalContructorOfTemplateClassHandling() { + public void testExternalConstructorOfTemplateClassHandling() { loadCodeAndRun(getAboveComment()); checkErrorLines(8); } @@ -196,7 +196,7 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase { // }; // template // C::C() : i1(0) {} // 1 warning for: i2. - public void testExternalTemplateContructorHandling() { + public void testExternalTemplateConstructorHandling() { loadCodeAndRun(getAboveComment()); checkErrorLines(7); } @@ -212,7 +212,7 @@ public class ClassMembersInitializationCheckerTest extends CheckerTestCase { // template // template // C::C() : i1(0), t1(T1()) {} // 1 warning for: i2. - public void testExternalTemplateContructorOfTemplateClassHandling() { + public void testExternalTemplateConstructorOfTemplateClassHandling() { loadCodeAndRun(getAboveComment()); checkErrorLines(11); } diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java index 9a09a8c7d8a..95519bf9fb6 100644 --- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java +++ b/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java @@ -122,7 +122,7 @@ public class ReturnCheckerTest extends CheckerTestCase { // return; // } // }; - public void testContructorRetValue() { + public void testConstructorRetValue() { loadCodeAndRunCpp(getAboveComment()); checkErrorLine(3, ReturnChecker.RET_ERR_VALUE_ID); } @@ -136,7 +136,7 @@ public class ReturnCheckerTest extends CheckerTestCase { // return; // } // }; - public void testContructor_Bug323602() { + public void testConstructor_Bug323602() { IProblemPreference macro = getPreference(ReturnChecker.RET_NO_VALUE_ID, ReturnChecker.PARAM_IMPLICIT); macro.setValue(Boolean.TRUE); loadCodeAndRunCpp(getAboveComment()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java index 573ff899f32..b7987e54557 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java @@ -192,8 +192,8 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange // editor.setAction("AddDelegateMethods", fAddDelegateMethods); //$NON-NLS-1$ // // fAddUnimplementedConstructors= new AddUnimplementedConstructorsAction(editor); -// fAddUnimplementedConstructors.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_UNIMPLEMENTED_CONTRUCTORS); -// editor.setAction("AddUnimplementedConstructors", fAddUnimplementedConstructors); //$NON-NLS-1$ +// fAddUnimplementedConstructors.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_UNIMPLEMENTED_CONSTRUCTORS); +// editor.setAction("AddUnimplementedConstructors", fAddUnimplementedConstructors); //$NON-NLS-1$ // // fGenerateConstructorUsingFields= new GenerateNewConstructorUsingFieldsAction(editor); // fGenerateConstructorUsingFields.setActionDefinitionId(ICEditorActionDefinitionIds.GENERATE_CONSTRUCTOR_USING_FIELDS); @@ -277,8 +277,8 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange // fAddDelegateMethods.setActionDefinitionId(ICEditorActionDefinitionIds.CREATE_DELEGATE_METHODS); // // fAddUnimplementedConstructors= new AddUnimplementedConstructorsAction(site); -// fAddUnimplementedConstructors.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_UNIMPLEMENTED_CONTRUCTORS); -// +// fAddUnimplementedConstructors.setActionDefinitionId(ICEditorActionDefinitionIds.ADD_UNIMPLEMENTED_CONSTRUCTORS); +// // fGenerateConstructorUsingFields= new GenerateNewConstructorUsingFieldsAction(site); // fGenerateConstructorUsingFields.setActionDefinitionId(ICEditorActionDefinitionIds.GENERATE_CONSTRUCTOR_USING_FIELDS); // diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 8edd62c37e5..de9da25118b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -80,7 +80,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { @Deprecated public AbstractErrorParserBlock(Preferences prefs) { this(); -// usingDeprecatedContructor = true; +// usingDeprecatedConstructor = true; fPrefs = prefs; }