diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyCommands.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyCommands.java index 077e712fe6e..937c761e96a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyCommands.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/IManagedDependencyCommands.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Intel Corporation and others. + * Copyright (c) 2006, 2012 Intel Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -53,7 +53,7 @@ import org.eclipse.core.runtime.IPath; * dependency files are not required for the current build, but for * the next build. C/C++ builds can be treated in this manner as is * described in the following link: - * http://sourceware.org/automake/automake.html#Dependency-Tracking-Evolution + * http://www.gnu.org/software/automake/manual/html_node/Dependency-Tracking-Evolution.html#Dependency-Tracking-Evolution * * Use the IManagedDependencyCommands interface defined in this file * for this mode. diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java index 1c383142703..7e50126e768 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/CheckersUiActivator.java @@ -37,6 +37,7 @@ public class CheckersUiActivator extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext * ) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -49,6 +50,7 @@ public class CheckersUiActivator extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext * ) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java index f00a37497c0..97878a20028 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java @@ -39,6 +39,7 @@ public class CaseBreakQuickFixBreak extends AbstractAstRewriteQuickFix { return true; } + @Override public String getLabel() { return Messages.CaseBreakQuickFixBreak_Label; } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java index 27b95adaf87..7a15d6430d9 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java @@ -12,6 +12,7 @@ import org.eclipse.text.edits.InsertEdit; import org.eclipse.text.edits.MalformedTreeException; public class CaseBreakQuickFixComment extends AbstractCodanCMarkerResolution { + @Override public String getLabel() { return Messages.CaseBreakQuickFixComment_Label; } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java index 26bb1321a57..f8337c4b683 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java @@ -20,10 +20,12 @@ import org.eclipse.jface.text.IDocument; * quick fix for catch by value */ public class CatchByConstReferenceQuickFix extends AbstractCodanCMarkerResolution { + @Override public String getLabel() { return Messages.CatchByConstReferenceQuickFix_Message; } + @Override public void apply(IMarker marker, IDocument document) { CatchByReferenceQuickFix.applyCatchByReferenceQuickFix(marker, document, true); } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java index cff7d0ceea8..9136c2ff6ce 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFix.java @@ -21,10 +21,12 @@ import org.eclipse.jface.text.IDocument; * quick fix for catch by value */ public class CatchByReferenceQuickFix extends AbstractCodanCMarkerResolution { + @Override public String getLabel() { return Messages.CatchByReferenceQuickFix_Message; } + @Override public void apply(IMarker marker, IDocument document) { applyCatchByReferenceQuickFix(marker, document, false); } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java index f076ec40fed..c4d0f14efc0 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixAssignmentInCondition.java @@ -22,6 +22,7 @@ import org.eclipse.jface.text.IDocument; * quick fix for assignment in condition */ public class QuickFixAssignmentInCondition extends AbstractCodanCMarkerResolution { + @Override public String getLabel() { return Messages.QuickFixAssignmentInCondition_Message; } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java index 010ab79ef55..b460058bb37 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java @@ -33,6 +33,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.ltk.core.refactoring.Change; public class QuickFixCreateField extends AbstractAstRewriteQuickFix { + @Override public String getLabel() { return Messages.QuickFixCreateField_0; } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java index f3ba9404fb2..ff330b1c7bb 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.ltk.core.refactoring.Change; public class QuickFixCreateLocalVariable extends AbstractAstRewriteQuickFix { + @Override public String getLabel() { return Messages.QuickFixCreateLocalVariable_0; } @@ -38,6 +39,7 @@ public class QuickFixCreateLocalVariable extends AbstractAstRewriteQuickFix { * @param astName * @param r */ + @Override public void modifyAST(IIndex index, IMarker marker) { CxxAstUtils utils = CxxAstUtils.getInstance(); IASTTranslationUnit ast; diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java index 3d66376c137..afc17a25008 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java @@ -38,6 +38,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.ltk.core.refactoring.CompositeChange; public class QuickFixCreateParameter extends AbstractAstRewriteQuickFix { + @Override public String getLabel() { return Messages.QuickFixCreateParameter_0; } diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java index 73cad3d1913..e1df6213827 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java +++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFix.java @@ -18,6 +18,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; public class SuggestedParenthesisQuickFix extends AbstractCodanCMarkerResolution { + @Override public String getLabel() { return Messages.SuggestedParenthesisQuickFix_Message; } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java index c2e21c38129..35119705841 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/CodanCheckersActivator.java @@ -37,6 +37,7 @@ public class CodanCheckersActivator extends Plugin { * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext * ) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -49,6 +50,7 @@ public class CodanCheckersActivator extends Plugin { * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext * ) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); @@ -71,7 +73,7 @@ public class CodanCheckersActivator extends Plugin { } public static void log(String message) { - getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, message)); + getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message)); } /** @@ -79,6 +81,6 @@ public class CodanCheckersActivator extends Plugin { * @return */ public static IStatus getStatus(Throwable e) { - return new Status(Status.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e); + return new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e); } } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AbstractClassInstantiationChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AbstractClassInstantiationChecker.java index 8b5e66ceb3d..927f37209a9 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AbstractClassInstantiationChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AbstractClassInstantiationChecker.java @@ -61,6 +61,7 @@ public class AbstractClassInstantiationChecker extends AbstractIndexAstChecker { CheckerLaunchMode.RUN_ON_DEMAND); } + @Override public void processAst(IASTTranslationUnit ast) { try { ast.accept(new OnEachClass()); @@ -77,6 +78,7 @@ public class AbstractClassInstantiationChecker extends AbstractIndexAstChecker { shouldVisitParameterDeclarations = true; } + @Override public int visit(IASTDeclaration declaration) { // Looking for the variables declarations. if (declaration instanceof IASTSimpleDeclaration) { @@ -96,6 +98,7 @@ public class AbstractClassInstantiationChecker extends AbstractIndexAstChecker { return PROCESS_CONTINUE; } + @Override public int visit(IASTParameterDeclaration parameterDecl) { // Looking for parameters declaration. Skip references & pointers. if (!hasPointerOrReference(parameterDecl.getDeclarator())) { @@ -122,6 +125,7 @@ public class AbstractClassInstantiationChecker extends AbstractIndexAstChecker { } } + @Override public int visit(IASTExpression expression) { if (expression instanceof ICPPASTNewExpression) { // New expression. diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentInConditionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentInConditionChecker.java index 1693229363e..3918a7d79b5 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentInConditionChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentInConditionChecker.java @@ -26,6 +26,7 @@ import org.eclipse.cdt.core.dom.ast.IASTWhileStatement; public class AssignmentInConditionChecker extends AbstractIndexAstChecker { private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { // traverse the ast using the visitor pattern. ast.accept(new CheckCodeVisitor()); @@ -36,6 +37,7 @@ public class AssignmentInConditionChecker extends AbstractIndexAstChecker { shouldVisitExpressions = true; } + @Override public int visit(IASTExpression expression) { if (isAssignmentExpression(expression) && isUsedAsCondition(expression)) { reportProblem(ER_ID, expression, expression.getRawSignature()); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentToItselfChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentToItselfChecker.java index 6b4d6f4d7ef..7be5b8857d1 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentToItselfChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/AssignmentToItselfChecker.java @@ -24,6 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; public class AssignmentToItselfChecker extends AbstractIndexAstChecker { private static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { // traverse the ast using the visitor pattern. ast.accept(new ASTVisitor() { @@ -32,6 +33,7 @@ public class AssignmentToItselfChecker extends AbstractIndexAstChecker { } // visit expressions + @Override public int visit(IASTExpression expression) { if (isAssignmentToItself(expression)) { reportProblem(ER_ID, expression, expression.getRawSignature()); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CaseBreakChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CaseBreakChecker.java index 20da627cbc6..13f4f3c21ef 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CaseBreakChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CaseBreakChecker.java @@ -217,6 +217,7 @@ public class CaseBreakChecker extends AbstractIndexAstChecker implements IChecke return getCommentMap().getLastFreestandingCommentForNode(statement); } + @Override public void initPreferences(IProblemWorkingCopy problem) { super.initPreferences(problem); addPreference(problem, PARAM_NO_BREAK_COMMENT, CheckersMessages.CaseBreakChecker_DefaultNoBreakCommentDescription, @@ -225,6 +226,7 @@ public class CaseBreakChecker extends AbstractIndexAstChecker implements IChecke addPreference(problem, PARAM_EMPTY_CASE, CheckersMessages.CaseBreakChecker_EmptyCaseDescription, Boolean.FALSE); } + @Override public void processAst(IASTTranslationUnit ast) { _checkLastCase = (Boolean) getPreference(getProblemById(ER_ID, getFile()), PARAM_LAST_CASE); _checkEmptyCase = (Boolean) getPreference(getProblemById(ER_ID, getFile()), PARAM_EMPTY_CASE); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CatchByReference.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CatchByReference.java index 3373f76a2cb..6d493a11e80 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CatchByReference.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/CatchByReference.java @@ -45,6 +45,7 @@ public class CatchByReference extends AbstractIndexAstChecker { public static final String PARAM_EXCEPT_ARG_LIST = "exceptions"; //$NON-NLS-1$ public static final String PARAM_UNKNOWN_TYPE = "unknown"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { // traverse the ast using the visitor pattern. ast.accept(new OnCatch()); @@ -55,6 +56,7 @@ public class CatchByReference extends AbstractIndexAstChecker { shouldVisitStatements = true; } + @Override public int visit(IASTStatement stmt) { if (stmt instanceof ICPPASTTryBlockStatement) { try { 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 5de06044fcc..ccd265c378e 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 @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.codan.internal.checkers; -import java.util.Stack; import java.util.HashSet; import java.util.Set; +import java.util.Stack; import org.eclipse.cdt.codan.core.cxx.model.AbstractIndexAstChecker; import org.eclipse.cdt.codan.core.model.IProblemWorkingCopy; @@ -26,6 +26,7 @@ import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.ICompositeType; @@ -36,7 +37,6 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUnaryExpression; -import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction; import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod; @@ -57,6 +57,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { public static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization"; //$NON-NLS-1$ public static final String PARAM_SKIP = "skip"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { ast.accept(new OnEachClass()); } @@ -64,7 +65,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { class OnEachClass extends ASTVisitor { // NOTE: Classes can be nested and even can be declared in constructors of the other classes - private Stack< Set > constructorsStack = new Stack< Set >(); + private final Stack< Set > constructorsStack = new Stack< Set >(); OnEachClass() { shouldVisitDeclarations = true; @@ -72,6 +73,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { shouldVisitExpressions = skipConstructorsWithFCalls(); } + @Override public int visit(IASTDeclaration declaration) { ICPPConstructor constructor = getConstructor(declaration); if (constructor != null) { @@ -87,6 +89,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { return PROCESS_CONTINUE; } + @Override public int leave(IASTDeclaration declaration) { if (getConstructor(declaration) != null) { for (IField field : constructorsStack.pop()) { @@ -96,6 +99,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { return PROCESS_CONTINUE; } + @Override public int visit(IASTExpression expression) { if (!constructorsStack.empty() && expression instanceof IASTFunctionCallExpression) { Set actualConstructorFields = constructorsStack.peek(); @@ -141,15 +145,16 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { } else if (expr instanceof ICPPASTUnaryExpression) { ICPPASTUnaryExpression unExpr = (ICPPASTUnaryExpression)expr; switch (unExpr.getOperator()) { - case ICPPASTUnaryExpression.op_amper: - case ICPPASTUnaryExpression.op_star: - case ICPPASTUnaryExpression.op_bracketedPrimary: + case IASTUnaryExpression.op_amper: + case IASTUnaryExpression.op_star: + case IASTUnaryExpression.op_bracketedPrimary: return referencesThis(unExpr.getOperand()); } } return false; } + @Override public int visit(IASTName name) { if (!constructorsStack.empty()) { Set actualConstructorFields = constructorsStack.peek(); @@ -198,7 +203,7 @@ public class ClassMembersInitializationChecker extends AbstractIndexAstChecker { IBinding binding = functionDefinition.getDeclarator().getName().resolveBinding(); if (binding instanceof ICPPConstructor) { ICPPConstructor constructor = (ICPPConstructor) binding; - if (constructor.getClassOwner().getKey()!=ICPPClassType.k_union) { + if (constructor.getClassOwner().getKey()!=ICompositeType.k_union) { return constructor; } } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java index f155d4f6fe5..466e688d925 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NamingConventionFunctionChecker.java @@ -37,6 +37,7 @@ public class NamingConventionFunctionChecker extends AbstractIndexAstChecker imp public static final String PARAM_METHODS = "macro"; //$NON-NLS-1$ public static final String PARAM_EXCEPT_ARG_LIST = "exceptions"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { final List pts = getProblemsByMainId(ER_ID, getFile()); try { @@ -45,6 +46,7 @@ public class NamingConventionFunctionChecker extends AbstractIndexAstChecker imp shouldVisitDeclarations = true; } + @Override public int visit(IASTDeclaration element) { if (element instanceof IASTFunctionDefinition) { IASTName astName = ((IASTFunctionDefinition) element).getDeclarator().getName(); @@ -109,6 +111,7 @@ public class NamingConventionFunctionChecker extends AbstractIndexAstChecker imp * org.eclipse.cdt.codan.core.model.ICheckerWithPreferences#initParameters * (org.eclipse.cdt.codan.core.model.IProblemWorkingCopy) */ + @Override public void initPreferences(IProblemWorkingCopy problem) { super.initPreferences(problem); addPreference(problem, PARAM_KEY, CheckersMessages.NamingConventionFunctionChecker_LabelNamePattern, "^[a-z]"); //$NON-NLS-1$ diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java index 24fb21b8a42..b1d1afc0c69 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/NonVirtualDestructor.java @@ -34,6 +34,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding; public class NonVirtualDestructor extends AbstractIndexAstChecker { public static final String PROBLEM_ID = "org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { // Traverse the AST using the visitor pattern. ast.accept(new OnEachClass()); @@ -70,6 +71,7 @@ public class NonVirtualDestructor extends AbstractIndexAstChecker { shouldVisitDeclSpecifiers = true; } + @Override public int visit(IASTDeclSpecifier decl) { if (decl instanceof ICPPASTCompositeTypeSpecifier) { ICPPASTCompositeTypeSpecifier spec = (ICPPASTCompositeTypeSpecifier) decl; diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ProblemBindingChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ProblemBindingChecker.java index 87adf7bf554..a5eba7e178c 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ProblemBindingChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ProblemBindingChecker.java @@ -71,6 +71,7 @@ public class ProblemBindingChecker extends AbstractIndexAstChecker { getLaunchModePreference(problem).enableInLaunchModes(CheckerLaunchMode.RUN_AS_YOU_TYPE, CheckerLaunchMode.RUN_ON_DEMAND); } + @Override public void processAst(IASTTranslationUnit ast) { try { ast.accept(new ASTVisitor() { diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java index dd9ef6d59fb..8747dfacb2b 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java @@ -42,7 +42,6 @@ import org.eclipse.cdt.core.dom.ast.IASTWhileStatement; import org.eclipse.cdt.core.dom.ast.IBasicType; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IType; -import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLambdaExpression; @@ -66,7 +65,7 @@ public class ReturnChecker extends AbstractAstFunctionChecker { public static final String RET_NORET_ID = "org.eclipse.cdt.codan.checkers.errnoreturn"; //$NON-NLS-1$ class ReturnStmpVisitor extends ASTVisitor { - private IASTFunctionDefinition func; + private final IASTFunctionDefinition func; boolean hasret; ReturnStmpVisitor(IASTFunctionDefinition func) { @@ -77,12 +76,14 @@ public class ReturnChecker extends AbstractAstFunctionChecker { this.hasret = false; } + @Override public int visit(IASTDeclaration element) { if (element != func) return PROCESS_SKIP; // skip inner functions return PROCESS_CONTINUE; } + @Override public int visit(IASTExpression expr) { if (expr instanceof ICPPASTLambdaExpression) { return PROCESS_SKIP; @@ -90,6 +91,7 @@ public class ReturnChecker extends AbstractAstFunctionChecker { return PROCESS_CONTINUE; } + @Override public int visit(IASTStatement stmt) { if (stmt instanceof IASTReturnStatement) { IASTReturnStatement ret = (IASTReturnStatement) stmt; @@ -246,7 +248,7 @@ public class ReturnChecker extends AbstractAstFunctionChecker { * @return */ protected boolean isExplicitReturn(IASTFunctionDefinition func) { - return getDeclSpecType(func) != ICASTSimpleDeclSpecifier.t_unspecified; + return getDeclSpecType(func) != IASTSimpleDeclSpecifier.t_unspecified; } /** @@ -306,6 +308,7 @@ public class ReturnChecker extends AbstractAstFunctionChecker { } /* checker must implement @link ICheckerWithPreferences */ + @Override public void initPreferences(IProblemWorkingCopy problem) { super.initPreferences(problem); if (problem.getId().equals(RET_NO_VALUE_ID) || problem.getId().equals(RET_NORET_ID)) { diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnStyleChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnStyleChecker.java index 5c72c562c91..51b68763178 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnStyleChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnStyleChecker.java @@ -26,6 +26,7 @@ public class ReturnStyleChecker extends AbstractIndexAstChecker { return true; } + @Override public void processAst(IASTTranslationUnit ast) { ast.accept(new ASTVisitor() { { diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/StatementHasNoEffectChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/StatementHasNoEffectChecker.java index f1d39829241..3b7c1ace670 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/StatementHasNoEffectChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/StatementHasNoEffectChecker.java @@ -43,6 +43,7 @@ public class StatementHasNoEffectChecker extends AbstractIndexAstChecker { public static final String PARAM_MACRO_ID = "macro"; //$NON-NLS-1$ public static final String PARAM_EXCEPT_ARG_LIST = "exceptions"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { ast.accept(new CheckStmpVisitor()); } diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuggestedParenthesisChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuggestedParenthesisChecker.java index 16eb9537a46..cfeb0c179c8 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuggestedParenthesisChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuggestedParenthesisChecker.java @@ -35,6 +35,7 @@ public class SuggestedParenthesisChecker extends AbstractIndexAstChecker { public static final String ER_ID = "org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem"; //$NON-NLS-1$ public static final String PARAM_NOT = "paramNot"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { // traverse the ast using the visitor pattern. ast.accept(new ExpressionVisitor()); @@ -45,6 +46,7 @@ public class SuggestedParenthesisChecker extends AbstractIndexAstChecker { shouldVisitExpressions = true; } + @Override public int visit(IASTExpression expression) { int precedence = getPrecedence(expression); IASTNode parent = expression.getParent(); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuspiciousSemicolonChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuspiciousSemicolonChecker.java index d865df12022..f7efd921e3a 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuspiciousSemicolonChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuspiciousSemicolonChecker.java @@ -28,6 +28,7 @@ public class SuspiciousSemicolonChecker extends AbstractIndexAstChecker { public static final String PARAM_ELSE = "else"; //$NON-NLS-1$ public static final String PARAM_ALFTER_ELSE = "afterelse"; //$NON-NLS-1$ + @Override public void processAst(IASTTranslationUnit ast) { ast.accept(new ASTVisitor() { { @@ -74,6 +75,7 @@ public class SuspiciousSemicolonChecker extends AbstractIndexAstChecker { return macro != null; } + @Override public void initPreferences(IProblemWorkingCopy problem) { super.initPreferences(problem); addPreference(problem, PARAM_ELSE, CheckersMessages.SuspiciousSemicolonChecker_ParamElse, Boolean.FALSE); diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/UnusedSymbolInFileScopeChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/UnusedSymbolInFileScopeChecker.java index 54390de9ece..b22e9f26902 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/UnusedSymbolInFileScopeChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/UnusedSymbolInFileScopeChecker.java @@ -101,6 +101,7 @@ public class UnusedSymbolInFileScopeChecker extends AbstractIndexAstChecker { !staticVariableDeclarations.isEmpty(); } + @Override public void processAst(IASTTranslationUnit ast) { if (ast.isHeaderUnit()) return; diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/fs/ScanfFormatStringSecurityChecker.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/fs/ScanfFormatStringSecurityChecker.java index 1eca5d8c772..b340360b782 100644 --- a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/fs/ScanfFormatStringSecurityChecker.java +++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/fs/ScanfFormatStringSecurityChecker.java @@ -78,6 +78,7 @@ public class ScanfFormatStringSecurityChecker extends AbstractIndexAstChecker { new VulnerableFunction("sscanf", 1) //$NON-NLS-1$ }; + @Override public void processAst(IASTTranslationUnit ast) { ast.accept(new FormatStringVisitor()); } @@ -111,6 +112,7 @@ public class ScanfFormatStringSecurityChecker extends AbstractIndexAstChecker { shouldVisitExpressions = true; } + @Override public int visit(IASTExpression expression) { if (expression instanceof IASTFunctionCallExpression) { IASTFunctionCallExpression callExpression = (IASTFunctionCallExpression) expression; diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/Activator.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/Activator.java index eca8b348aea..5251574a137 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/Activator.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/Activator.java @@ -36,6 +36,7 @@ public class Activator extends Plugin { * @see * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -47,6 +48,7 @@ public class Activator extends Plugin { * @see * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/CodanCommentMap.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/CodanCommentMap.java index 2f841f652f7..b925be2cdb0 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/CodanCommentMap.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/CodanCommentMap.java @@ -36,6 +36,7 @@ public class CodanCommentMap implements ICodanCommentMap { * @see org.eclipse.cdt.codan.core.cxx.model.ICodanCommentMap# * getTrailingCommentsForNode(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public List getTrailingCommentsForNode(IASTNode node) { return commentedNodeMap.getTrailingCommentsForNode(node); } @@ -46,6 +47,7 @@ public class CodanCommentMap implements ICodanCommentMap { * @see org.eclipse.cdt.codan.core.cxx.model.ICodanCommentMap# * getLeadingCommentsForNode(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public List getLeadingCommentsForNode(IASTNode node) { return commentedNodeMap.getLeadingCommentsForNode(node); } @@ -57,6 +59,7 @@ public class CodanCommentMap implements ICodanCommentMap { * org.eclipse.cdt.codan.core.cxx.model.ICodanCommentMap#getFreestandingForNode * (org.eclipse.cdt.core.dom.ast.IASTStatement) */ + @Override public List getFreestandingForNode(IASTNode node) { return commentedNodeMap.getFreestandingCommentsForNode(node); } @@ -65,6 +68,7 @@ public class CodanCommentMap implements ICodanCommentMap { * @param node * @return */ + @Override public IASTComment getLastLeadingCommentForNode(IASTNode node) { IASTComment comment = null; List comms = getLeadingCommentsForNode(node); @@ -78,6 +82,7 @@ public class CodanCommentMap implements ICodanCommentMap { * @param node * @return */ + @Override public IASTComment getFirstTrailingCommentForNode(IASTNode node) { IASTComment comment = null; List comms = getTrailingCommentsForNode(node); @@ -91,6 +96,7 @@ public class CodanCommentMap implements ICodanCommentMap { * @param node * @return */ + @Override public IASTComment getLastFreestandingCommentForNode(IASTNode node) { IASTComment comment = null; List comms = getFreestandingForNode(node); diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxDecisionNode.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxDecisionNode.java index 01b70c65cd7..83899845112 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxDecisionNode.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxDecisionNode.java @@ -35,6 +35,7 @@ public class CxxDecisionNode extends DecisionNode { /** * @return */ + @Override public String toStringData() { if (getNode() == null) return ""; //$NON-NLS-1$ diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java index 0bec8a24c6b..b0078723052 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxExitNode.java @@ -36,6 +36,7 @@ public class CxxExitNode extends ExitNode implements IExitNode { /** * @return */ + @Override public String toStringData() { if (getNode() == null) return "return; // fake"; //$NON-NLS-1$ diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java index f729fdef7cc..d2f094ec4f1 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxNodeFactory.java @@ -27,14 +27,17 @@ public class CxxNodeFactory extends NodeFactory implements INodeFactory { super(); } + @Override public IPlainNode createPlainNode() { return new CxxPlainNode(); } + @Override public IDecisionNode createDecisionNode() { return new CxxDecisionNode(); } + @Override public IExitNode createExitNode() { return new CxxExitNode(); } diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxPlainNode.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxPlainNode.java index 5d36a481a33..4130d8dec1d 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxPlainNode.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/CxxPlainNode.java @@ -35,6 +35,7 @@ public class CxxPlainNode extends PlainNode { /** * @return */ + @Override public String toStringData() { if (getNode() == null) return ""; //$NON-NLS-1$ diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractAstFunctionChecker.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractAstFunctionChecker.java index b3668773dcd..2862718fcff 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractAstFunctionChecker.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractAstFunctionChecker.java @@ -20,6 +20,7 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; * Abstract class for checkers that do all the work on function definition level */ public abstract class AbstractAstFunctionChecker extends AbstractIndexAstChecker implements ICheckerWithPreferences { + @Override public void processAst(IASTTranslationUnit ast) { // traverse the ast using the visitor pattern. ast.accept(new ASTVisitor() { @@ -27,6 +28,7 @@ public abstract class AbstractAstFunctionChecker extends AbstractIndexAstChecker shouldVisitDeclarations = true; } + @Override public int visit(IASTDeclaration element) { if (element instanceof IASTFunctionDefinition) { processFunction((IASTFunctionDefinition) element); diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractCIndexChecker.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractCIndexChecker.java index e9a5570a1bf..f5f2ab3094d 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractCIndexChecker.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractCIndexChecker.java @@ -53,6 +53,7 @@ public abstract class AbstractCIndexChecker extends AbstractCheckerWithProblemPr } } + @Override public synchronized boolean processResource(IResource resource) { if (resource instanceof IFile) { IFile file = (IFile) resource; diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractIndexAstChecker.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractIndexAstChecker.java index fa9a7e059b7..6f306b23af3 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractIndexAstChecker.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/AbstractIndexAstChecker.java @@ -88,6 +88,7 @@ public abstract class AbstractIndexAstChecker extends AbstractCheckerWithProblem * * @see IRunnableInEditorChecker#processModel(Object, ICheckerInvocationContext) */ + @Override public synchronized void processModel(Object model, ICheckerInvocationContext context) { if (model instanceof IASTTranslationUnit) { setContext(context); diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java index 63bf6095617..bda7bb899d8 100644 --- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java +++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CxxModelsCache.java @@ -137,6 +137,7 @@ public class CxxModelsCache implements ICodanDisposable { * @see IDisposable#dispose() * This method should not be called concurrently with any other method. */ + @Override public void dispose() { Assert.isTrue(!disposed, "CxxASTCache.dispose() called more than once."); //$NON-NLS-1$ disposed = true; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractChecker.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractChecker.java index 7382d865e46..13425b8ed41 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractChecker.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractChecker.java @@ -41,6 +41,7 @@ public abstract class AbstractChecker implements IChecker { * @return true if checker is enabled in context of resource, if returns * false checker's "processResource" method won't be called */ + @Override public boolean enabledInContext(IResource res) { return res instanceof IFile; } @@ -120,6 +121,7 @@ public abstract class AbstractChecker implements IChecker { * @return problem reporter for given checker * @since 2.0 */ + @Override public IProblemReporter getProblemReporter() { return problemReporter; } @@ -166,6 +168,7 @@ public abstract class AbstractChecker implements IChecker { * Defines if checker should be run as user type in editor. Override this * method is checker is too heavy for that (runs too long) */ + @Override public boolean runInEditor() { return this instanceof IRunnableInEditorChecker; } @@ -202,6 +205,7 @@ public abstract class AbstractChecker implements IChecker { /** * @since 2.0 */ + @Override public void before(IResource resource) { IProblemReporter problemReporter = CodanRuntime.getInstance().getProblemReporter(); this.problemReporter = problemReporter; @@ -220,6 +224,7 @@ public abstract class AbstractChecker implements IChecker { /** * @since 2.0 */ + @Override public void after(IResource resource) { if (problemReporter instanceof IProblemReporterSessionPersistent) { // Delete general markers @@ -241,6 +246,7 @@ public abstract class AbstractChecker implements IChecker { * @see IChecker#processResource(IResource, ICheckerInvocationContext) * @since 2.0 */ + @Override public synchronized boolean processResource(IResource resource, ICheckerInvocationContext context) throws OperationCanceledException { this.setContext(context); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractCheckerWithProblemPreferences.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractCheckerWithProblemPreferences.java index 9907a22bbc5..aaebd31452d 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractCheckerWithProblemPreferences.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractCheckerWithProblemPreferences.java @@ -35,6 +35,7 @@ public abstract class AbstractCheckerWithProblemPreferences extends AbstractChec /** * Checker that actually has parameter must override this */ + @Override public void initPreferences(IProblemWorkingCopy problem) { getTopLevelPreference(problem); // initialize } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemLocation.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemLocation.java index 0f210795c93..72180daa305 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemLocation.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemLocation.java @@ -63,6 +63,7 @@ public abstract class AbstractProblemLocation implements IProblemLocation { * * @see org.eclipse.cdt.codan.core.model.IProblemLocation#getData() */ + @Override public Object getData() { return extra; } @@ -81,6 +82,7 @@ public abstract class AbstractProblemLocation implements IProblemLocation { * * @see org.eclipse.cdt.codan.core.model.IProblemLocation#getFile() */ + @Override public IResource getFile() { return file; } @@ -96,6 +98,7 @@ public abstract class AbstractProblemLocation implements IProblemLocation { /** * Problem line number referenced in problem view in location field */ + @Override public int getLineNumber() { return getStartingLineNumber(); } @@ -112,6 +115,7 @@ public abstract class AbstractProblemLocation implements IProblemLocation { * * @see org.eclipse.cdt.codan.core.model.IProblemLocation#getStartPos() */ + @Override public int getStartingChar() { return posStart; } @@ -121,6 +125,7 @@ public abstract class AbstractProblemLocation implements IProblemLocation { * * @see org.eclipse.cdt.codan.core.model.IProblemLocation#getEndingChar() */ + @Override public int getEndingChar() { return posEnd; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemReporter.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemReporter.java index 366fa6d1fd1..0b842fa58fd 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemReporter.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/AbstractProblemReporter.java @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IResource; * @since 2.0 */ public abstract class AbstractProblemReporter implements IProblemReporter { + @Override public void reportProblem(String id, IProblemLocation loc, Object... args) { IResource file = loc.getFile(); if (file == null) diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java index a4a0f56dc0b..675f5447ced 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/model/ICheckersRegistry.java @@ -29,6 +29,7 @@ public interface ICheckersRegistry extends Iterable { * * @return iterator for registered checkers */ + @Override public Iterator iterator(); /** diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/AbstractProblemPreference.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/AbstractProblemPreference.java index 19c7c7a5212..5e4092fd251 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/AbstractProblemPreference.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/AbstractProblemPreference.java @@ -31,18 +31,22 @@ public abstract class AbstractProblemPreference implements IProblemPreference { private String uiInfo; private IProblemPreference parent; + @Override public String getLabel() { return label; } + @Override public String getToolTip() { return toolTip; } + @Override public String getKey() { return key; } + @Override public String getUiInfo() { return uiInfo; } @@ -104,10 +108,12 @@ public abstract class AbstractProblemPreference implements IProblemPreference { this.uiInfo = uiinfo; } + @Override public Object getValue() { throw new UnsupportedOperationException(); } + @Override public void setValue(Object value) { throw new UnsupportedOperationException(); } @@ -142,6 +148,7 @@ public abstract class AbstractProblemPreference implements IProblemPreference { return tokenizer; } + @Override public IProblemPreference getParent() { return parent; } @@ -154,6 +161,7 @@ public abstract class AbstractProblemPreference implements IProblemPreference { this.parent = parent; } + @Override public String getQualifiedKey() { if (parent == null) return getKey(); @@ -166,6 +174,7 @@ public abstract class AbstractProblemPreference implements IProblemPreference { */ public abstract void importValue(StreamTokenizer tokenizer) throws IOException; + @Override public void importValue(String str) { StreamTokenizer tokenizer = getImportTokenizer(str); try { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/BasicProblemPreference.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/BasicProblemPreference.java index d38f1912a14..9c6b809b055 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/BasicProblemPreference.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/BasicProblemPreference.java @@ -25,6 +25,7 @@ public class BasicProblemPreference extends AbstractProblemPreference { protected Object value; private PreferenceType type = PreferenceType.TYPE_STRING; + @Override public PreferenceType getType() { return type; } @@ -78,6 +79,7 @@ public class BasicProblemPreference extends AbstractProblemPreference { return value; } + @Override public String exportValue() { Pattern pat = Pattern.compile("^[A-Za-z0-9._-]+$"); //$NON-NLS-1$ String x = String.valueOf(getValue()); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/FileScopeProblemPreference.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/FileScopeProblemPreference.java index 58cf9008501..9101860aa83 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/FileScopeProblemPreference.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/FileScopeProblemPreference.java @@ -57,6 +57,7 @@ public class FileScopeProblemPreference extends AbstractProblemPreference { setLabel(Messages.FileScopeProblemPreference_Label); } + @Override public PreferenceType getType() { return PreferenceType.TYPE_CUSTOM; } @@ -130,6 +131,7 @@ public class FileScopeProblemPreference extends AbstractProblemPreference { return true; return false; } + @Override public String exportValue() { return exportPathList(INCLUSION, inclusion) + "," //$NON-NLS-1$ + exportPathList(EXCLUSION, exclusion); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/ListProblemPreference.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/ListProblemPreference.java index a8ee12c1bbd..0a944fd5a99 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/ListProblemPreference.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/ListProblemPreference.java @@ -42,6 +42,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements setLabel(label); } + @Override public PreferenceType getType() { return PreferenceType.TYPE_LIST; } @@ -69,6 +70,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements * * @return read only preference matching the key */ + @Override public IProblemPreference addChildDescriptor(IProblemPreference desc) { Object value = desc.getValue(); String key = desc.getKey(); @@ -107,6 +109,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements * @throws NumberFormatException * if key is not number */ + @Override public IProblemPreference getChildDescriptor(String key) throws NumberFormatException { if (key == null || key.equals(COMMON_DESCRIPTOR_KEY)) { // return common descriptor @@ -125,6 +128,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements /** * Return array of clones values of child preferences. */ + @Override public IProblemPreference[] getChildDescriptors() { IProblemPreference[] res = new IProblemPreference[list.size()]; for (int i = 0; i < res.length; i++) { @@ -133,6 +137,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements return res; } + @Override public Object getChildValue(String key) { int index = Integer.parseInt(key); return getChildValue(index); @@ -146,6 +151,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements return list.get(index); } + @Override public void setChildValue(String key, Object value) { int i = Integer.valueOf(key).intValue(); setChildValue(i, value); @@ -180,6 +186,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements /** * Removes child value by key */ + @Override public void removeChildValue(String key) { int index = Integer.parseInt(key); list.remove(index); @@ -197,6 +204,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements return list1; } + @Override public String exportValue() { StringBuffer buf = new StringBuffer("("); //$NON-NLS-1$ for (Iterator iterator = list.iterator(); iterator.hasNext();) { @@ -258,6 +266,7 @@ public class ListProblemPreference extends AbstractProblemPreference implements * If info key is '#' resets common descriptor to null, otherwise removes * value */ + @Override public void removeChildDescriptor(IProblemPreference info) { if (info.getKey().equals(COMMON_DESCRIPTOR_KEY)) setChildDescriptor(null); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/MapProblemPreference.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/MapProblemPreference.java index 4a8439e2e76..cead0066b9a 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/MapProblemPreference.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/core/param/MapProblemPreference.java @@ -52,6 +52,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I setLabel(label); } + @Override public PreferenceType getType() { return PreferenceType.TYPE_MAP; } @@ -60,6 +61,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I * Get parameter preference for element by key * */ + @Override public IProblemPreference getChildDescriptor(String key) { return hash.get(key); } @@ -71,6 +73,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I * * @param desc */ + @Override public IProblemPreference addChildDescriptor(IProblemPreference desc) { ((AbstractProblemPreference) desc).setParent(this); hash.put(desc.getKey(), desc); @@ -83,6 +86,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I * and not assume that modifying its elements would modify actual child * values. */ + @Override public IProblemPreference[] getChildDescriptors() { return hash.values().toArray(new IProblemPreference[hash.values().size()]); } @@ -90,6 +94,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I /** * Returns value of the child element by its key */ + @Override public Object getChildValue(String key) { IProblemPreference childInfo = getChildDescriptor(key); return childInfo.getValue(); @@ -98,6 +103,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I /** * Set child value by its key */ + @Override public void setChildValue(String key, Object value) { IProblemPreference pref = getChildDescriptor(key); if (pref == null) @@ -110,6 +116,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I /** * Removes child value and descriptor by key */ + @Override public void removeChildValue(String key) { hash.remove(key); } @@ -125,6 +132,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I return map; } + @Override public String exportValue() { StringBuffer buf = new StringBuffer("{"); //$NON-NLS-1$ for (Iterator iterator = hash.keySet().iterator(); iterator.hasNext();) { @@ -205,6 +213,7 @@ public class MapProblemPreference extends AbstractProblemPreference implements I /** * Removes child descriptor by its key */ + @Override public void removeChildDescriptor(IProblemPreference info) { hash.remove(info.getKey()); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckerInvocationContext.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckerInvocationContext.java index c0d8c6b73ed..93959f37b94 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckerInvocationContext.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckerInvocationContext.java @@ -34,10 +34,12 @@ public class CheckerInvocationContext implements ICheckerInvocationContext { objectStorage = new HashMap, Object>(); } + @Override public IResource getResource() { return resource; } + @Override @SuppressWarnings("unchecked") public synchronized T get(Class objectClass) { T object = (T) objectStorage.get(objectClass); @@ -54,6 +56,7 @@ public class CheckerInvocationContext implements ICheckerInvocationContext { * (non-Javadoc) * @see ICheckerInvocationContext#add(Object) */ + @Override public synchronized void add(T object) { Object old = objectStorage.put(object.getClass(), object); if (old != null && object != old) { @@ -66,6 +69,7 @@ public class CheckerInvocationContext implements ICheckerInvocationContext { * (non-Javadoc) * @see IDisposableCache#dispose() */ + @Override public void dispose() { for (Map.Entry, Object> entry : objectStorage.entrySet()) { Object obj = entry.getValue(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java index 7e3c86400b6..dd71bdfde40 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CheckersRegistry.java @@ -241,6 +241,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * * @see org.eclipse.cdt.codan.core.model.ICheckersRegistry#iterator() */ + @Override public Iterator iterator() { return checkers.iterator(); } @@ -263,6 +264,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * org.eclipse.cdt.codan.core.model.ICheckersRegistry#addChecker(org.eclipse * .cdt.codan.core.model.IChecker) */ + @Override public void addChecker(IChecker checker) { checkers.add(checker); } @@ -274,6 +276,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * org.eclipse.cdt.codan.core.model.ICheckersRegistry#addProblem(org.eclipse * .cdt.codan.core.model.IProblem, java.lang.String) */ + @Override public void addProblem(IProblem p, String category) { IProblemCategory cat = getDefaultProfile().findCategory(category); if (cat == null) @@ -288,6 +291,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * org.eclipse.cdt.codan.core.model.ICheckersRegistry#addCategory(org.eclipse * .cdt.codan.core.model.IProblemCategory, java.lang.String) */ + @Override public void addCategory(IProblemCategory p, String category) { IProblemCategory cat = getDefaultProfile().findCategory(category); if (cat == null) @@ -303,6 +307,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * eclipse.cdt.codan.core.model.IChecker, * org.eclipse.cdt.codan.core.model.IProblem) */ + @Override public void addRefProblem(IChecker c, IProblem p) { Collection plist = problemList.get(c); if (plist == null) { @@ -327,6 +332,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * * @return collection of problems or null */ + @Override public Collection getRefProblems(IChecker checker) { return problemList.get(checker); } @@ -337,6 +343,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * @see * org.eclipse.cdt.codan.core.model.ICheckersRegistry#getDefaultProfile() */ + @Override public IProblemProfile getDefaultProfile() { return profiles.get(DEFAULT); } @@ -347,6 +354,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * @see * org.eclipse.cdt.codan.core.model.ICheckersRegistry#getWorkspaceProfile() */ + @Override public IProblemProfile getWorkspaceProfile() { IProblemProfile wp = profiles.get(ResourcesPlugin.getWorkspace()); if (wp == null) { @@ -365,6 +373,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { return wp; } + @Override public void updateProfile(IResource element, IProblemProfile profile) { // updating profile can invalidate all cached profiles IProblemProfile defaultProfile = getDefaultProfile(); @@ -381,6 +390,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * org.eclipse.cdt.codan.core.model.ICheckersRegistry#getResourceProfile * (org.eclipse.core.resources.IResource) */ + @Override public IProblemProfile getResourceProfile(IResource element) { IProblemProfile prof = profiles.get(element); if (prof == null) { @@ -410,6 +420,7 @@ public class CheckersRegistry implements Iterable, ICheckersRegistry { * @seeorg.eclipse.cdt.codan.core.model.ICheckersRegistry# * getResourceProfileWorkingCopy(org.eclipse.core.resources.IResource) */ + @Override public IProblemProfile getResourceProfileWorkingCopy(IResource element) { IProblemProfile prof = (IProblemProfile) getResourceProfile(element).clone(); return prof; diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanApplication.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanApplication.java index 1adbf6c23b6..0d2f0de74e3 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanApplication.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanApplication.java @@ -37,6 +37,7 @@ public class CodanApplication implements IApplication { private boolean verbose = false; private boolean all = false; + @Override public Object start(IApplicationContext context) throws Exception { String[] args = (String[]) context.getArguments().get("application.args"); //$NON-NLS-1$ if (args == null || args.length == 0) { @@ -107,6 +108,7 @@ public class CodanApplication implements IApplication { System.out.println(Messages.CodanApplication_verbose_option); } + @Override public void stop() { // nothing } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java index fa8725da9c9..4b712a0d80c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java @@ -51,6 +51,7 @@ public class CodanBuilder extends IncrementalProjectBuilder implements ICodanBui this.monitor = monitor; } + @Override public boolean visit(IResourceDelta delta) throws CoreException { IResource resource = delta.getResource(); switch (delta.getKind()) { @@ -93,6 +94,7 @@ public class CodanBuilder extends IncrementalProjectBuilder implements ICodanBui return null; } + @Override public void processResource(IResource resource, IProgressMonitor monitor) { processResource(resource, monitor, null, CheckerLaunchMode.RUN_ON_FULL_BUILD); } @@ -105,6 +107,7 @@ public class CodanBuilder extends IncrementalProjectBuilder implements ICodanBui * @param mode - launch mode, @see {@link CheckerLaunchMode} * @since 2.0 */ + @Override public void processResource(IResource resource, IProgressMonitor monitor, CheckerLaunchMode mode) { processResource(resource, monitor, null, mode); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodeAnlysisNature.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodeAnlysisNature.java index 21f47e00f73..6ef1fcf0e87 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodeAnlysisNature.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodeAnlysisNature.java @@ -26,6 +26,7 @@ public class CodeAnlysisNature implements IProjectNature { public static final String NATURE_ID = "org.eclipse.cdt.codan.core.codanNature"; //$NON-NLS-1$ private IProject project; + @Override public void configure() throws CoreException { IProjectDescription desc = project.getDescription(); ICommand[] commands = desc.getBuildSpec(); @@ -43,6 +44,7 @@ public class CodeAnlysisNature implements IProjectNature { project.setDescription(desc, null); } + @Override public void deconfigure() throws CoreException { IProjectDescription description = getProject().getDescription(); ICommand[] commands = description.getBuildSpec(); @@ -58,10 +60,12 @@ public class CodeAnlysisNature implements IProjectNature { } } + @Override public IProject getProject() { return project; } + @Override public void setProject(IProject project) { this.project = project; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java index 15a191a062e..5b69b529674 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractBasicBlock.java @@ -23,10 +23,12 @@ public abstract class AbstractBasicBlock implements IBasicBlock, ICfgData { public final static IBasicBlock[] EMPTY_LIST = new IBasicBlock[0]; private Object data; + @Override public Object getData() { return data; } + @Override public void setData(Object data) { this.data = data; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java index fbc59304344..571372cc0ec 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleIncomingNode.java @@ -27,14 +27,17 @@ public abstract class AbstractSingleIncomingNode extends AbstractBasicBlock impl super(); } + @Override public IBasicBlock[] getIncomingNodes() { return new IBasicBlock[] { prev }; } + @Override public int getIncomingSize() { return 1; } + @Override public IBasicBlock getIncoming() { return prev; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java index d23e15b754b..a4b5ad09e93 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/AbstractSingleOutgoingNode.java @@ -27,14 +27,17 @@ public abstract class AbstractSingleOutgoingNode extends AbstractBasicBlock impl super(); } + @Override public IBasicBlock[] getOutgoingNodes() { return new IBasicBlock[] { next }; } + @Override public int getOutgoingSize() { return 1; } + @Override public IBasicBlock getOutgoing() { return next; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java index ecd99e101aa..45783023c95 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/BranchNode.java @@ -25,6 +25,7 @@ public class BranchNode extends PlainNode implements IBranchNode { this.label = label; } + @Override public String getLabel() { return label; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java index 18ce3d0848b..55fc5f1ae49 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ConnectorNode.java @@ -37,6 +37,7 @@ public class ConnectorNode extends AbstractSingleOutgoingNode implements IConnec * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock# * getIncomingIterator() */ + @Override public IBasicBlock[] getIncomingNodes() { return incoming.toArray(new IBasicBlock[incoming.size()]); } @@ -46,6 +47,7 @@ public class ConnectorNode extends AbstractSingleOutgoingNode implements IConnec * * @see org.eclipse.cdt.codan.core.model.cfg.IBasicBlock#getIncomingSize () */ + @Override public int getIncomingSize() { return incoming.size(); } @@ -56,6 +58,7 @@ public class ConnectorNode extends AbstractSingleOutgoingNode implements IConnec * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IConnectorNode# * hasBackwardIncoming() */ + @Override public boolean hasBackwardIncoming() { for (IBasicBlock node : incoming) { if (node instanceof IJumpNode) { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java index c7de910f757..eef2262e921 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ControlFlowGraph.java @@ -39,10 +39,12 @@ public class ControlFlowGraph implements IControlFlowGraph { this.start = start; } + @Override public Iterator getExitNodeIterator() { return exitNodes.iterator(); } + @Override public int getExitNodeSize() { return exitNodes.size(); } @@ -63,6 +65,7 @@ public class ControlFlowGraph implements IControlFlowGraph { * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph# * getStartNode() */ + @Override public IStartNode getStartNode() { return start; } @@ -97,6 +100,7 @@ public class ControlFlowGraph implements IControlFlowGraph { * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph# * getUnconnectedNodeIterator() */ + @Override public Iterator getUnconnectedNodeIterator() { return deadNodes.iterator(); } @@ -107,6 +111,7 @@ public class ControlFlowGraph implements IControlFlowGraph { * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IControlFlowGraph# * getUnconnectedNodeSize() */ + @Override public int getUnconnectedNodeSize() { return deadNodes.size(); } @@ -116,6 +121,7 @@ public class ControlFlowGraph implements IControlFlowGraph { * * @see org.eclipse.cdt.codan.core.model.cfg.IControlFlowGraph#getNodes () */ + @Override public Collection getNodes() { Collection result = new LinkedHashSet(); getNodes(getStartNode(), result); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java index 9353d1fb6a5..14b81f8ef4f 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/DecisionNode.java @@ -44,6 +44,7 @@ public class DecisionNode extends AbstractSingleIncomingNode implements IDecisio * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IBasicBlock# * getOutgoingIterator() */ + @Override public IBasicBlock[] getOutgoingNodes() { return next.toArray(new IBasicBlock[next.size()]); } @@ -53,6 +54,7 @@ public class DecisionNode extends AbstractSingleIncomingNode implements IDecisio * * @see org.eclipse.cdt.codan.core.model.cfg.IBasicBlock#getOutgoingSize () */ + @Override public int getOutgoingSize() { return next.size(); } @@ -63,6 +65,7 @@ public class DecisionNode extends AbstractSingleIncomingNode implements IDecisio * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.IDecisionNode# * getConnectionNode() */ + @Override public IConnectorNode getMergeNode() { return conn; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java index 7bd98482538..e318576cd90 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/ExitNode.java @@ -25,14 +25,17 @@ public class ExitNode extends AbstractSingleIncomingNode implements IExitNode { super(); } + @Override public IBasicBlock[] getOutgoingNodes() { return EMPTY_LIST; } + @Override public int getOutgoingSize() { return 0; } + @Override public IStartNode getStartNode() { return start; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java index eb8999bfe1d..38e04e53409 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/JumpNode.java @@ -27,10 +27,12 @@ public class JumpNode extends AbstractSingleIncomingNode implements IJumpNode { super(); } + @Override public IBasicBlock[] getOutgoingNodes() { return new IBasicBlock[] { jump }; } + @Override public int getOutgoingSize() { return 1; } @@ -40,14 +42,17 @@ public class JumpNode extends AbstractSingleIncomingNode implements IJumpNode { * * @see org.eclipse.cdt.codan.core.model.cfg.IJumpNode#getJumpNode() */ + @Override public IConnectorNode getJumpNode() { return jump; } + @Override public IBasicBlock getOutgoing() { return jump; } + @Override public boolean isBackwardArc() { return backward; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java index 0de073432e5..a1266d0470c 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/NodeFactory.java @@ -44,6 +44,7 @@ public class NodeFactory implements INodeFactory { * * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createPlainNode () */ + @Override public IPlainNode createPlainNode() { return new PlainNode(); } @@ -53,6 +54,7 @@ public class NodeFactory implements INodeFactory { * * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createJumpNode () */ + @Override public IJumpNode createJumpNode() { return new JumpNode(); } @@ -63,6 +65,7 @@ public class NodeFactory implements INodeFactory { * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory# * createDecisionNode() */ + @Override public IDecisionNode createDecisionNode() { return new DecisionNode(); } @@ -73,6 +76,7 @@ public class NodeFactory implements INodeFactory { * @seeorg.eclipse.cdt.codan.provisional.core.model.cfg.INodeFactory# * createConnectiorNode() */ + @Override public IConnectorNode createConnectorNode() { return new ConnectorNode(); } @@ -82,6 +86,7 @@ public class NodeFactory implements INodeFactory { * * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createStartNode () */ + @Override public IStartNode createStartNode() { return new StartNode(); } @@ -91,10 +96,12 @@ public class NodeFactory implements INodeFactory { * * @see org.eclipse.cdt.codan.core.model.cfg.INodeFactory#createExitNode () */ + @Override public IExitNode createExitNode() { return new ExitNode(); } + @Override public IBranchNode createBranchNode(String label) { return new BranchNode(label); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java index 6ffb7b612b9..9abd9dde359 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/PlainNode.java @@ -24,16 +24,19 @@ public class PlainNode extends AbstractSingleIncomingNode implements IPlainNode super(); } + @Override public IBasicBlock[] getOutgoingNodes() { return new IBasicBlock[] { next }; } + @Override public int getOutgoingSize() { if (next == null) return 0; return 1; } + @Override public IBasicBlock getOutgoing() { return next; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java index 4d64badf7c4..1307f830cd3 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/cfg/StartNode.java @@ -22,10 +22,12 @@ public class StartNode extends AbstractSingleOutgoingNode implements IStartNode super(); } + @Override public IBasicBlock[] getIncomingNodes() { return EMPTY_LIST; } + @Override public int getIncomingSize() { return 0; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanMarkerProblemReporter.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanMarkerProblemReporter.java index 32c3d14218b..deda9238a8f 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanMarkerProblemReporter.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanMarkerProblemReporter.java @@ -60,10 +60,12 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen this.checker = checker; } + @Override public IResource getResource() { return resource; } + @Override public IChecker getChecker() { return checker; } @@ -89,6 +91,7 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen } } + @Override public void deleteProblems(IResource file) { try { file.deleteMarkers(GENERIC_CODE_ANALYSIS_MARKER_TYPE, true, IResource.DEPTH_ZERO); @@ -97,6 +100,7 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen } } + @Override public void deleteAllProblems() { try { ResourcesPlugin.getWorkspace().getRoot().deleteMarkers(GENERIC_CODE_ANALYSIS_MARKER_TYPE, @@ -106,9 +110,11 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen } } + @Override public void deleteProblems(final IResource file, final IChecker checker) { try { ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { Collection markers = findResourceMarkers(file, checker); for (Iterator iterator = markers.iterator(); iterator.hasNext();) { @@ -156,15 +162,18 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen * @return session aware problem reporter * @since 1.1 */ + @Override public IProblemReporterSessionPersistent createReporter(IResource resource, IChecker checker) { return new CodanMarkerProblemReporter(resource, checker); } + @Override public void start() { if (checker == null) deleteProblems(false); } + @Override public void done() { if (checker != null) { if (toAdd.size() == 0) @@ -178,6 +187,7 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen protected void reconcileMarkers() { try { ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { Collection markers = findResourceMarkers(resource, checker); for (Iterator iterator = markers.iterator(); iterator.hasNext();) { @@ -271,6 +281,7 @@ public class CodanMarkerProblemReporter extends AbstractProblemReporter implemen * * @see IProblemReporterSessionPersistent#deleteProblems(boolean) */ + @Override public void deleteProblems(boolean all) { if (all) throw new UnsupportedOperationException(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblem.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblem.java index 3bae48a4758..3c539e48b88 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblem.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblem.java @@ -36,6 +36,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking this.multiple = multiple; } + @Override public CodanSeverity getSeverity() { return severity; } @@ -49,10 +50,12 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking this.name = name; } + @Override public String getName() { return name; } + @Override public String getId() { return id; } @@ -70,10 +73,12 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking return name; } + @Override public boolean isEnabled() { return enabled; } + @Override public void setSeverity(CodanSeverity sev) { if (sev == null) throw new NullPointerException(); @@ -82,6 +87,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking notifyChanged(ProblemProfileChangeEvent.PROBLEM_KEY); } + @Override public void setEnabled(boolean checked) { checkSet(); this.enabled = checked; @@ -103,6 +109,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking return prob; } + @Override public void setPreference(IProblemPreference value) { if (value == null) throw new NullPointerException(); @@ -110,6 +117,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking notifyChanged(ProblemProfileChangeEvent.PROBLEM_PREF_KEY); } + @Override public IProblemPreference getPreference() { return rootPreference; } @@ -119,6 +127,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * * @see org.eclipse.cdt.codan.core.model.IProblem#getMessagePattern() */ + @Override public String getMessagePattern() { return messagePattern; } @@ -127,6 +136,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * @param messagePattern * the message to set */ + @Override public void setMessagePattern(String messagePattern) { checkSet(); this.messagePattern = messagePattern; @@ -137,6 +147,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * * @see org.eclipse.cdt.codan.core.model.IProblem#getDescription() */ + @Override public String getDescription() { return description; } @@ -148,6 +159,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * org.eclipse.cdt.codan.core.model.IProblemWorkingCopy#setDescription(java * .lang.String) */ + @Override public void setDescription(String desc) { checkSet(); this.description = desc; @@ -158,6 +170,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * * @see org.eclipse.cdt.codan.core.model.IProblem#getMarkerType() */ + @Override public String getMarkerType() { return markerType; } @@ -177,6 +190,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * * @see org.eclipse.cdt.codan.core.model.IProblemMultiple#isMultiple() */ + @Override public boolean isMultiple() { return multiple; } @@ -186,6 +200,7 @@ public class CodanProblem extends CodanProblemElement implements IProblemWorking * * @see org.eclipse.cdt.codan.core.model.IProblemMultiple#isOriginal() */ + @Override public boolean isOriginal() { return !id.contains(CheckersRegistry.CLONE_SUFFIX); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemCategory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemCategory.java index 6ebb4c4c3f7..fe231b96789 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemCategory.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemCategory.java @@ -32,10 +32,12 @@ public class CodanProblemCategory extends CodanProblemElement implements IProble this.name = name; } + @Override public String getName() { return name; } + @Override public String getId() { return id; } @@ -45,6 +47,7 @@ public class CodanProblemCategory extends CodanProblemElement implements IProble return name; } + @Override public IProblemElement[] getChildren() { return list.toArray(new IProblemElement[list.size()]); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemElement.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemElement.java index 5c68bd7f867..4ef2f7a3869 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemElement.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemElement.java @@ -27,6 +27,7 @@ public class CodanProblemElement implements IProblemElement { * * @see org.eclipse.cdt.codan.core.model.IProblemElement#getProfile() */ + @Override public IProblemProfile getProfile() { return profile; } @@ -36,6 +37,7 @@ public class CodanProblemElement implements IProblemElement { * * @see org.eclipse.cdt.codan.core.model.IProblemElement#getCategory() */ + @Override public IProblemCategory getParentCategory() { return parent; } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java index b5dd4a5e74b..58d0c525ffa 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java @@ -40,6 +40,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { private IProblem problem; private Object args[]; + @Override public Object[] getArgs() { return args; } @@ -60,6 +61,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { * * @see org.eclipse.cdt.codan.core.model.ICodanProblemMarker#getLocation() */ + @Override public IProblemLocation getLocation() { return loc; } @@ -69,6 +71,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { * * @see org.eclipse.cdt.codan.core.model.ICodanProblemMarker#getProblem() */ + @Override public IProblem getProblem() { return problem; } @@ -78,6 +81,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { * * @see org.eclipse.cdt.codan.core.model.ICodanProblemMarker#getResource() */ + @Override public IResource getResource() { return loc.getFile(); } @@ -87,6 +91,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { * * @see org.eclipse.cdt.codan.core.model.ICodanProblemMarker#createMarker() */ + @Override public IMarker createMarker() throws CoreException { IResource file = loc.getFile(); int lineNumber = loc.getLineNumber(); @@ -112,6 +117,7 @@ public class CodanProblemMarker implements ICodanProblemMarker { * * @see org.eclipse.cdt.codan.core.model.ICodanProblemMarker#createMessage() */ + @Override public String createMessage() { String messagePattern = problem.getMessagePattern(); String message = problem.getId(); diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemLocationFactory.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemLocationFactory.java index df3c444bcd3..1207610ae76 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemLocationFactory.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemLocationFactory.java @@ -25,6 +25,7 @@ public class ProblemLocationFactory implements IProblemLocationFactory { * @seeorg.eclipse.cdt.codan.core.model.IProblemLocationFactory# * createProblemLocation(org.eclipse.core.resources.IFile, int) */ + @Override public IProblemLocation createProblemLocation(IFile file, int line) { return new CodanProblemLocation(file, line); } @@ -35,6 +36,7 @@ public class ProblemLocationFactory implements IProblemLocationFactory { * @seeorg.eclipse.cdt.codan.core.model.IProblemLocationFactory# * createProblemLocation(org.eclipse.core.resources.IFile, int, int) */ + @Override public IProblemLocation createProblemLocation(IFile file, int startChar, int endChar) { return new CodanProblemLocation(file, startChar, endChar); } @@ -45,6 +47,7 @@ public class ProblemLocationFactory implements IProblemLocationFactory { * @seeorg.eclipse.cdt.codan.core.model.IProblemLocationFactory# * createProblemLocation(org.eclipse.core.resources.IFile, int, int, int) */ + @Override public IProblemLocation createProblemLocation(IFile file, int startChar, int endChar, int line) { return new CodanProblemLocation(file, startChar, endChar, line); } diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemProfile.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemProfile.java index ab2ad76e57e..eaa0d524140 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemProfile.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/ProblemProfile.java @@ -45,6 +45,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { * org.eclipse.cdt.codan.core.model.IProblemProfile#getProblem(java.lang * .String) */ + @Override public IProblem findProblem(String id) { return CodanProblemCategory.findProblem(getRoot(), id); } @@ -54,6 +55,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { * * @see org.eclipse.cdt.codan.core.model.IProblemProfile#getProblems() */ + @Override public IProblem[] getProblems() { Collection problems = new ArrayList(); collectProblems(getRoot(), problems); @@ -76,6 +78,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { } } + @Override public IProblemCategory getRoot() { return rootCategory; } @@ -86,6 +89,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { ((CodanProblemCategory) cat).addChild(p); } + @Override public IProblemCategory findCategory(String id) { return CodanProblemCategory.findCategory(getRoot(), id); } @@ -124,6 +128,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { * * @see org.eclipse.cdt.codan.core.model.IProblemElement#getProfile() */ + @Override public IProblemProfile getProfile() { return this; } @@ -133,6 +138,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { * * @see org.eclipse.cdt.codan.core.model.IProblemElement#getParentCategory() */ + @Override public IProblemCategory getParentCategory() { return getRoot(); } @@ -141,6 +147,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { /** * @param listener */ + @Override public void addProfileChangeListener(IProblemProfileChangeListener listener) { if (preferenceChangeListeners == null) preferenceChangeListeners = new ListenerList(); @@ -150,6 +157,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { /** * @param listener */ + @Override public void removeProfileChangeListener(IProblemProfileChangeListener listener) { if (preferenceChangeListeners == null) return; @@ -169,10 +177,12 @@ public class ProblemProfile implements IProblemProfile, Cloneable { for (int i = 0; i < listeners.length; i++) { final IProblemProfileChangeListener listener = (IProblemProfileChangeListener) listeners[i]; ISafeRunnable job = new ISafeRunnable() { + @Override public void handleException(Throwable exception) { // already logged in Platform#run() } + @Override public void run() throws Exception { listener.profileChange(event); } @@ -186,6 +196,7 @@ public class ProblemProfile implements IProblemProfile, Cloneable { * * @see org.eclipse.cdt.codan.core.model.IProblemProfile#getResource() */ + @Override public Object getResource() { return resource; } diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/ControlFlowGraphPlugin.java b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/ControlFlowGraphPlugin.java index ad7784d8e7a..b6f7bde2e81 100644 --- a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/ControlFlowGraphPlugin.java +++ b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/ControlFlowGraphPlugin.java @@ -28,6 +28,7 @@ public class ControlFlowGraphPlugin extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext * ) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -40,6 +41,7 @@ public class ControlFlowGraphPlugin extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext * ) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java index 5a8b6b84440..7485cee680b 100644 --- a/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java +++ b/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java @@ -100,20 +100,25 @@ public class ControlFlowGraphView extends ViewPart { } class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider { + @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } + @Override public void dispose() { } + @Override public Object[] getElements(Object parent) { return getChildren(parent); } + @Override public Object getParent(Object child) { return null; } + @Override public Object[] getChildren(Object parent) { if (parent instanceof Collection) { return ((Collection) parent).toArray(); @@ -122,7 +127,7 @@ public class ControlFlowGraphView extends ViewPart { DeadNodes dead = new DeadNodes(); Iterator iter = ((IControlFlowGraph) parent).getUnconnectedNodeIterator(); for (; iter.hasNext();) { - IBasicBlock iBasicBlock = (IBasicBlock) iter.next(); + IBasicBlock iBasicBlock = iter.next(); dead.add(iBasicBlock); } ArrayList all = new ArrayList(); @@ -146,6 +151,7 @@ public class ControlFlowGraphView extends ViewPart { return new Object[0]; } + @Override public boolean hasChildren(Object parent) { return getChildren(parent).length > 0; } @@ -169,6 +175,7 @@ public class ControlFlowGraphView extends ViewPart { } class ViewLabelProvider extends LabelProvider { + @Override public String getText(Object obj) { if (obj == null) return null; @@ -192,6 +199,7 @@ public class ControlFlowGraphView extends ViewPart { return "0x" + Integer.toHexString(System.identityHashCode(obj)); } + @Override public Image getImage(Object obj) { String imageKey = "task.png"; if (obj instanceof IDecisionNode || obj instanceof IControlFlowGraph) @@ -220,6 +228,7 @@ public class ControlFlowGraphView extends ViewPart { * This is a callback that will allow us to create the viewer and initialize * it. */ + @Override public void createPartControl(Composite parent) { viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); drillDownAdapter = new DrillDownAdapter(viewer); @@ -236,6 +245,7 @@ public class ControlFlowGraphView extends ViewPart { MenuManager menuMgr = new MenuManager("#PopupMenu"); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { ControlFlowGraphView.this.fillContextMenu(manager); } @@ -272,6 +282,7 @@ public class ControlFlowGraphView extends ViewPart { private void makeActions() { action1 = new Action() { + @Override public void run() { IEditorPart e = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); ITranslationUnit tu = (ITranslationUnit) CDTUITools.getEditorInputCElement(e.getEditorInput()); @@ -289,6 +300,7 @@ public class ControlFlowGraphView extends ViewPart { action1.setToolTipText("Synchronize"); action1.setImageDescriptor(ControlFlowGraphPlugin.getDefault().getImageDescriptor("icons/refresh_view.gif")); doubleClickAction = new Action() { + @Override public void run() { ISelection selection = viewer.getSelection(); Object obj = ((IStructuredSelection) selection).getFirstElement(); @@ -299,6 +311,7 @@ public class ControlFlowGraphView extends ViewPart { private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doubleClickAction.run(); } @@ -316,6 +329,7 @@ public class ControlFlowGraphView extends ViewPart { shouldVisitDeclarations = true; } + @Override public int visit(IASTDeclaration decl) { if (decl instanceof IASTFunctionDefinition) { CxxControlFlowGraph graph = new ControlFlowGraphBuilder().build((IASTFunctionDefinition) decl); @@ -327,6 +341,7 @@ public class ControlFlowGraphView extends ViewPart { }; ast.accept(visitor); viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { // TODO Auto-generated method stub viewer.setInput(functions); @@ -337,6 +352,7 @@ public class ControlFlowGraphView extends ViewPart { /** * Passing the focus request to the viewer's control. */ + @Override public void setFocus() { viewer.getControl().setFocus(); } @@ -410,6 +426,7 @@ public class ControlFlowGraphView extends ViewPart { private void hookSingleClickAction() { viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { new ASTHighlighterAction(null).run(); } diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/.classpath b/codan/org.eclipse.cdt.codan.ui.cxx/.classpath index 64c5e31b7a2..8a8f1668cdc 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/.classpath +++ b/codan/org.eclipse.cdt.codan.ui.cxx/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.jdt.core.prefs b/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.jdt.core.prefs index 86f1068cb2e..f8aaa418ad4 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.jdt.core.prefs +++ b/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.jdt.core.prefs @@ -1,339 +1,346 @@ -#Wed Feb 23 19:44:22 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=error -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=false -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=false -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag= -org.eclipse.jdt.core.formatter.enabling_tag= -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=140 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +#Sat Jan 07 18:28:52 PST 2012 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=error +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=false +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag= +org.eclipse.jdt.core.formatter.enabling_tag= +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=false +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=140 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.ui.cxx/META-INF/MANIFEST.MF index 76e867c2d11..abedd163a05 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.ui.cxx/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.cdt.codan.ui.cxx;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Activator: org.eclipse.cdt.codan.internal.ui.cxx.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui, @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.codan.ui, org.eclipse.jface.text, org.eclipse.ui.ide -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.cdt.codan.internal.ui.cxx;x-internal:=true, org.eclipse.cdt.codan.ui diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml b/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml index 0c5934630ea..616df761593 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml +++ b/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 2.0.0-SNAPSHOT + 3.0.0-SNAPSHOT org.eclipse.cdt.codan.ui.cxx eclipse-plugin diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Activator.java b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Activator.java index c4ec43b0287..abdd3089953 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Activator.java +++ b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Activator.java @@ -37,6 +37,7 @@ public class Activator extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext * ) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; @@ -49,6 +50,7 @@ public class Activator extends AbstractUIPlugin { * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext * ) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java index 9c9f68cc5fa..ce6121332b9 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/CodanProblemMarkerResolutionGenerator.java @@ -45,6 +45,7 @@ public class CodanProblemMarkerResolutionGenerator implements IMarkerResolutionG } } + @Override public IMarkerResolution[] getResolutions(IMarker marker) { if (resolutionsLoaded == false) { readExtensions(); diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/OpenProblemPreferences.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/OpenProblemPreferences.java index 6c10bb507f5..dcd2043ea3b 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/OpenProblemPreferences.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/OpenProblemPreferences.java @@ -23,6 +23,7 @@ public class OpenProblemPreferences implements IObjectActionDelegate { public OpenProblemPreferences() { } + @Override public void run(IAction action) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss = (IStructuredSelection) selection; @@ -45,10 +46,12 @@ public class OpenProblemPreferences implements IObjectActionDelegate { } } + @Override public void selectionChanged(IAction action, ISelection selection) { this.selection = selection; } + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { this.targetPart = targetPart; } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java index 9ba23c0bf7a..e3a124d4002 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java @@ -31,10 +31,12 @@ import org.eclipse.ui.IWorkbenchPart; public class RunCodeAnalysis implements IObjectActionDelegate { private ISelection sel; + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { // nothing } + @Override public void run(IAction action) { Job job = new Job(CodanUIMessages.Job_TitleRunningAnalysis) { @SuppressWarnings("unchecked") @@ -67,6 +69,7 @@ public class RunCodeAnalysis implements IObjectActionDelegate { job.schedule(); } + @Override public void selectionChanged(IAction action, ISelection selection) { this.sel = selection; } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java index 352faec95d1..fbe2f12b6ba 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/ToggleNatureAction.java @@ -32,6 +32,7 @@ public class ToggleNatureAction implements IObjectActionDelegate { * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { if (selection instanceof IStructuredSelection) { for (Iterator it = ((IStructuredSelection) selection).iterator(); it.hasNext();) { @@ -56,6 +57,7 @@ public class ToggleNatureAction implements IObjectActionDelegate { * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action * .IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { this.selection = selection; } @@ -67,6 +69,7 @@ public class ToggleNatureAction implements IObjectActionDelegate { * org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface. * action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java index 2b525f46afb..5c585ecd2a4 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/dialogs/ExclusionInclusionEntryDialog.java @@ -139,10 +139,12 @@ public class ExclusionInclusionEntryDialog extends StatusDialog { // -------- ExclusionPatternAdapter -------- private class ExclusionPatternAdapter implements IDialogFieldListener, IStringButtonAdapter { // -------- IDialogFieldListener + @Override public void dialogFieldChanged(DialogField field) { doStatusLineUpdate(); } + @Override public void changeControlPressed(DialogField field) { doChangeControlPressed(); } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java index 7c11bd79cf4..2f976f5f2fe 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/BuildPropertyPage.java @@ -69,6 +69,7 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements IWor * * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() */ + @Override public IAdaptable getElement() { if (element.getAdapter(IProject.class) != null) return (IProject) element.getAdapter(IProject.class); @@ -80,6 +81,7 @@ public class BuildPropertyPage extends FieldEditorPreferencePage implements IWor * * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable) */ + @Override public void setElement(IAdaptable element) { this.element = element; if (getElement() != null) { diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CheckedTreeEditor.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CheckedTreeEditor.java index 629d3941458..05a60f97a94 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CheckedTreeEditor.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CheckedTreeEditor.java @@ -71,6 +71,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void adjustForNumColumns(int numColumns) { Control control = getLabelControl(); if (control != null) { @@ -84,6 +85,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void doFillIntoGrid(Composite parent, int numColumns) { doFillLabelIntoGrid(parent, numColumns); doFillBoxIntoGrid(parent, numColumns); @@ -113,6 +115,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void doLoad() { if (getTreeControl() != null) { String s = getPreferenceStore().getString(getPreferenceName()); @@ -140,6 +143,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta * @Override * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged(CheckStateChangedEvent event) { Object element = event.getElement(); treeViewer.setGrayed(element, false); @@ -185,6 +189,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void doLoadDefault() { if (getTreeControl() != null) { String s = getPreferenceStore().getDefaultString(getPreferenceName()); @@ -195,6 +200,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void doStore() { String s = modelToString(getViewer().getInput()); if (s != null) { @@ -230,6 +236,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override public int getNumberOfControls() { return 2; } @@ -250,6 +257,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override public void setFocus() { if (getTreeControl() != null) { getTreeControl().setFocus(); @@ -259,6 +267,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * @see FieldEditor.setEnabled(boolean,Composite). */ + @Override public void setEnabled(boolean enabled, Composite parent) { super.setEnabled(enabled, parent); createListControl(parent).setEnabled(enabled); @@ -276,6 +285,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta */ protected abstract String modelToString(Object model); + @Override protected void createControl(Composite parent) { GridLayout ly = (GridLayout) parent.getLayout(); doFillIntoGrid(parent, ly.numColumns); @@ -295,6 +305,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override public boolean isValid() { return isValid; } @@ -302,6 +313,7 @@ public abstract class CheckedTreeEditor extends FieldEditor implements ICheckSta /* * (non-Javadoc) Method declared on FieldEditor. */ + @Override protected void refreshValidState() { isValid = checkState(); } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CodanPreferencePage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CodanPreferencePage.java index 1517e86fe3e..70aed99519f 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CodanPreferencePage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/CodanPreferencePage.java @@ -65,6 +65,7 @@ public class CodanPreferencePage extends FieldEditorOverlayPage implements IWork setPreferenceStore(new ScopedPreferenceStore(new InstanceScope(), CodanCorePlugin.PLUGIN_ID)); // setDescription("Code Analysis Preference Page"); problemSelectionListener = new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (infoButton != null) { if (event.getSelection() instanceof ITreeSelection) { @@ -99,6 +100,7 @@ public class CodanPreferencePage extends FieldEditorOverlayPage implements IWork addField(checkedTreeEditor); checkedTreeEditor.getTreeViewer().addSelectionChangedListener(problemSelectionListener); checkedTreeEditor.getTreeViewer().addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { openCustomizeDialog(); } @@ -213,6 +215,7 @@ public class CodanPreferencePage extends FieldEditorOverlayPage implements IWork * @see * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java index fe7dcc7f3e6..25c210df10e 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java @@ -111,6 +111,7 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i * * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable) */ + @Override public void setElement(IAdaptable element) { this.element = element; } @@ -120,6 +121,7 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i * * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() */ + @Override public IAdaptable getElement() { if (element == null) return element; @@ -360,6 +362,7 @@ public abstract class FieldEditorOverlayPage extends FieldEditorPreferencePage i manager.addToRoot(targetNode); final PreferenceDialog dialog = new PreferenceDialog(getControl().getShell(), manager); BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() { + @Override public void run() { dialog.create(); dialog.setMessage(targetNode.getLabelText()); diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java index b3165f126e2..a1a9e9da58d 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FileScopePreferencePage.java @@ -212,6 +212,7 @@ public class FileScopePreferencePage extends PreferencePage { * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#customButtonPressed(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField, * int) */ + @Override public void customButtonPressed(ListDialogField field, int index) { doCustomButtonPressed(field, index); } @@ -219,6 +220,7 @@ public class FileScopePreferencePage extends PreferencePage { /** * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#selectionChanged(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField) */ + @Override public void selectionChanged(ListDialogField field) { doSelectionChanged(field); } @@ -226,6 +228,7 @@ public class FileScopePreferencePage extends PreferencePage { /** * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField) */ + @Override public void doubleClicked(ListDialogField field) { doDoubleClicked(field); } @@ -233,6 +236,7 @@ public class FileScopePreferencePage extends PreferencePage { /** * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener#dialogFieldChanged(org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField) */ + @Override public void dialogFieldChanged(DialogField field) { } } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java index fb2396a13d5..9f28f8b7bee 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/ProblemsTreeEditor.java @@ -62,6 +62,7 @@ public class ProblemsTreeEditor extends CheckedTreeEditor { * org.eclipse.jface.viewers.ICheckStateProvider#isChecked(java.lang * .Object) */ + @Override public boolean isChecked(Object element) { if (element instanceof IProblem) { IProblem p = (IProblem) element; @@ -88,6 +89,7 @@ public class ProblemsTreeEditor extends CheckedTreeEditor { * org.eclipse.jface.viewers.ICheckStateProvider#isGrayed(java.lang. * Object) */ + @Override public boolean isGrayed(Object element) { if (element instanceof IProblem) { IProblem p = (IProblem) element; @@ -130,14 +132,17 @@ public class ProblemsTreeEditor extends CheckedTreeEditor { } class ProblemsContentProvider implements IContentProvider, ITreeContentProvider { + @Override public void dispose() { // TODO Auto-generated method stub } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // TODO Auto-generated method stub } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Object[]) return (Object[]) parentElement; @@ -150,14 +155,17 @@ public class ProblemsTreeEditor extends CheckedTreeEditor { return new Object[0]; } + @Override public Object getParent(Object element) { return null; } + @Override public boolean hasChildren(Object element) { return getChildren(element).length > 0; } + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/views/ProblemDetails.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/views/ProblemDetails.java index 15cfc9f35fa..02bbfb8f4af 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/views/ProblemDetails.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/views/ProblemDetails.java @@ -107,6 +107,7 @@ public class ProblemDetails extends ViewPart { description.addSelectionListener(linkSelAdapter); ISelectionService ser = (ISelectionService) getSite().getService(ISelectionService.class); ser.addSelectionListener(new ISelectionListener() { + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { if (part.getSite().getId().equals(problemsViewId)) { processSelection(selection); diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/handlers/RunCodanCommand.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/handlers/RunCodanCommand.java index 4d4d72855d5..096203a0e76 100644 --- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/handlers/RunCodanCommand.java +++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/ui/handlers/RunCodanCommand.java @@ -27,6 +27,7 @@ public class RunCodanCommand extends AbstractHandler { public RunCodanCommand() { } + @Override public Object execute(ExecutionEvent event) throws ExecutionException { ISelection currentSelection = HandlerUtil.getCurrentSelection(event); RunCodeAnalysis action = new RunCodeAnalysis(); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java index 1913c56bf9f..fb1b7811cd1 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorOldTests.java @@ -107,6 +107,7 @@ public class CDescriptorOldTests extends TestCase { static public class CDescriptorListener implements ICDescriptorListener { + @Override public void descriptorChanged(CDescriptorEvent event) { fLastEvent = event; } @@ -115,6 +116,7 @@ public class CDescriptorOldTests extends TestCase { static void oneTimeSetUp() throws Exception { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot(); IProject project = root.getProject("testDescriptorProject"); @@ -142,6 +144,7 @@ public class CDescriptorOldTests extends TestCase { public void testDescriptorCreation() throws Exception { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false); } @@ -205,6 +208,7 @@ public class CDescriptorOldTests extends TestCase { public void run() { try { ICDescriptorOperation operation= new ICDescriptorOperation() { + @Override public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException { assertFalse(descriptor.getConfigurationDescription().isReadOnly()); Element data = descriptor.getProjectData("testElement"); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java index 8906cf76c1f..e304a21cdbf 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java @@ -114,6 +114,7 @@ public class CDescriptorTests extends BaseTestCase { static public class CDescriptorListener implements ICDescriptorListener { + @Override public void descriptorChanged(CDescriptorEvent event) { fLastEvent = event; } @@ -122,6 +123,7 @@ public class CDescriptorTests extends BaseTestCase { static void oneTimeSetUp() throws Exception { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspaceRoot root = CTestPlugin.getWorkspace().getRoot(); IProject project = root.getProject("testDescriptorProject"); @@ -149,6 +151,7 @@ public class CDescriptorTests extends BaseTestCase { public void testDescriptorCreation() throws Exception { CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { CCorePlugin.getDefault().mapCProjectOwner(fProject, projectId, false); } @@ -179,6 +182,7 @@ public class CDescriptorTests extends BaseTestCase { fProject.close(null); fProject.open(null); Thread t= new Thread() { + @Override public void run() { try { CCorePlugin.getDefault().getCProjectDescription(fProject, true); @@ -227,6 +231,7 @@ public class CDescriptorTests extends BaseTestCase { public void run() { try { ICDescriptorOperation operation= new ICDescriptorOperation() { + @Override public void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException { // assertFalse(descriptor.getConfigurationDescription().isReadOnly()); ICStorageElement data = fdesc.getProjectStorageElement("testElement"); @@ -268,6 +273,7 @@ public class CDescriptorTests extends BaseTestCase { public void testConcurrentDifferentStorageElementModification() throws Exception { for (int i=0; i < 100; ++i) { Thread t= new Thread() { + @Override public void run() { try { ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true); @@ -300,6 +306,7 @@ public class CDescriptorTests extends BaseTestCase { public void testConcurrentSameStorageElementModification() throws Exception { for (int i=0; i < 100; ++i) { Thread t= new Thread() { + @Override public void run() { try { ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true); @@ -332,6 +339,7 @@ public class CDescriptorTests extends BaseTestCase { oneTimeTearDown(); oneTimeSetUp(); Thread t= new Thread() { + @Override public void run() { try { ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(fProject, true); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java index 676cedad16e..fd7535bf5e1 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/envvar/IEnvironmentVariableManagerTests.java @@ -172,9 +172,11 @@ public class IEnvironmentVariableManagerTests extends TestCase { project.getFile(".settings/org.eclipse.cdt.core.prefs").setContents(new ByteArrayInputStream(env.getBytes("UTF-8")), true, false, null); ISchedulingRule incompatibleRule = new ISchedulingRule() { + @Override public boolean isConflicting(ISchedulingRule rule) { return rule == this || rule instanceof IResource; } + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java index 11bff5a65fb..bc3da30b10a 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserEfsFileMatchingTest.java @@ -54,8 +54,10 @@ public class ErrorParserEfsFileMatchingTest extends TestCase { private final IMarkerGenerator markerGenerator = new IMarkerGenerator() { // deprecated + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {} + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java index d24ec5a70bb..617eea5d12e 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java @@ -55,8 +55,10 @@ public class ErrorParserFileMatchingTest extends TestCase { private final IMarkerGenerator markerGenerator = new IMarkerGenerator() { // deprecated + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {} + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java index ba7b678556c..9fbc3d2c4c7 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserManagerTest.java @@ -98,10 +98,12 @@ public class ErrorParserManagerTest extends TestCase { cProject = createProject("errorparsersanity"); markerGenerator = new IMarkerGenerator() { + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) { // Obsolete } + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); @@ -210,10 +212,12 @@ public class ErrorParserManagerTest extends TestCase { public static class TestParser1 implements IErrorParser2 { String last = null; + @Override public int getProcessLineBehaviour() { return KEEP_UNTRIMMED; } + @Override public boolean processLine(String line, ErrorParserManager eoParser) { if (line.startsWith(" ") && last!=null) { eoParser.generateExternalMarker(null, 1, last+line, 1, "", null); @@ -242,10 +246,12 @@ public class ErrorParserManagerTest extends TestCase { } public static class TestParser2 implements IErrorParser2 { + @Override public int getProcessLineBehaviour() { return KEEP_LONGLINES; } + @Override public boolean processLine(String line, ErrorParserManager eoParser) { if (line.startsWith("errorT: ")) { eoParser.generateExternalMarker(null, 1, line, 1, "", null); @@ -274,10 +280,12 @@ public class ErrorParserManagerTest extends TestCase { assertEquals("a la la 99",end); } public static class TestParser3 implements IErrorParser2 { + @Override public int getProcessLineBehaviour() { return KEEP_LONGLINES | KEEP_UNTRIMMED; } + @Override public boolean processLine(String line, ErrorParserManager eoParser) { if (line.startsWith("errorT: ")) { eoParser.generateExternalMarker(null, 1, line, 1, "", null); @@ -307,6 +315,7 @@ public class ErrorParserManagerTest extends TestCase { } public static class TestParser4 implements IErrorParser { + @Override public boolean processLine(String line, ErrorParserManager eoParser) { ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(null, 0, "Workspace level marker", IMarker.SEVERITY_INFO, null); eoParser.addProblemMarker(problemMarkerInfo); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java index bf58200b9c0..b995104d03b 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java @@ -30,6 +30,7 @@ public class FileBasedErrorParserTests extends GenericErrorParserTests { errorFile = file; } + @Override public String getName() { return super.getName() + " " + errorFile.getName(); } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java index 7a0bd5ecdf3..713ac819fcd 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/GenericErrorParserTests.java @@ -57,6 +57,7 @@ public abstract class GenericErrorParserTests extends TestCase { /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); fTempProject = ResourcesPlugin.getWorkspace().getRoot().getProject("temp-" + System.currentTimeMillis()); @@ -68,6 +69,7 @@ public abstract class GenericErrorParserTests extends TestCase { /* * @see TestCase#tearDown() */ + @Override protected void tearDown() { try { super.tearDown(); @@ -174,6 +176,7 @@ public abstract class GenericErrorParserTests extends TestCase { * * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(Object arg0, Object arg1) { try { IFile f0 = (IFile)arg0; @@ -199,6 +202,7 @@ public abstract class GenericErrorParserTests extends TestCase { public List descriptions; private Comparator fFileNameComparator; + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) { ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, errorVar, null); addMarker(problemMarkerInfo); @@ -208,6 +212,7 @@ public abstract class GenericErrorParserTests extends TestCase { /* (non-Javadoc) * @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.cdt.core.ProblemMarkerInfo) */ + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { int index = Collections.binarySearch(uniqFiles, problemMarkerInfo.file, fFileNameComparator); if (index < 0) { @@ -250,6 +255,7 @@ public abstract class GenericErrorParserTests extends TestCase { fProject = project; } + @Override public IFile findFileName(String fileName) { if (fileName==null || fileName.trim().length()==0) { return null; @@ -270,6 +276,7 @@ public abstract class GenericErrorParserTests extends TestCase { return file; } + @Override protected IFile findFileInWorkspace(IPath path) { IFile file = fProject.getFile(path.lastSegment()); if (!file.exists()) { diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java index 95aa32c7ce2..dcf63498ae9 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/RegexErrorParserTests.java @@ -49,8 +49,10 @@ public class RegexErrorParserTests extends TestCase { private final IMarkerGenerator markerGenerator = new IMarkerGenerator() { // deprecated + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {} + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { errorList.add(problemMarkerInfo); } @@ -66,6 +68,7 @@ public class RegexErrorParserTests extends TestCase { public DummyErrorParser() { } + @Override public boolean processLine(String line, ErrorParserManager eoParser) { return false; } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/index/provider/test/AbstractDummyProvider.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/index/provider/test/AbstractDummyProvider.java index 34ab146d278..0f11f75d58d 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/index/provider/test/AbstractDummyProvider.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/index/provider/test/AbstractDummyProvider.java @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException; public class AbstractDummyProvider implements IReadOnlyPDOMProvider { public AbstractDummyProvider() {} + @Override public IPDOMDescriptor[] getDescriptors(ICConfigurationDescription config) { if (!DummyProviderTraces.getInstance().enabled) return new IPDOMDescriptor[0]; @@ -30,6 +31,7 @@ public class AbstractDummyProvider implements IReadOnlyPDOMProvider { return new IPDOMDescriptor[0]; } + @Override public boolean providesFor(ICProject project) throws CoreException { if (!DummyProviderTraces.getInstance().enabled) return true; diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java index cce386693b2..74f1a887e35 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileStore.java @@ -31,51 +31,62 @@ public class MemoryFileStore extends FileStore { this.path = path.setDevice(null); } + @Override public String[] childNames(int options, IProgressMonitor monitor) { final String[] names = TREE.childNames(path); return names == null ? EMPTY_STRING_ARRAY : names; } + @Override public void delete(int options, IProgressMonitor monitor) { TREE.delete(path); } + @Override public IFileInfo fetchInfo(int options, IProgressMonitor monitor) { return TREE.fetchInfo(path); } + @Override public IFileStore getChild(String name) { return new MemoryFileStore(path.append(name)); } + @Override public String getName() { final String name = path.lastSegment(); return name == null ? "" : name; } + @Override public IFileStore getParent() { if (path.segmentCount() == 0) return null; return new MemoryFileStore(path.removeLastSegments(1)); } + @Override public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException { TREE.mkdir(path, (options & EFS.SHALLOW) == 0); return this; } + @Override public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException { return TREE.openInputStream(path); } + @Override public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException { return TREE.openOutputStream(path, options); } + @Override public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException { TREE.putInfo(path, info, options); } + @Override public URI toURI() { return MemoryFileSystem.toURI(path); } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java index 6efae4e3664..543f06a990f 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryFileSystem.java @@ -42,10 +42,12 @@ public class MemoryFileSystem extends FileSystem { super(); } + @Override public IFileStore getStore(URI uri) { return new MemoryFileStore(Path.fromPortableString(uri.getSchemeSpecificPart())); } + @Override public boolean isCaseSensitive() { return true; } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java index a9e45365bc1..da66e3f2a10 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryTree.java @@ -57,11 +57,13 @@ public class MemoryTree { return null; } + @Override protected void initializeInfo(FileInfo fileInfo) { super.initializeInfo(fileInfo); fileInfo.setDirectory(true); } + @Override boolean isFile() { return false; } @@ -72,6 +74,7 @@ public class MemoryTree { children.remove(child); } + @Override public String toString() { return super.toString() + ' ' + children; } @@ -84,6 +87,7 @@ public class MemoryTree { super(parent, name); } + @Override boolean isFile() { return true; } @@ -94,6 +98,7 @@ public class MemoryTree { public OutputStream openOutputStream(final int options) { return new ByteArrayOutputStream() { + @Override public void close() throws IOException { super.close(); setContents(toByteArray(), options); @@ -151,6 +156,7 @@ public class MemoryTree { /** * For debugging purposes only. */ + @Override public String toString() { return info.getName(); } diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java index f1cbd8298b7..7a6384022c1 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/resources/tests/RefreshScopeTests.java @@ -63,6 +63,7 @@ public class RefreshScopeTests extends TestCase { // create project CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { ICProject cProject = CProjectHelper.createNewStileCProject("testRefreshScope", IPDOMManager.ID_NO_INDEXER, false); fProject = cProject.getProject(); @@ -99,6 +100,7 @@ public class RefreshScopeTests extends TestCase { fFolder6 = folder6; CTestPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { folder1.create(true, true, monitor); diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/CdtVariableResolverTest.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/CdtVariableResolverTest.java index 947156b4c25..55aed170f88 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/CdtVariableResolverTest.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/CdtVariableResolverTest.java @@ -27,6 +27,7 @@ public class CdtVariableResolverTest extends TestCase { private class MockSubstitutor implements IVariableSubstitutor { + @Override public String resolveToString(String macroName) throws CdtVariableException { if (macroName.equals("null")) { @@ -44,6 +45,7 @@ public class CdtVariableResolverTest extends TestCase { return "#"+macroName+"#"; } + @Override public String[] resolveToStringList(String macroName) throws CdtVariableException { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java index 019ecca925c..e27ce10d3c3 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java @@ -52,6 +52,7 @@ public class LanguageInheritanceTests extends BaseTestCase { return suite(LanguageInheritanceTests.class); } + @Override protected void setUp() throws Exception { String name = getClass().getName() + "_" + getName(); fCProject = CProjectHelper.createCCProject(name , BIN_FOLDER, IPDOMManager.ID_NO_INDEXER); @@ -71,6 +72,7 @@ public class LanguageInheritanceTests extends BaseTestCase { fManager.storeWorkspaceLanguageConfiguration(EMPTY_CONTENT_TYPES); } + @Override protected void tearDown() throws Exception { CProjectHelper.delete(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java index 8b0e483be46..386ae9e6857 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java @@ -56,6 +56,7 @@ public class ASTCacheTests extends BaseTestCase { fCache= cache; setDaemon(true); } + @Override public void run() { while (!fStopped) { try { @@ -98,6 +99,7 @@ public class ASTCacheTests extends BaseTestCase { private final String SOURCE1= "void foo1() {}"; //$NON-NLS-1$ private final String SOURCE2= "void foo2() {}"; //$NON-NLS-1$ + @Override public void setUp() throws Exception { super.setUp(); IProgressMonitor npm= new NullProgressMonitor(); @@ -116,6 +118,7 @@ public class ASTCacheTests extends BaseTestCase { fIndex.acquireReadLock(); } + @Override public void tearDown() throws Exception { if (fIndex != null) { fIndex.releaseReadLock(); @@ -158,6 +161,7 @@ public class ASTCacheTests extends BaseTestCase { final int[] counter= {0}; cache.setActiveElement(fTU1); IStatus status= cache.runOnAST(fTU1, false, null, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { assertNull(ast); counter[0]++; @@ -169,6 +173,7 @@ public class ASTCacheTests extends BaseTestCase { IProgressMonitor npm= new NullProgressMonitor(); npm.setCanceled(true); status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { assertNull(ast); counter[0]++; @@ -179,6 +184,7 @@ public class ASTCacheTests extends BaseTestCase { npm.setCanceled(false); status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { assertNotNull(ast); counter[0]++; @@ -204,6 +210,7 @@ public class ASTCacheTests extends BaseTestCase { } reconciler1.fStopped= true; IStatus status= cache.runOnAST(fTU1, true, null, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { assertNotNull(ast); assertTrue(cache.isActiveElement(fTU1)); @@ -226,6 +233,7 @@ public class ASTCacheTests extends BaseTestCase { reconciler2.fStopped= true; status= cache.runOnAST(fTU2, true, null, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException { assertNotNull(ast); assertTrue(cache.isActiveElement(fTU2)); @@ -257,6 +265,7 @@ public class ASTCacheTests extends BaseTestCase { cache.setActiveElement(fTU1); Thread.sleep(50); waitForAST(cache, fTU1, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { assertNotNull(ast); assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature()); @@ -265,6 +274,7 @@ public class ASTCacheTests extends BaseTestCase { }); waitForAST(cache, fTU2, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { assertNotNull(ast); assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature()); @@ -276,6 +286,7 @@ public class ASTCacheTests extends BaseTestCase { cache.setActiveElement(fTU2); Thread.sleep(50); waitForAST(cache, fTU2, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { assertNotNull(ast); assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature()); @@ -284,6 +295,7 @@ public class ASTCacheTests extends BaseTestCase { }); waitForAST(cache, fTU1, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { assertNotNull(ast); assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature()); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java index e28ebe71260..32cec750ac8 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java @@ -78,7 +78,8 @@ public class ArchiveTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() throws Exception { + @Override + protected void setUp() throws Exception { /*** * Setup the various files, paths and projects that are needed by the @@ -134,7 +135,8 @@ public class ArchiveTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { CProjectHelper.delete(testProject); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java index 3949ba43306..950808e7ea7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java @@ -78,6 +78,7 @@ public class Bug311189 extends BaseTestCase { // Path entry update should now be running... // Tick a workspace job through the workspace so we get when it's finished ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { } }, null); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java index 584bcf869b3..4365bfc2ae6 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java @@ -46,7 +46,8 @@ public class CModelExceptionTest extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() { + @Override + protected void setUp() { // create shared resources and setup the test fixture cModelStatus = new CModelStatus(); coreException = new CoreException(cModelStatus); @@ -57,7 +58,8 @@ public class CModelExceptionTest extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { // release resources here and clean-up } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java index 94138184a59..b088b350c38 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java @@ -50,6 +50,7 @@ public class CModelIdentifierTests extends BaseTestCase { private ICProject fCProject; private IFile fHeaderFile; + @Override protected void setUp() throws Exception { // reusing project setup from CModelElementsTests NullProgressMonitor monitor= new NullProgressMonitor(); @@ -69,6 +70,7 @@ public class CModelIdentifierTests extends BaseTestCase { CCorePlugin.getIndexManager().joinIndexer(10000, new NullProgressMonitor()); } + @Override protected void tearDown() { CProjectHelper.delete(fCProject); } @@ -91,6 +93,7 @@ public class CModelIdentifierTests extends BaseTestCase { final List elements= new ArrayList(); final List identifiers= new ArrayList(); ICElementVisitor visitor= new ICElementVisitor() { + @Override public boolean visit(ICElement element) throws CoreException { elements.add(element); identifiers.add(element.getHandleIdentifier()); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java index 07c547b1d46..94cbe031908 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java @@ -502,7 +502,8 @@ public class CModelTests extends TestCase { final boolean binContainerChanged[] = { false }; IElementChangedListener elementChangedListener = new IElementChangedListener() { - public void elementChanged(ElementChangedEvent event) { + @Override + public void elementChanged(ElementChangedEvent event) { ICElementDelta delta = event.getDelta(); processDelta(delta); } @@ -560,7 +561,8 @@ public class CModelTests extends TestCase { String baseDir= FileLocator.toFileURL(FileLocator.find(bundle, new Path(sources), null)).getFile(); ImportOperation importOp = new ImportOperation(project.getProject().getFullPath(), new File(baseDir), FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() { - public String queryOverwrite(String file) { + @Override + public String queryOverwrite(String file) { return ALL; }}); importOp.setCreateContainerStructure(true); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java index 9febc3e7ced..f5abf048221 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java @@ -80,6 +80,7 @@ public class CPathEntryTest extends BaseTestCase { * * @see org.eclipse.cdt.core.model.IElementChangedListener#elementChanged(org.eclipse.cdt.core.model.ElementChangedEvent) */ + @Override public void elementChanged(ElementChangedEvent event) { processDelta(event.getDelta()); } @@ -101,6 +102,7 @@ public class CPathEntryTest extends BaseTestCase { * Called before every test case method. * */ + @Override protected void setUp() throws CoreException { /*************************************************************************************************************************** * The test of the tests assume that they have a working workspace and workspace root object to use to create @@ -126,6 +128,7 @@ public class CPathEntryTest extends BaseTestCase { * * Called after every test case method. */ + @Override protected void tearDown() { // release resources here and clean-up } @@ -205,6 +208,7 @@ public class CPathEntryTest extends BaseTestCase { IContainerEntry containerEntry = CoreModel.newContainerEntry(containerID); IPathEntryContainer container = new IPathEntryContainer() { + @Override public IPathEntry[] getPathEntries() { IPathEntry[] entries = new IPathEntry[3]; entries[0] = CoreModel.newIncludeEntry(new Path(""), null, new Path("/usr/include"), true); @@ -213,10 +217,12 @@ public class CPathEntryTest extends BaseTestCase { return entries; } + @Override public String getDescription() { return "Testing container"; //$NON-NLS-1$ } + @Override public IPath getPath() { return containerID; } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java index 8d6f8d09530..bcd9e131432 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java @@ -66,6 +66,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen super(name); } + @Override protected void setUp() throws Exception { monitor = new NullProgressMonitor(); @@ -91,6 +92,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen changedElements = new Vector(20); } + @Override protected void tearDown() { CProjectHelper.delete(fCProject); } @@ -237,6 +239,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen return found; } + @Override public void elementChanged(ElementChangedEvent event){ try { addedElements.clear(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java index efdc5a79e29..8d711309387 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java @@ -41,7 +41,8 @@ public class FlagTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() { + @Override + protected void setUp() { flags=new int[15]; flags[0]=IConstants.AccPublic; flags[1]=IConstants.AccPrivate; @@ -66,7 +67,8 @@ public class FlagTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { // release resources here and clean-up } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java index 28c9a6a1a81..43f44ee518e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java @@ -40,6 +40,7 @@ public class IIncludeTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileSubdir() { return "resources/cmodel/"; } @@ -47,6 +48,7 @@ public class IIncludeTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileResource() { return "IIncludeTest.h"; } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java index 442082d39f9..16649837b42 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java @@ -54,6 +54,7 @@ public class IMacroTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileSubdir() { return "resources/cmodel/"; } @@ -61,6 +62,7 @@ public class IMacroTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileResource() { return "IMacroTest.h"; } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java index 1685b8b4f20..004a6431909 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java @@ -46,6 +46,7 @@ public class ITemplateTests extends IntegratedCModelTest { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileSubdir() */ + @Override public String getSourcefileSubdir() { return "resources/cmodel/"; } @@ -53,6 +54,7 @@ public class ITemplateTests extends IntegratedCModelTest { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileResource() */ + @Override public String getSourcefileResource() { return "ITemplate.cpp"; } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java index 52261a42956..338069dc751 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java @@ -68,6 +68,7 @@ public abstract class IntegratedCModelTest extends TestCase { */ abstract public String getSourcefileResource(); + @Override public void setUp() throws Exception { monitor = new NullProgressMonitor(); fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER); @@ -86,6 +87,7 @@ public abstract class IntegratedCModelTest extends TestCase { CCorePlugin.getIndexManager().joinIndexer(2000, new NullProgressMonitor()); } + @Override protected void tearDown() { CProjectHelper.delete(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java index 79cdd89b365..2b1acb4aafa 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java @@ -41,6 +41,7 @@ public class MacroTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileSubdir() { return "resources/cmodel/"; } @@ -48,6 +49,7 @@ public class MacroTests extends IntegratedCModelTest { /** * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest */ + @Override public String getSourcefileResource() { return "MacroTests.cpp"; } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java index afb8b7f5065..592e9d4739e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java @@ -69,6 +69,7 @@ public class StructuralCModelElementsTests extends TestCase { super(name); } + @Override protected void setUp() throws Exception { monitor = new NullProgressMonitor(); fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$ @@ -92,6 +93,7 @@ public class StructuralCModelElementsTests extends TestCase { } + @Override protected void tearDown() { CProjectHelper.delete(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java index 854ffbabfad..96e3508c391 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java @@ -39,6 +39,7 @@ public class StructuralMacroTests extends IMacroTests { } + @Override public void testGetElementName() throws CModelException { setStructuralParse(true); super.testGetElementName(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java index 312ffe06b86..229f9585466 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java @@ -54,6 +54,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testAnonymousStructObject() */ + @Override public void testAnonymousStructObject() throws CModelException { setStructuralParse(true); super.testAnonymousStructObject(); @@ -61,6 +62,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetAccessControl() */ + @Override public void testGetAccessControl() throws CModelException { setStructuralParse(true); super.testGetAccessControl(); @@ -68,6 +70,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetBaseTypes() */ + @Override public void testGetBaseTypes() throws CModelException { setStructuralParse(true); super.testGetBaseTypes(); @@ -75,6 +78,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeClass() */ + @Override public void testGetChildrenOfTypeClass() throws CModelException { setStructuralParse(true); super.testGetChildrenOfTypeClass(); @@ -82,6 +86,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeStruct() */ + @Override public void testGetChildrenOfTypeStruct() throws CModelException { setStructuralParse(true); super.testGetChildrenOfTypeStruct(); @@ -89,6 +94,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetField() */ + @Override public void testGetField() throws CModelException { setStructuralParse(true); super.testGetField(); @@ -96,6 +102,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFields() */ + @Override public void testGetFields() throws CModelException { setStructuralParse(true); super.testGetFields(); @@ -103,6 +110,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFieldsHack() */ + @Override public void testGetFieldsHack() throws CModelException { setStructuralParse(true); super.testGetFieldsHack(); @@ -110,6 +118,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethod() */ + @Override public void testGetMethod() throws CModelException { setStructuralParse(true); super.testGetMethod(); @@ -117,6 +126,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethods() */ + @Override public void testGetMethods() throws CModelException { setStructuralParse(true); super.testGetMethods(); @@ -124,6 +134,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethodsHack() */ + @Override public void testGetMethodsHack() throws CModelException { setStructuralParse(true); super.testGetMethodsHack(); @@ -131,6 +142,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetStructureInfo() */ + @Override public void testGetStructureInfo() { setStructuralParse(true); super.testGetStructureInfo(); @@ -138,6 +150,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testInnerStruct() */ + @Override public void testInnerStruct() throws CModelException { setStructuralParse(true); super.testInnerStruct(); @@ -145,6 +158,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsAbstract() */ + @Override public void testIsAbstract() throws CModelException { setStructuralParse(true); super.testIsAbstract(); @@ -152,6 +166,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsClass() */ + @Override public void testIsClass() throws CModelException { setStructuralParse(true); super.testIsClass(); @@ -159,6 +174,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsStruct() */ + @Override public void testIsStruct() throws CModelException { setStructuralParse(true); super.testIsStruct(); @@ -166,6 +182,7 @@ public class StructuralStructureTests extends IStructureTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsUnion() */ + @Override public void testIsUnion() throws CModelException { setStructuralParse(true); super.testIsUnion(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java index 963c54569b3..02679f02441 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java @@ -47,6 +47,7 @@ public class StructuralTemplateTests extends ITemplateTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetChildrenOfTypeTemplate() */ + @Override public void testGetChildrenOfTypeTemplate() throws CModelException { setStructuralParse(true); ITranslationUnit tu = getTU(); @@ -116,6 +117,7 @@ public class StructuralTemplateTests extends ITemplateTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetNumberOfTemplateParameters() */ + @Override public void testGetNumberOfTemplateParameters() throws CModelException { setStructuralParse(true); ITranslationUnit tu = getTU(); @@ -145,6 +147,7 @@ public class StructuralTemplateTests extends ITemplateTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateParameterTypes() */ + @Override public void testGetTemplateParameterTypes() throws CModelException { setStructuralParse(true); ITranslationUnit tu = getTU(); @@ -195,6 +198,7 @@ public class StructuralTemplateTests extends ITemplateTests { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateSignature() */ + @Override public void testGetTemplateSignature() throws CModelException { setStructuralParse(true); ITranslationUnit tu = getTU(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java index ec53a6cee14..12eb79c34bd 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java @@ -71,7 +71,8 @@ public class TranslationUnitBaseTest extends TestCase * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() throws Exception + @Override + protected void setUp() throws Exception { /*** * The rest of the tests assume that they have a working workspace @@ -145,7 +146,8 @@ public class TranslationUnitBaseTest extends TestCase * * Called after every test case method. */ - protected void tearDown() + @Override + protected void tearDown() { // release resources here and clean-up try { diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java index a0cae852b04..25b52142def 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java @@ -56,6 +56,7 @@ public class WorkingCopyTests extends TestCase { super(name); } + @Override protected void setUp() throws Exception { monitor = new NullProgressMonitor(); @@ -75,6 +76,7 @@ public class WorkingCopyTests extends TestCase { } } + @Override protected void tearDown() { CProjectHelper.delete(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java index 7515deff93c..4ef0bdff3a1 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java @@ -433,6 +433,7 @@ public class CConfigurationDescriptionExportSettings extends BaseTestCase { // Now replace the .cproject with .cproject_back. The exported settings should be picked up in the referenced config ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { libCproject.setContents(libCproject_back.getContents(), IResource.NONE, null); mainCproject.setContents(mainCproject_back.getContents(), IResource.NONE, null); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java index 9a065ad9a14..0a191764db1 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java @@ -351,6 +351,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase { csettings.create(true, false, null); csettings_back.accept(new IResourceVisitor() { + @Override public boolean visit(IResource resource) throws CoreException { assertTrue(resource instanceof IFile); csettings.getFile(resource.getName()).create(((IFile)resource).getContents(), false, null); @@ -448,6 +449,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase { private static class OurResourceChangeListener implements IResourceChangeListener { boolean changeDetected; private Set filesToWatch = new HashSet(); + @Override public synchronized void resourceChanged(IResourceChangeEvent event) { IResourceDelta delta = event.getDelta(); if (delta == null) diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java index 27be0e08933..52021457a34 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java @@ -28,6 +28,7 @@ public class CfgSettingsTests extends BaseTestCase { return suite(CfgSettingsTests.class, "_"); } + @Override protected void setUp() throws Exception { } @@ -147,6 +148,7 @@ public class CfgSettingsTests extends BaseTestCase { return ICProjectDescriptionPreferences.CONFIGS_INDEPENDENT; } + @Override protected void tearDown() throws Exception { try { if(p1 != null){ diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java index 7dce5fa0d77..b83dcc5967c 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java @@ -35,6 +35,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{ return suite(ExternalSettingsProviderTests.class, "_"); } + @Override protected void setUp() throws Exception { p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); p2 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER); @@ -425,6 +426,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{ assertTrue(Arrays.equals(expectedEntriesSet, entries)); } + @Override protected void tearDown() throws Exception { try { p1.getProject().delete(true, null); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java index e7e1793ddc3..1d9f7d77b73 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java @@ -26,9 +26,11 @@ public class PathSettingsContainerTests extends BaseTestCase { return suite(PathSettingsContainerTests.class, "_"); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java index 80b2aad5b81..4345fe9dec8 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java @@ -42,6 +42,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ fProjName = projName; } + @Override public void handleEvent(CProjectDescriptionEvent event) { if(!event.getProject().getName().equals(fProjName)) return; @@ -89,6 +90,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ return suite(ProjectCreationStateTests.class, "_"); } + @Override protected void setUp() throws Exception { // p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER); } @@ -362,6 +364,7 @@ public class ProjectCreationStateTests extends BaseTestCase{ } + @Override protected void tearDown() throws Exception { if(listener != null){ CoreModel.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(listener); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java index 2c2161559ca..479fa67c030 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java @@ -33,6 +33,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider { // Overriden so it supports saving Library file and Library path entries private static final class TestDataFactory extends CDataFactory { + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, CLanguageData base, @@ -43,6 +44,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider { return new CDefaultLanguageData(id, base); } + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, String id, diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java index f9540663774..93bb40f1c5e 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java @@ -94,6 +94,7 @@ public class TestExtSettingsProvider extends CExternalSettingProvider { private static int variantNum; + @Override public CExternalSetting[] getSettings(IProject project, ICConfigurationDescription cfg) { return SETTINGS_VARIANTS[variantNum].clone(); diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java index 9a8c34381d8..6cba7b82455 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java @@ -34,6 +34,7 @@ public class TestUserAndDiscoveredEntriesCfgDataProvider extends UserAndDiscover ENTRIES_STORES[0].put(ICSettingEntry.MACRO, entries); } + @Override protected ICLanguageSettingEntry[] getAllDiscoveredEntries( LanguageData data, int kind) { ICLanguageSettingEntry entries[] = (ICLanguageSettingEntry[])ENTRIES_STORES[0].get(kind); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilsTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilTest.java similarity index 93% rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilsTest.java rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilTest.java index 707785be1e5..234723a336d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilsTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ArrayUtilTest.java @@ -6,20 +6,19 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.core.parser.tests; import junit.framework.TestCase; import org.eclipse.cdt.core.parser.util.ArrayUtil; -public class ArrayUtilsTest extends TestCase { - private Object o1= new Object(); - private Object o2= new Object(); - private Object o3= new Object(); - private Object o4= new Object(); +public class ArrayUtilTest extends TestCase { + private final Object o1= new Object(); + private final Object o2= new Object(); + private final Object o3= new Object(); + private final Object o4= new Object(); public void testAppend() { Object[] array= null; @@ -30,9 +29,9 @@ public class ArrayUtilsTest extends TestCase { assertEquals(o2, array[1]); assertEquals(o3, array[2]); - array= ArrayUtil.append(Object.class, null, 0, o1); - array= ArrayUtil.append(Object.class, array, 1, o2); - array= ArrayUtil.append(Object.class, array, 2, o3); + array= ArrayUtil.appendAt(Object.class, null, 0, o1); + array= ArrayUtil.appendAt(Object.class, array, 1, o2); + array= ArrayUtil.appendAt(Object.class, array, 2, o3); assertEquals(o1, array[0]); assertEquals(o2, array[1]); assertEquals(o3, array[2]); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/AutomatedFramework.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/AutomatedFramework.java index a1404537d55..4845ab7f371 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/AutomatedFramework.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/AutomatedFramework.java @@ -99,6 +99,7 @@ public abstract class AutomatedFramework extends TestCase { fail( "Unable to load properties file." ); //$NON-NLS-1$ } + @Override protected void runTest() throws Throwable { String name = getName(); @@ -165,6 +166,7 @@ public abstract class AutomatedFramework extends TestCase { static private class Filter implements FilenameFilter { + @Override public boolean accept(File dir, String name) { if( name.endsWith(".cpp") || //$NON-NLS-1$ name.endsWith(".c") || //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java index 68aef63124e..57601678d90 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/FileBasePluginTest.java @@ -98,7 +98,8 @@ public class FileBasePluginTest extends TestCase { } } - protected void tearDown() throws Exception { + @Override + protected void tearDown() throws Exception { if( project == null || !project.exists() ) return; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ObjectMapTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ObjectMapTest.java index 768292623a5..3f035e2e7bd 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ObjectMapTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ObjectMapTest.java @@ -28,7 +28,8 @@ public class ObjectMapTest extends TestCase { HashObject( int h ){ hash = h; } - public int hashCode(){ + @Override + public int hashCode(){ return hash; } final public int hash; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java index 44e607345d4..37fd120e2f2 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java @@ -28,7 +28,7 @@ import org.eclipse.cdt.core.parser.tests.scanner.ScannerTestSuite; public class ParserTestSuite extends TestCase { public static Test suite() { TestSuite suite= new TestSuite(ParserTestSuite.class.getName()); - suite.addTestSuite(ArrayUtilsTest.class); + suite.addTestSuite(ArrayUtilTest.class); suite.addTestSuite(CharArrayUtilsTest.class); suite.addTestSuite(SegmentMatcherTest.class); suite.addTestSuite(ContentAssistMatcherFactoryTest.class); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CSpecTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CSpecTest.java index 817ec7c74fd..5351512e021 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CSpecTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CSpecTest.java @@ -1204,7 +1204,7 @@ public class AST2CSpecTest extends AST2SpecBaseTest { buffer.append("// a is a pointer to a VLA with n*m+300 elements\n"); //$NON-NLS-1$ buffer.append("a[i][j] += x;\n"); //$NON-NLS-1$ buffer.append("}\n"); - String code = buffer.toString(); //$NON-NLS-1$ + String code = buffer.toString(); // no valid c++ code parse(code, ParserLanguage.C, true, 0); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java index 02698c23363..8aa20c65a32 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2FileBasePluginTest.java @@ -102,7 +102,8 @@ public class AST2FileBasePluginTest extends TestCase { } } - protected void tearDown() throws Exception { + @Override + protected void tearDown() throws Exception { if( project == null || !project.exists() ) return; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java index d9353f9d176..6044bae340e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2KnRTests.java @@ -69,7 +69,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testSimpleKRCTest1() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(char x);\n" ); //$NON-NLS-1$ buffer.append( "int f(x) char x;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ @@ -104,7 +104,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testSimpleKRCTest2() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f();\n" ); //$NON-NLS-1$ buffer.append( "int f(x) char x;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ @@ -135,7 +135,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testSimpleKRCTest3() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int const *f();\n" ); //$NON-NLS-1$ buffer.append( "int const *f(x) char x;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ @@ -158,7 +158,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRC_1() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int isroot (x, y) /* comment */ \n" ); //$NON-NLS-1$ buffer.append( "int x;\n" ); //$NON-NLS-1$ buffer.append( "int y;\n" ); //$NON-NLS-1$ @@ -204,7 +204,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCWithTypes() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "typedef char c;\n" ); //$NON-NLS-1$ buffer.append( "int isroot (c);\n" ); //$NON-NLS-1$ buffer.append( "int isroot (x) \n" ); //$NON-NLS-1$ @@ -258,7 +258,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCProblem1() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(x) char\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false ); @@ -268,7 +268,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCProblem2() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int i=0;\n" ); //$NON-NLS-1$ buffer.append( "int f(x) i++;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ @@ -279,7 +279,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCProblem3() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(x) char y;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false ); @@ -304,7 +304,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCProblem4() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(x,y,z) char x,y,z; int a;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false ); @@ -354,7 +354,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRCProblem5() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(x) char x,a;\n" ); //$NON-NLS-1$ buffer.append( "{ return x == 0; }\n" ); //$NON-NLS-1$ IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true, false ); @@ -380,7 +380,7 @@ public class AST2KnRTests extends AST2BaseTest { public void testKRC_monop_cards1() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "#ifdef __STDC__\n" ); //$NON-NLS-1$ buffer.append( "#define __P(x) x\n" ); //$NON-NLS-1$ buffer.append( "#else\n" ); //$NON-NLS-1$ @@ -505,7 +505,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRC_monop_cards2() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int\n" ); //$NON-NLS-1$ buffer.append( "getinp(prompt, list)\n" ); //$NON-NLS-1$ buffer.append( " const char *prompt, *const list[];\n" ); //$NON-NLS-1$ @@ -547,7 +547,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRC_getParametersOrder() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "int f(a, b) int b,a;{}\n" ); //$NON-NLS-1$ IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C, true ); @@ -562,7 +562,7 @@ public class AST2KnRTests extends AST2BaseTest { } public void testKRC_Ethereal_1() throws Exception { - StringBuffer buffer = new StringBuffer(); //$NON-NLS-1$ + StringBuffer buffer = new StringBuffer(); buffer.append( "struct symbol {\n" ); //$NON-NLS-1$ buffer.append( "int lambda;\n};\n" ); //$NON-NLS-1$ buffer.append( "struct lemon {\n" ); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java index 625903f4f45..a7b15fea811 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CharArrayMapTest.java @@ -36,6 +36,7 @@ public class CharArrayMapTest extends TestCase { this.length = length; this.start = start; } + @Override public String toString() { return new String(chars, start, length); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CodeReaderCacheTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CodeReaderCacheTest.java index bebcce9430b..e17d7fd1e6a 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CodeReaderCacheTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CodeReaderCacheTest.java @@ -57,6 +57,7 @@ public class CodeReaderCacheTest extends CDOMBaseTest { this.code = code; } + @Override protected IStatus run(IProgressMonitor monitor) { while(!monitor.isCanceled()) { try { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java index b3a79a819d1..a196166f145 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMFileBasePluginTest.java @@ -99,7 +99,8 @@ public class DOMFileBasePluginTest extends TestCase { } } - protected void tearDown() throws Exception { + @Override + protected void tearDown() throws Exception { if( project == null || !project.exists() ) return; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java index 82846d56284..8fea36b2b9a 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java @@ -142,11 +142,13 @@ public class DOMLocationInclusionTests extends AST2FileBasePluginTest { } - public IScannerInfo getScannerInfo() { + @Override + public IScannerInfo getScannerInfo() { return info; } - public String getParserDialect() { + @Override + public String getParserDialect() { return dialect; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java index 2c2aa12a08c..eb7eb48b99c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMSearchUtil.java @@ -207,10 +207,10 @@ public class DOMSearchUtil { names = tu.getDefinitionsInAST(binding); } else if (limitTo == ALL_OCCURRENCES){ names = tu.getDeclarationsInAST(binding); - names = (IASTName[])ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding)); + names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding)); } else { // assume ALL names = tu.getDeclarationsInAST(binding); - names = (IASTName[])ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding)); + names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding)); } return names; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java index b3c890aa6e5..3781b3dcf99 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ImageLocationTests.java @@ -116,6 +116,7 @@ public class ImageLocationTests extends AST2BaseTest { { shouldVisitNames= true; } + @Override public int visit(IASTName name) { result[0]= name; return PROCESS_ABORT; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TestLexerLog.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TestLexerLog.java index 8581196dbbf..9be07b6f987 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TestLexerLog.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/TestLexerLog.java @@ -24,10 +24,12 @@ public class TestLexerLog implements ILexerLog { fInput= input; } + @Override public void handleComment(boolean isBlockComment, int offset, int endOffset) { fComments.add(fInput.substring(offset, endOffset)); } + @Override public void handleProblem(int problemID, char[] arg, int offset, int endOffset) { fProblems.add(createString(problemID, new String(arg))); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java index f871735c6fa..be9e1b6f112 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/prefix/CompletionTestBase.java @@ -114,6 +114,7 @@ public class CompletionTestBase extends BaseTestCase { } private static class BindingsComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { IBinding b1 = (IBinding)o1; IBinding b2 = (IBinding)o2; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteBaseTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteBaseTest.java index aa2db5ed3e9..150d0307a45 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteBaseTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/RewriteBaseTest.java @@ -93,6 +93,7 @@ public abstract class RewriteBaseTest extends BaseTestFramework implements ILogL super.tearDown(); } + @Override public void logging(IStatus status, String plugin) { Throwable ex = status.getException(); StringBuilder stackTrace = new StringBuilder(); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/append/ExpressionTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/append/ExpressionTest.java index fe2e6e295be..3949ebe1464 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/append/ExpressionTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/changegenerator/append/ExpressionTest.java @@ -51,7 +51,7 @@ public class ExpressionTest extends ChangeGeneratorTest { expressionList.getExpressions(); CPPASTIdExpression idExpression = new CPPASTIdExpression(new CPPASTName("c".toCharArray())); CPPASTBinaryExpression binEx = new CPPASTBinaryExpression(IASTBinaryExpression.op_assign, - idExpression, new CPPASTLiteralExpression(0, "9".toCharArray())); //$NON-NLS-1$ //$NON-NLS-2$ + idExpression, new CPPASTLiteralExpression(0, "9".toCharArray())); //$NON-NLS-1$ ASTModification modification = new ASTModification(ASTModification.ModificationKind.APPEND_CHILD, expressionList, binEx, null); modStore.storeModification(null, modification); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java index afbdb321098..41eae83f14e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTest.java @@ -182,6 +182,7 @@ public class CommentHandlingTest extends RewriteBaseTest { } private final class NodeOffsetComparator implements Comparator { + @Override public int compare(IASTNode o1, IASTNode o2) { int offDif = o1.getFileLocation().getNodeOffset() - o2.getFileLocation().getNodeOffset(); if (offDif == 0) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java index 0eb83f788cf..409ff7bfe14 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/CommentHandlingTestSuite.java @@ -24,7 +24,7 @@ public class CommentHandlingTestSuite extends TestSuite { public static Test suite() throws Exception { TestSuite suite = new TestSuite(CommentHandlingTestSuite.class.getName()); suite.addTest(RewriteTester.suite("CommentTests", - "resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$ //$NON-NLS-2$ + "resources/rewrite/CommentHandlingTestSource.rts")); //$NON-NLS-1$ suite.addTestSuite(NodeCommentMapTest.class); return suite; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java index d12dfec2009..e6d7f3e2aa7 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/rewrite/comenthandler/NodeCommentMapTest.java @@ -128,23 +128,28 @@ public class NodeCommentMapTest extends TestCase { private class Comment extends ASTNode implements IASTComment { private char[] comment; + @Override public char[] getComment() { return comment; } + @Override public void setComment(char[] comment) { this.comment = comment; } // not used + @Override public boolean isBlockComment() { return false; } + @Override public IASTNode copy() { return null; } + @Override public IASTNode copy(CopyStyle style) { return null; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java index ed65bacc85c..2c177dd0a6b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/LocationMapTests.java @@ -62,24 +62,31 @@ public class LocationMapTests extends BaseTestCase { fOffset= offset; fEndOffset= endOffset; } + @Override public int getEndingLineNumber() { return 0; } + @Override public String getFileName() { return fFile; } + @Override public int getNodeLength() { return fEndOffset-fOffset; } + @Override public int getNodeOffset() { return fOffset; } + @Override public int getStartingLineNumber() { return 0; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PortedScannerTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PortedScannerTests.java index 80c86256596..4862269c852 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PortedScannerTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/PortedScannerTests.java @@ -130,6 +130,7 @@ public class PortedScannerTests extends PreprocessorTestsBase { System.arraycopy(v, 0, values, 0, length); } + @Override public String toString() { StringBuffer s = new StringBuffer(); for (int i = 0; i < length; ++i) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/TestMacro.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/TestMacro.java index c2440065db6..d3ca294ad45 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/TestMacro.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/TestMacro.java @@ -27,34 +27,42 @@ final class TestMacro implements IMacroBinding { fParams= params; } + @Override public char[] getExpansion() { return fExpansion.toCharArray(); } + @Override public boolean isFunctionStyle() { return fParams != null; } + @Override public ILinkage getLinkage() { return null; } + @Override public String getName() { return fName; } + @Override public char[] getNameCharArray() { return fName.toCharArray(); } + @Override public IScope getScope() throws DOMException { return null; } + @Override public Object getAdapter(Class adapter) { return null; } + @Override public char[][] getParameterList() { if (fParams == null) { return null; @@ -66,18 +74,22 @@ final class TestMacro implements IMacroBinding { return result; } + @Override public char[] getExpansionImage() { return getExpansion(); } + @Override public char[][] getParameterPlaceholderList() { return getParameterList(); } + @Override public boolean isDynamic() { return false; } + @Override public IBinding getOwner() { return null; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EmptyIndexFragment.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EmptyIndexFragment.java index 151109c0c80..f2bc149c12e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EmptyIndexFragment.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EmptyIndexFragment.java @@ -37,98 +37,119 @@ import org.eclipse.core.runtime.IProgressMonitor; * @since 4.0.1 */ public class EmptyIndexFragment implements IIndexFragment { + @Override public void acquireReadLock() throws InterruptedException {} + @Override public IIndexFragmentBinding adaptBinding(IBinding binding) { return null; } + @Override public IIndexFragmentBinding findBinding(IASTName astName) { return null; } + @Override public IIndexFragmentBinding[] findBindings(Pattern[] patterns, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexFragmentBinding[] findBindings(char[][] names, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexFragmentBinding[] findBindings(char[] name, boolean filescope, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexFragmentBinding[] findBindingsForPrefix(char[] prefix, boolean filescope, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexFragmentBinding[] findBindingsForContentAssist(char[] prefix, boolean filescope, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexMacro[] findMacros(char[] name, boolean isPrefix, boolean caseSensitive, IndexFilter filter, IProgressMonitor monitor) { return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY; } + @Override public IIndexFragmentInclude[] findIncludedBy(IIndexFragmentFile file) throws CoreException { return IIndexFragmentInclude.EMPTY_FRAGMENT_INCLUDES_ARRAY; } + @Override public IIndexFragmentName[] findNames(IBinding binding, int flags) { return IIndexFragmentName.EMPTY_NAME_ARRAY; } + @Override public IIndexFragmentBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor) { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public long getCacheHits() { return 0; } + @Override public long getCacheMisses() { return 0; } + @Override @Deprecated public IIndexFragmentFile getFile(int linkageID, IIndexFileLocation location) throws CoreException { return null; } + @Override public IIndexFragmentFile getFile(int linkageID, IIndexFileLocation location, ISignificantMacros sigMacros) throws CoreException { return null; } + @Override public IIndexFragmentFile[] getFiles(int linkageID, IIndexFileLocation location) throws CoreException { return IIndexFragmentFile.EMPTY_ARRAY; } + @Override public IIndexFragmentFile[] getFiles(IIndexFileLocation location) throws CoreException { return IIndexFragmentFile.EMPTY_ARRAY; } + @Override public long getLastWriteAccess() { return 0; } + @Override public IIndexLinkage[] getLinkages() { return IIndexLinkage.EMPTY_INDEX_LINKAGE_ARRAY; } + @Override public String getProperty(String key) throws CoreException { if(IIndexFragment.PROPERTY_FRAGMENT_ID.equals(key)) { return "org.eclipse.cdt.internal.core.index.EmptyIndexFragment"; //$NON-NLS-1$ @@ -142,32 +163,41 @@ public class EmptyIndexFragment implements IIndexFragment { return null; } + @Override public void releaseReadLock() {} + @Override public boolean hasWaitingReaders() { return false; } + @Override public void resetCacheCounters() {} + @Override public IIndexFragmentFileSet createFileSet() { return null; } + @Override public IIndexFragmentFile[] getAllFiles() { return IIndexFragmentFile.EMPTY_ARRAY; } + @Override public Object getCachedResult(Object key) { return null; } + @Override public Object putCachedResult(Object key, Object value, boolean replace) { return value; } + @Override public void clearResultCache() { } + @Override public IIndexScope[] getInlineNamespaces() { return IIndexScope.EMPTY_INDEX_SCOPE_ARRAY; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/FakeIndexer.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/FakeIndexer.java index 4aa6ca7c7e6..8b617cffea6 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/FakeIndexer.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/FakeIndexer.java @@ -18,11 +18,13 @@ import org.eclipse.cdt.internal.core.pdom.indexer.AbstractPDOMIndexer; public class FakeIndexer extends AbstractPDOMIndexer { static final String ID = "org.eclipse.cdt.core.tests.FakeIndexer"; + @Override public IPDOMIndexerTask createTask(ITranslationUnit[] added, ITranslationUnit[] changed, ITranslationUnit[] removed) { return null; } + @Override public String getID() { return ID; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java index d48ce0825b2..080e8a99f1b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java @@ -115,6 +115,7 @@ public class IndexIncludeTest extends IndexTestBase { waitForIndexer(); ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { file.setContents(new ByteArrayInputStream("int included; int CONTEXT;\n".getBytes()), false, false, npm()); file.setLocalTimeStamp(timestamp + 1000); @@ -501,6 +502,7 @@ public class IndexIncludeTest extends IndexTestBase { h1Contents.replace(pos, pos + "int".length(), "float"); } ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { h1.setContents(new ByteArrayInputStream(h1Contents.toString().getBytes()), false, false, npm()); h1.setLocalTimeStamp(timestamp + 1000); @@ -582,6 +584,7 @@ public class IndexIncludeTest extends IndexTestBase { final long t1= System.currentTimeMillis(); final String changedContents = contents[4].toString(); ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { h1.setContents(new ByteArrayInputStream(changedContents.getBytes()), false, false, npm()); h1.setLocalTimeStamp(t1 + 1000); @@ -606,6 +609,7 @@ public class IndexIncludeTest extends IndexTestBase { // Change h1.h back to the original state without the pragma-once semantics. final long t2= System.currentTimeMillis(); ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { h1.setContents(new ByteArrayInputStream(h1Contents.toString().getBytes()), false, false, npm()); h1.setLocalTimeStamp(t2 + 2000); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java index 89fdf310f66..f1a9e63b3aa 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexListenerTest.java @@ -58,6 +58,7 @@ public class IndexListenerTest extends BaseTestCase { assertTrue(im.joinIndexer(10000, npm())); IIndexerStateListener listener = new IIndexerStateListener() { + @Override public void indexChanged(IIndexerStateEvent event) { synchronized (mutex) { if (event.indexerIsIdle()) { @@ -100,6 +101,7 @@ public class IndexListenerTest extends BaseTestCase { assertTrue(im.joinIndexer(10000, npm())); IIndexChangeListener listener = new IIndexChangeListener() { + @Override public void indexChanged(IIndexChangeEvent event) { if (!event.getFilesWritten().isEmpty()) { synchronized (mutex) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java index 34a600877e2..74785d27b5f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexProviderManagerTest.java @@ -211,9 +211,11 @@ public class IndexProviderManagerTest extends IndexTestBase { new MockPDOM("contentID.bar", "91"), new MockPDOM("contentID.baz", "89") }; + @Override public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) { return fragments; } + @Override public boolean providesFor(ICProject project) throws CoreException { return true; } @@ -223,9 +225,11 @@ public class IndexProviderManagerTest extends IndexTestBase { new MockPDOM("contentID.baz", "90"), new MockPDOM("contentID.contentA", "38"), }; + @Override public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) { return fragments; } + @Override public boolean providesFor(ICProject project) throws CoreException { return true; } @@ -267,9 +271,11 @@ public class IndexProviderManagerTest extends IndexTestBase { new MockPDOM("contentID.bar", "91"), new MockPDOM("contentID.baz", "89") }; + @Override public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) { return fragments; } + @Override public boolean providesFor(ICProject project) throws CoreException { return true; } @@ -278,9 +284,11 @@ public class IndexProviderManagerTest extends IndexTestBase { IIndexFragment[] fragments= new IIndexFragment[] { new MockPDOM("contentID.contentA", "41"), }; + @Override public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) { return fragments; } + @Override public boolean providesFor(ICProject project) throws CoreException { return true; } @@ -520,6 +528,7 @@ class MockStateIndexProvider implements IIndexProvider { this.targetProject = cproject; } + @Override public boolean providesFor(ICProject cproject) throws CoreException { return this.targetProject.equals(cproject); } @@ -542,6 +551,7 @@ class MockStateIndexFragmentProvider extends MockStateIndexProvider implements I } } + @Override public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) throws CoreException { int index = MockState.states.indexOf(config.getId()); index = invert ? (fragments.length-1)-index : index; @@ -564,145 +574,199 @@ class MockConfig implements ICConfigurationDescription { this.project= project; } + @Override public String getId() { return id; } + @Override public ICConfigExtensionReference create(String extensionPoint, String extension) throws CoreException { return null; } + @Override public ICExternalSetting createExternalSetting(String[] languageIDs, String[] contentTypeIds, String[] extensions, ICSettingEntry[] entries) throws WriteAccessException { return null; } + @Override public ICFileDescription createFileDescription(IPath path, ICResourceDescription base) throws CoreException, WriteAccessException { return null; } + @Override public ICFolderDescription createFolderDescription(IPath path, ICFolderDescription base) throws CoreException, WriteAccessException { return null; } + @Override public ICConfigExtensionReference[] get(String extensionPointID) { return null; } + @Override public ICBuildSetting getBuildSetting() { return null; } + @Override public String getBuildSystemId() { return null; } + @Override public ICdtVariablesContributor getBuildVariablesContributor() { return null; } + @Override public CConfigurationData getConfigurationData() { return null; } + @Override public String getDescription() { return null; } + @Override public ICExternalSetting[] getExternalSettings() { return null; } + @Override public ICFileDescription[] getFileDescriptions() { return null; } + @Override public ICFolderDescription[] getFolderDescriptions() { return null; } + @Override public ICProjectDescription getProjectDescription() { return CoreModel.getDefault().getProjectDescription(project); } + @Override public Map getReferenceInfo() { return null; } + @Override public ICResourceDescription getResourceDescription(IPath path, boolean exactPath) { return null; } + @Override public ICResourceDescription[] getResourceDescriptions() { return null; } + @Override public ICFolderDescription getRootFolderDescription() {return null;} + @Override public Object getSessionProperty(QualifiedName name) {return null;} + @Override public ICSourceEntry[] getSourceEntries() {return null;} + @Override public ICTargetPlatformSetting getTargetPlatformSetting() {return null;} + @Override public boolean isActive() {return false;} + @Override public boolean isModified() {return false;} + @Override public boolean isPreferenceConfiguration() {return false;} + @Override public void remove(ICConfigExtensionReference ext) throws CoreException {} + @Override public void remove(String extensionPoint) throws CoreException {} + @Override public void removeExternalSetting(ICExternalSetting setting) throws WriteAccessException {} + @Override public void removeExternalSettings() throws WriteAccessException {} + @Override public void removeResourceDescription(ICResourceDescription des) throws CoreException, WriteAccessException {} + @Override public void setActive() throws WriteAccessException {} + @Override public void setConfigurationData(String buildSystemId, CConfigurationData data) throws WriteAccessException {} + @Override public void setDescription(String des) throws WriteAccessException {} + @Override public void setName(String name) throws WriteAccessException {} + @Override public void setReferenceInfo(Map refs) throws WriteAccessException {} + @Override public void setSessionProperty(QualifiedName name, Object value) {} + @Override public void setSourceEntries(ICSourceEntry[] entries) throws CoreException, WriteAccessException {} + @Override public ICSettingObject[] getChildSettings() {return null;} + @Override public ICConfigurationDescription getConfiguration() {return null;} + @Override public String getName() {return null;} + @Override public ICSettingContainer getParent() {return null;} + @Override public int getType() {return 0;} + @Override public boolean isReadOnly() {return false;} + @Override public boolean isValid() {return false;} + @Override public ICStorageElement getStorage(String id, boolean create) throws CoreException { return null; } + @Override public ICStorageElement importStorage(String id, ICStorageElement storage) { return null; } + @Override public void removeStorage(String id) throws CoreException { } + @Override public ICLanguageSetting getLanguageSettingForFile(IPath path, boolean ignoreExludeStatus) { return null; } + @Override public String[] getExternalSettingsProviderIds() { return null; } + @Override public void setExternalSettingsProviderIds(String[] ids) {} + @Override public void updateExternalSettingsProviders(String[] ids) {} + @Override public ICSourceEntry[] getResolvedSourceEntries() { return null; } + @Override public CConfigurationStatus getConfigurationStatus() { return CConfigurationStatus.CFG_STATUS_OK; } + @Override public void setReadOnly(boolean readOnly, boolean keepModify) {} } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java index a9df49d0551..7d271b24d3d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexSearchTest.java @@ -291,6 +291,7 @@ public class IndexSearchTest extends IndexTestBase { PDOM pdom= (PDOM) ((CIndex) fIndex).getPrimaryFragments()[0]; pdom.accept(new IPDOMVisitor() { LinkedList stack= new LinkedList(); + @Override public boolean visit(IPDOMNode node) throws CoreException { if (!stack.isEmpty()) { Object last= stack.getLast(); @@ -301,6 +302,7 @@ public class IndexSearchTest extends IndexTestBase { stack.add(node); return true; } + @Override public void leave(IPDOMNode node) throws CoreException { assertEquals(stack.removeLast(), node); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java index c85dbceaff4..cbddce3c418 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexTestBase.java @@ -39,6 +39,7 @@ public class IndexTestBase extends BaseTestCase { final ICProject[] result= new ICProject[] {null}; final IWorkspace workspace = ResourcesPlugin.getWorkspace(); workspace.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { String name= "IndexTest_" + System.currentTimeMillis(); if (useCpp) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java index de8be49f708..aa802674ae6 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java @@ -101,6 +101,7 @@ public class TeamSharedIndexTest extends IndexTestBase { try { final IProject prjHandle= workspace.getRoot().getProject(prjName); workspace.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IProjectDescription desc= IDEWorkbenchPlugin.getPluginWorkspace().newProjectDescription(prjName); prjHandle.create(desc, npm()); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/BTreeExpensiveTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/BTreeExpensiveTests.java index 0ddb813b1dc..bbf98f28d1b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/BTreeExpensiveTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/BTreeExpensiveTests.java @@ -31,6 +31,7 @@ public class BTreeExpensiveTests extends BTreeTests { } // @Override + @Override public void testInsertion() throws Exception { super.testInsertion(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java index d6e88bb1175..26c9336fb5c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CCompositeTypeTests.java @@ -38,6 +38,7 @@ public class CCompositeTypeTests extends PDOMTestBase { return new TestSuite(CCompositeTypeTests.class); } + @Override protected void setUp() throws Exception { CCompositeTypeTests foo = null; @@ -46,6 +47,7 @@ public class CCompositeTypeTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java index b4e5fa5af28..6bfb4bcb8a4 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPCompositeTypeTests.java @@ -32,6 +32,7 @@ public class CPPCompositeTypeTests extends PDOMTestBase { return new TestSuite(CPPCompositeTypeTests.class); } + @Override protected void setUp() throws Exception { CPPCompositeTypeTests foo = null; @@ -40,6 +41,7 @@ public class CPPCompositeTypeTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java index 097d16b70da..dbe1cf3855f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPFieldTests.java @@ -39,12 +39,14 @@ public class CPPFieldTests extends PDOMTestBase { return suite(CPPFieldTests.class); } + @Override protected void setUp() throws Exception { project = createProject("fieldTests"); pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project); pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPVariableTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPVariableTests.java index 47221cfaa46..31402f9bd3c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPVariableTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CPPVariableTests.java @@ -35,12 +35,14 @@ public class CPPVariableTests extends PDOMTestBase { return suite(CPPVariableTests.class); } + @Override protected void setUp() throws Exception { project = createProject("variableTests"); pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project); pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java index eec3085dea1..9d40a911b6f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/CVariableTests.java @@ -35,12 +35,14 @@ public class CVariableTests extends PDOMTestBase { return suite(CVariableTests.class); } + @Override protected void setUp() throws Exception { project = createProject("variableTests"); pdom = (PDOM) CCoreInternals.getPDOMManager().getPDOM(project); pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java index 0b8bee5309e..a731a3d927d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java @@ -34,6 +34,7 @@ public class DBPropertiesTests extends BaseTestCase { return suite(DBPropertiesTests.class); } + @Override protected void setUp() throws Exception { dbLoc = File.createTempFile("test", "db"); dbLoc.deleteOnExit(); @@ -41,6 +42,7 @@ public class DBPropertiesTests extends BaseTestCase { db.setExclusiveLock(); } + @Override protected void tearDown() throws Exception { db.close(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DefDeclTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DefDeclTests.java index da46316999e..6a9f23c15a1 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DefDeclTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DefDeclTests.java @@ -59,6 +59,7 @@ public class DefDeclTests extends PDOMTestBase { return suite(DefDeclTests.class); } + @Override protected void setUp() throws Exception { String requiredName = "defDeclTests"; cproject = createProject(requiredName); @@ -67,6 +68,7 @@ public class DefDeclTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (cproject != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java index 6e352ecad5d..fc444a00c29 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/EnumerationTests.java @@ -40,6 +40,7 @@ public class EnumerationTests extends PDOMTestBase { return suite(EnumerationTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { ICProject project = createProject("enumerationTests"); @@ -48,6 +49,7 @@ public class EnumerationTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); } @@ -63,6 +65,7 @@ public class EnumerationTests extends PDOMTestBase { assertEquals(3, enumerators.length); // Enumerators are returned in arbitrary order. Sort them to make checking easier. Arrays.sort(enumerators, new Comparator() { + @Override public int compare(IEnumerator o1, IEnumerator o2) { return o1.getName().compareTo(o2.getName()); } @@ -101,6 +104,7 @@ public class EnumerationTests extends PDOMTestBase { assertEquals(3, enumerators.length); // Enumerators are returned in arbitrary order. Sort them to make checking easier. Arrays.sort(enumerators, new Comparator() { + @Override public int compare(IEnumerator o1, IEnumerator o2) { return o1.getName().compareTo(o2.getName()); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java index 7cf506ad56a..33d48658c23 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java @@ -41,6 +41,7 @@ public class FilesOnReindexTests extends PDOMTestBase { return suite(FilesOnReindexTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { project = createProject("filesOnReindex"); @@ -49,6 +50,7 @@ public class FilesOnReindexTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java index be8784315ae..8fc8154b2dc 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/IncludesTests.java @@ -36,6 +36,7 @@ public class IncludesTests extends PDOMTestBase { return suite(IncludesTests.class); } + @Override protected void setUp() throws Exception { if (index == null) { project = createProject("includesTests"); @@ -44,6 +45,7 @@ public class IncludesTests extends PDOMTestBase { index.acquireReadLock(); } + @Override protected void tearDown() throws Exception { index.releaseReadLock(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java index 77318d7ebb7..fe82a39ecc8 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/NamespaceTests.java @@ -47,6 +47,7 @@ public class NamespaceTests extends PDOMTestBase { return suite(NamespaceTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { project = createProject("namespaceTests", true); @@ -55,6 +56,7 @@ public class NamespaceTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); if (project != null) { diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java index 4544da09808..e13122f15a5 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinCommonHeaderTests.java @@ -38,6 +38,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { return suite(OverloadsWithinCommonHeaderTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { ICProject project = createProject("overloadsWithinCommonHeader", true); @@ -46,6 +47,7 @@ public class OverloadsWithinCommonHeaderTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java index caf9cf9fe9c..f734f538790 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/OverloadsWithinSingleTUTests.java @@ -36,6 +36,7 @@ public class OverloadsWithinSingleTUTests extends PDOMTestBase { return suite(OverloadsWithinSingleTUTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { ICProject project = createProject("overloadsWithinSingleTU"); @@ -44,6 +45,7 @@ public class OverloadsWithinSingleTUTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMPrettyPrinter.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMPrettyPrinter.java index 97d37860af1..421b5ad8d59 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMPrettyPrinter.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMPrettyPrinter.java @@ -31,6 +31,7 @@ public class PDOMPrettyPrinter implements IPDOMVisitor { StringBuilder indent = new StringBuilder(); final String step = " "; //$NON-NLS-1$ + @Override public void leave(IPDOMNode node) throws CoreException { // if (node instanceof PDOMCPPClassTemplate) { // ((PDOMCPPClassTemplate) node).specializationsAccept(this); @@ -39,6 +40,7 @@ public class PDOMPrettyPrinter implements IPDOMVisitor { indent.setLength(indent.length() - step.length()); } + @Override public boolean visit(IPDOMNode node) throws CoreException { indent.append(step); StringBuilder sb= new StringBuilder(); @@ -78,10 +80,12 @@ public class PDOMPrettyPrinter implements IPDOMVisitor { final PDOMLinkage linkage = pdom.getLinkage(linkageID); if (linkage != null) { linkage.getIndex().accept(new IBTreeVisitor() { + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { if (record == 0) return false; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java index 09464883c19..8ca7b751074 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java @@ -82,14 +82,17 @@ public class PDOMProviderTests extends PDOMTestBase { IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( new IReadOnlyPDOMProvider() { + @Override public IPDOMDescriptor[] getDescriptors( ICConfigurationDescription config) { return new IPDOMDescriptor[] { new IPDOMDescriptor() { + @Override public IIndexLocationConverter getIndexLocationConverter() { return new URIRelativeLocationConverter(baseURI); } + @Override public IPath getLocation() { return new Path(tempPDOM.getAbsolutePath()); } @@ -97,6 +100,7 @@ public class PDOMProviderTests extends PDOMTestBase { } }; } + @Override public boolean providesFor(ICProject project) throws CoreException { return cproject2.equals(project); @@ -161,14 +165,17 @@ public class PDOMProviderTests extends PDOMTestBase { IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( new IReadOnlyPDOMProvider() { + @Override public IPDOMDescriptor[] getDescriptors( ICConfigurationDescription config) { return new IPDOMDescriptor[] { new IPDOMDescriptor() { + @Override public IIndexLocationConverter getIndexLocationConverter() { return new URIRelativeLocationConverter(baseURI); } + @Override public IPath getLocation() { return new Path(tempPDOM.getAbsolutePath()); } @@ -176,6 +183,7 @@ public class PDOMProviderTests extends PDOMTestBase { } }; } + @Override public boolean providesFor(ICProject project) throws CoreException { return cproject2.equals(project) || cproject3.equals(project); @@ -278,14 +286,17 @@ public class PDOMProviderTests extends PDOMTestBase { IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( new IReadOnlyPDOMProvider() { + @Override public IPDOMDescriptor[] getDescriptors( ICConfigurationDescription config) { return new IPDOMDescriptor[] { new IPDOMDescriptor() { + @Override public IIndexLocationConverter getIndexLocationConverter() { return new URIRelativeLocationConverter(baseURI); } + @Override public IPath getLocation() { return new Path(tempPDOM.getAbsolutePath()); } @@ -293,6 +304,7 @@ public class PDOMProviderTests extends PDOMTestBase { } }; } + @Override public boolean providesFor(ICProject project) throws CoreException { return cproject2.equals(project); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java index 36e223cfade..c642f470b1e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java @@ -45,6 +45,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; */ public class PDOMSearchTest extends PDOMTestBase { final Comparator BINDING_COMPARATOR = new Comparator() { + @Override public int compare(IBinding o1, IBinding o2) { return o1.getName().compareTo(o2.getName()); }}; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java index 32a8e6e03b6..404be910b5b 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMTestBase.java @@ -73,6 +73,7 @@ public class PDOMTestBase extends BaseTestCase { final File rootDir = CTestPlugin.getDefault().getFileInPlugin(rootPath.append(folderName)); final IWorkspace workspace = ResourcesPlugin.getWorkspace(); workspace.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { // Create the project ICProject cproject= cpp ? CProjectHelper.createCCProject(projectName, null, IPDOMManager.ID_NO_INDEXER) @@ -81,6 +82,7 @@ public class PDOMTestBase extends BaseTestCase { // Import the files at the root ImportOperation importOp = new ImportOperation(cproject.getProject().getFullPath(), rootDir, FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() { + @Override public String queryOverwrite(String pathString) { return IOverwriteQuery.ALL; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java index 621e7a4a75e..290c3d70e6e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/TypesTests.java @@ -42,6 +42,7 @@ public class TypesTests extends PDOMTestBase { return suite(TypesTests.class); } + @Override protected void setUp() throws Exception { if (pdom == null) { ICProject project = createProject("types"); @@ -50,6 +51,7 @@ public class TypesTests extends PDOMTestBase { pdom.acquireReadLock(); } + @Override protected void tearDown() throws Exception { pdom.releaseReadLock(); } diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java index 2e3c268a080..7df855cce1c 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java @@ -103,6 +103,7 @@ abstract public class BaseTestFramework extends TestCase { initProject(); } + @Override protected void tearDown() throws Exception { if (project == null || !project.exists()) return; diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java index 4679aa62282..f77515e5870 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTest.java @@ -45,7 +45,8 @@ public class FailingTest extends TestCase { /* (non-Javadoc) * @see junit.framework.Test#run(junit.framework.TestResult) */ - public void run( TestResult result ) { + @Override + public void run( TestResult result ) { result.startTest( this ); TestResult r = new TestResult(); diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AISResultPrinter.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AISResultPrinter.java index 3aab92c4ac0..95a5a413dea 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AISResultPrinter.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AISResultPrinter.java @@ -40,6 +40,7 @@ public class AISResultPrinter extends ResultPrinter { /* (non-Javadoc) * @see junit.framework.TestListener#addFailure(junit.framework.Test, junit.framework.AssertionFailedError) */ + @Override public void addFailure(Test test, AssertionFailedError t) { super.addFailure(test, t); getWriter().print("---> "); @@ -48,6 +49,7 @@ public class AISResultPrinter extends ResultPrinter { /* (non-Javadoc) * @see junit.framework.TestListener#addError(junit.framework.Test, java.lang.Throwable) */ + @Override public void addError(Test test, Throwable t) { super.addError(test, t); getWriter().print("---> "); @@ -56,6 +58,7 @@ public class AISResultPrinter extends ResultPrinter { /* (non-Javadoc) * @see junit.framework.TestListener#startTest(junit.framework.Test) */ + @Override public void startTest(Test test) { getWriter().print("."); } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java index 62381c57aad..f26a0c01e9b 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CElementDecorator.java @@ -23,6 +23,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator /* * @see ILabelDecorator#decorateImage(Image, Object) */ + @Override public Image decorateImage(Image image, Object element) { return null; } @@ -30,6 +31,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator /* * @see ILabelDecorator#decorateText(String, Object) */ + @Override public String decorateText(String text, Object element) { return text + "*"; } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java index b1f087b304d..f183bcd36b6 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java @@ -67,6 +67,7 @@ import org.osgi.framework.Bundle; public class CProjectHelper { private final static IOverwriteQuery OVERWRITE_QUERY= new IOverwriteQuery() { + @Override public String queryOverwrite(String file) { return ALL; } @@ -84,6 +85,7 @@ public class CProjectHelper { final ICProject newProject[] = new ICProject[1]; ws.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspaceRoot root = ws.getRoot(); IProject project = root.getProject(projectName); @@ -165,6 +167,7 @@ public class CProjectHelper { final String finalCfgProviderId = cfgProviderId; ws.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspaceRoot root = ws.getRoot(); IProject project = root.getProject(projectName); @@ -219,6 +222,7 @@ public class CProjectHelper { final ICProject newProject[] = new ICProject[1]; ws.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { ICProject cproject = createCProject(projectName, binFolderName, indexerID); if (!cproject.getProject().hasNature(CCProjectNature.CC_NATURE_ID)) { diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CTestSetup.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CTestSetup.java index c26b93f1fd8..c00f17aa104 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CTestSetup.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CTestSetup.java @@ -21,13 +21,16 @@ public class CTestSetup extends TestSetup { * @deprecated * Not needed anymore. No added value */ + @Deprecated public CTestSetup(Test test) { super(test); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/Main.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/Main.java index 8bee56345cb..2c8057143e2 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/Main.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/Main.java @@ -314,6 +314,7 @@ protected String searchForPlugins(String start) { */ protected String searchForBoot(String start) { FileFilter filter = new FileFilter() { + @Override public boolean accept(File candidate) { return candidate.getName().startsWith(PI_BOOT); } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestProject.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestProject.java index cc26d38f6a2..0922a271646 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestProject.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestProject.java @@ -17,10 +17,12 @@ import org.eclipse.core.runtime.CoreException; public class TestProject implements ICOwner { + @Override public void configure(ICDescriptor cDescriptor) throws CoreException { cDescriptor.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, TestScannerProvider.SCANNER_ID); } + @Override public void update(ICDescriptor cDescriptor, String extensionID) throws CoreException { if ( extensionID.equals(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID)) { cDescriptor.create(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID, TestScannerProvider.SCANNER_ID); diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerInfo.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerInfo.java index 371eff23ca6..ab606fcd606 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerInfo.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerInfo.java @@ -28,19 +28,24 @@ public class TestScannerInfo implements IExtendedScannerInfo { fIncludeFiles= includeFiles; fMacroFiles= macroFiles; } + @Override public Map getDefinedSymbols() { return EMPTY_MAP; } + @Override public String[] getIncludePaths() { return fIncludes == null ? EMPTY : fIncludes; } + @Override public String[] getIncludeFiles() { return fIncludeFiles == null ? EMPTY: fIncludeFiles; } + @Override public String[] getLocalIncludePath() { return null; } + @Override public String[] getMacroFiles() { return fMacroFiles == null ? EMPTY: fMacroFiles; } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerProvider.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerProvider.java index 931f702127d..b6cb6705ec2 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerProvider.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/TestScannerProvider.java @@ -28,13 +28,16 @@ public class TestScannerProvider extends AbstractCExtension implements IScannerI sIncludes= sIncludeFiles= sMacroFiles= null; } + @Override public IScannerInfo getScannerInformation(IResource resource) { return new TestScannerInfo(sIncludes, sIncludeFiles, sMacroFiles); } + @Override public void subscribe(IResource resource, IScannerInfoChangeListener listener) { } + @Override public void unsubscribe(IResource resource, IScannerInfoChangeListener listener) { } } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/AccessibilityTestPass.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/AccessibilityTestPass.java index 3f11e0c0503..6a8af1801cf 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/AccessibilityTestPass.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/AccessibilityTestPass.java @@ -20,24 +20,28 @@ public class AccessibilityTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Accessibility"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the accessibility of the dialogs."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Accessibility"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) all widgets are accessible by tabbing."); @@ -52,6 +56,7 @@ public class AccessibilityTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "Some widgets aren't accessible by tabbing."; @@ -64,12 +69,14 @@ public class AccessibilityTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the accessibility of the dialog acceptable?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_ACCESS; } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/ExpectedStringsTests.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/ExpectedStringsTests.java index 2f00f263876..615c4c707c6 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/ExpectedStringsTests.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/ExpectedStringsTests.java @@ -35,7 +35,8 @@ public class ExpectedStringsTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() { + @Override + protected void setUp() { } @@ -45,7 +46,8 @@ public class ExpectedStringsTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { // release resources here and clean-up } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java index 637c620fd2d..c445bb9bc41 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FailureDialog.java @@ -41,6 +41,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Window. */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText("Dialog Test Failed"); @@ -48,6 +49,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, "&OK", true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -55,6 +57,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { // page group Composite composite = (Composite)super.createDialogArea(parent); @@ -75,6 +78,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void okPressed() { _log = _text.getText(); super.okPressed(); @@ -102,6 +106,7 @@ public class FailureDialog extends Dialog { * Returns a string representation of this class which * the text contained in the input area of the dialog. */ + @Override public String toString() { return getText(); } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FocusTestPass.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FocusTestPass.java index 1e074aef7d7..5b6736f74dd 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FocusTestPass.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/FocusTestPass.java @@ -22,24 +22,28 @@ public class FocusTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Initial Focus"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the initial focus of the dialogs."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Initial Focus"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) the initial focus is appropriate."); @@ -50,6 +54,7 @@ public class FocusTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "The initial focus is inappropriate."; @@ -58,12 +63,14 @@ public class FocusTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the initial focus of the dialog correct?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_FOCUS; } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/SizingTestPass.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/SizingTestPass.java index fdf4c5a7426..f0ff4a4e675 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/SizingTestPass.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/SizingTestPass.java @@ -22,24 +22,28 @@ class SizingTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Sizing and Display"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the sizing and display of the dialogs and widgets."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Sizing and Display"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) the correct dialog displays."); @@ -54,6 +58,7 @@ class SizingTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "The wrong dialog displayed."; @@ -66,12 +71,14 @@ class SizingTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the sizing and display of the dialog correct?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_SIZING; } diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/VerifyDialog.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/VerifyDialog.java index e3281f57dfc..c06e76ec45d 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/VerifyDialog.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/VerifyDialog.java @@ -73,6 +73,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Window. */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText("Dialog Verification"); @@ -81,6 +82,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { _yesButton = createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true); createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, false); @@ -88,6 +90,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void buttonPressed(int buttonId) { if (IDialogConstants.YES_ID == buttonId) { setReturnCode(IDialogConstants.YES_ID); @@ -102,6 +105,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { // top level composite Composite parentComposite = (Composite)super.createDialogArea(parent); @@ -144,6 +148,7 @@ public class VerifyDialog extends TitleAreaDialog { radio.setText( _dialogTests[i].label() ); final int testID = _dialogTests[i].getID(); radio.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TEST_TYPE = testID; initializeTest(); @@ -174,6 +179,7 @@ public class VerifyDialog extends TitleAreaDialog { } _checkList = new Button[checkListSize]; SelectionAdapter selectionAdapter = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkYesEnable(); } @@ -229,6 +235,7 @@ public class VerifyDialog extends TitleAreaDialog { * opening. Should use open(Dialog) instead. * */ + @Override public int open() { _failureText = "Testing dialog is required, use VerifyDialog::open(Dialog)"; return IDialogConstants.NO_ID; @@ -262,6 +269,7 @@ public class VerifyDialog extends TitleAreaDialog { _testDialog.getShell().setLocation(getShell().getSize().x + 1, 0); _testDialog.getShell().setSize(_testDialogSize); _testDialog.getShell().addShellListener(new ShellAdapter() { + @Override public void shellClosed(ShellEvent e) { e.doit = false; } @@ -306,6 +314,7 @@ public class VerifyDialog extends TitleAreaDialog { * In case the shell was closed by a means other than * the NO button. */ + @Override protected void handleShellCloseEvent() { handleFailure(); } diff --git a/core/org.eclipse.cdt.core/.settings/.api_filters b/core/org.eclipse.cdt.core/.settings/.api_filters index 10c87060341..bf5b479e6bf 100644 --- a/core/org.eclipse.cdt.core/.settings/.api_filters +++ b/core/org.eclipse.cdt.core/.settings/.api_filters @@ -1,17 +1,55 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java index 9b0e5c796d6..ba2a99528e9 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java @@ -46,6 +46,7 @@ public interface IQualifiedTypeName extends Comparable { public boolean equals(IQualifiedTypeName typeName); public boolean equalsIgnoreCase(IQualifiedTypeName typeName); + @Override public int compareTo(IQualifiedTypeName typeName); public int compareToIgnoreCase(IQualifiedTypeName typeName); } diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java index c7d2db1cacc..76c201a9858 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java @@ -162,10 +162,12 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { this(rhs.fqn, rhs.fileLocal, rhs.elementType, rhs.index, rhs.params, rhs.returnType, ref); } + @Override public int getCElementType() { return elementType; } + @Override public ICProject getEnclosingProject() { if(getResolvedReference()!=null) { IProject project = reference.getProject(); @@ -176,10 +178,12 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { return null; } + @Override public String getName() { return fqn[fqn.length-1]; } + @Override public IQualifiedTypeName getQualifiedTypeName() { return new QualifiedTypeName(fqn); } @@ -187,6 +191,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { /* * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getParameters() */ + @Override public String[] getParameters() { return params; } @@ -194,6 +199,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { /* * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getReturnType() */ + @Override public String getReturnType() { return returnType; } @@ -242,6 +248,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { return fileLocal != null; } + @Override public ITypeReference getResolvedReference() { if(reference==null) { if (elementType == ICElement.C_MACRO) { @@ -369,6 +376,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { return null; } + @Override public ITypeReference[] getReferences() { if (elementType == ICElement.C_MACRO) { return getMacroReferences(); @@ -472,6 +480,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void addDerivedReference(ITypeReference location) { throw new UnsupportedOperationException(); @@ -481,6 +490,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void addReference(ITypeReference location) { throw new UnsupportedOperationException(); @@ -490,6 +500,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean canSubstituteFor(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -499,6 +510,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean encloses(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -508,6 +520,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean exists() { throw new UnsupportedOperationException(); @@ -517,6 +530,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeReference[] getDerivedReferences() { throw new UnsupportedOperationException(); @@ -526,6 +540,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getEnclosedTypes() { throw new UnsupportedOperationException(); @@ -535,6 +550,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getEnclosedTypes(int[] kinds) { throw new UnsupportedOperationException(); @@ -544,6 +560,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); @@ -554,6 +571,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingType() { // TODO not sure @@ -564,6 +582,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingType(int[] kinds) { throw new UnsupportedOperationException(); @@ -574,6 +593,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); @@ -583,6 +603,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getSubTypes() { throw new UnsupportedOperationException(); @@ -592,6 +613,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ASTAccessVisibility getSuperTypeAccess(ITypeInfo subType) { throw new UnsupportedOperationException(); @@ -601,6 +623,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getSuperTypes() { throw new UnsupportedOperationException(); @@ -610,6 +633,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasEnclosedTypes() { throw new UnsupportedOperationException(); @@ -619,6 +643,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasSubTypes() { throw new UnsupportedOperationException(); @@ -628,6 +653,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasSuperTypes() { throw new UnsupportedOperationException(); @@ -637,6 +663,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isClass() { throw new UnsupportedOperationException(); @@ -646,6 +673,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosed(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -655,6 +683,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosed(ITypeSearchScope scope) { throw new UnsupportedOperationException(); @@ -664,6 +693,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosedType() { throw new UnsupportedOperationException(); @@ -673,6 +703,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosingType() { throw new UnsupportedOperationException(); @@ -682,6 +713,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isReferenced(ITypeSearchScope scope) { throw new UnsupportedOperationException(); @@ -691,6 +723,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isUndefinedType() { throw new UnsupportedOperationException(); @@ -700,6 +733,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void setCElementType(int type) { throw new UnsupportedOperationException(); diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java index 12f19d65ca7..7bd9bcc90ac 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java @@ -97,6 +97,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return segments; } + @Override public String getName() { if (fSegments.length > 0) { return fSegments[fSegments.length - 1]; @@ -104,6 +105,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return EMPTY_STRING; } + @Override public String[] getEnclosingNames() { if (fSegments.length > 1) { String[] enclosingNames = new String[fSegments.length - 1]; @@ -113,6 +115,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return NO_SEGMENTS; } + @Override public String getFullyQualifiedName() { if (fSegments.length > 0) { StringBuffer buf = new StringBuffer(fSegments.length * INITIAL_SEGMENT_LENGTH); @@ -127,6 +130,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return EMPTY_STRING; } + @Override public IQualifiedTypeName getEnclosingTypeName() { String[] enclosingNames = getEnclosingNames(); if (enclosingNames.length > 0) { @@ -137,28 +141,34 @@ public class QualifiedTypeName implements IQualifiedTypeName { return null; } + @Override public boolean isQualified() { return (fSegments.length > 1); } + @Override public boolean isEmpty() { return (fSegments.length == 0); } + @Override public boolean isGlobal() { return (fSegments.length <= 1 || fSegments[0].length() == 0); } + @Override public int segmentCount() { return fSegments.length; } + @Override public String[] segments() { String[] segmentCopy = new String[fSegments.length]; System.arraycopy(fSegments, 0, segmentCopy, 0, fSegments.length); return segmentCopy; } + @Override public String segment(int index) { if (index >= fSegments.length) { return null; @@ -166,6 +176,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return fSegments[index]; } + @Override public String lastSegment() { if (fSegments.length > 0) { return fSegments[fSegments.length - 1]; @@ -173,6 +184,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return null; } + @Override public int matchingFirstSegments(IQualifiedTypeName typeName) { int max = Math.min(fSegments.length, typeName.segmentCount()); int count = 0; @@ -185,6 +197,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return count; } + @Override public boolean isPrefixOf(IQualifiedTypeName typeName) { if (fSegments.length == 0) return true; @@ -201,6 +214,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return true; } + @Override public IQualifiedTypeName append(String[] names) { int length = fSegments.length; int typeNameLength = names.length; @@ -212,6 +226,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return newTypeName; } + @Override public IQualifiedTypeName append(IQualifiedTypeName typeName) { int length = fSegments.length; int typeNameLength = typeName.segmentCount(); @@ -225,10 +240,12 @@ public class QualifiedTypeName implements IQualifiedTypeName { return newTypeName; } + @Override public IQualifiedTypeName append(String qualifiedName) { return append(createSegments(qualifiedName)); } + @Override public IQualifiedTypeName removeFirstSegments(int count) { if (count == 0) { return this; @@ -244,6 +261,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { } } + @Override public IQualifiedTypeName removeLastSegments(int count) { if (count == 0) { return this; @@ -259,6 +277,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { } } + @Override public boolean isLowLevel() { for (int i = 0; i < fSegments.length; ++i) { if (fSegments[i].startsWith("_")) { //$NON-NLS-1$ @@ -268,6 +287,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return false; } + @Override public boolean isValid() { for (int i = 0; i < fSegments.length; ++i) { String segment = fSegments[i]; @@ -279,6 +299,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return true; } + @Override public boolean isValidSegment(String segment) { if (segment.indexOf(QUALIFIER) != -1) return false; @@ -303,6 +324,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return getFullyQualifiedName(); } + @Override public int compareTo(IQualifiedTypeName typeName) { if (typeName == this) return 0; @@ -322,6 +344,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return result; } + @Override public int compareToIgnoreCase(IQualifiedTypeName typeName) { if (typeName == this) return 0; @@ -352,6 +375,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return equals((IQualifiedTypeName)obj); } + @Override public boolean equals(IQualifiedTypeName typeName) { if (typeName == this) return true; @@ -369,6 +393,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return true; } + @Override public boolean equalsIgnoreCase(IQualifiedTypeName typeName) { if (typeName == this) return true; diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java index b2058fb5738..a4c11b4d278 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java @@ -28,6 +28,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void addReference(ITypeReference location) { throw new UnsupportedOperationException(); @@ -37,6 +38,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeReference[] getReferences() { throw new UnsupportedOperationException(); @@ -46,6 +48,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeReference getResolvedReference() { throw new UnsupportedOperationException(); @@ -64,6 +67,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isReferenced(ITypeSearchScope scope) { throw new UnsupportedOperationException(); @@ -73,6 +77,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isUndefinedType() { throw new UnsupportedOperationException(); @@ -82,6 +87,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean canSubstituteFor(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -95,6 +101,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean exists() { throw new UnsupportedOperationException(); @@ -104,6 +111,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public int getCElementType() { throw new UnsupportedOperationException(); @@ -113,6 +121,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void setCElementType(int type) { throw new UnsupportedOperationException(); @@ -122,6 +131,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public IQualifiedTypeName getQualifiedTypeName() { throw new UnsupportedOperationException(); @@ -131,6 +141,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public String getName() { throw new UnsupportedOperationException(); @@ -140,6 +151,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosedType() { throw new UnsupportedOperationException(); @@ -149,6 +161,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingType(int kinds[]) { throw new UnsupportedOperationException(); @@ -158,6 +171,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingType() { throw new UnsupportedOperationException(); @@ -167,6 +181,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); @@ -176,6 +191,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); @@ -185,6 +201,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosingType() { throw new UnsupportedOperationException(); @@ -194,6 +211,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean encloses(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -203,6 +221,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosed(ITypeInfo info) { throw new UnsupportedOperationException(); @@ -212,6 +231,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasEnclosedTypes() { throw new UnsupportedOperationException(); @@ -221,6 +241,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getEnclosedTypes() { throw new UnsupportedOperationException(); @@ -230,6 +251,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getEnclosedTypes(int kinds[]) { throw new UnsupportedOperationException(); @@ -239,6 +261,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ICProject getEnclosingProject() { throw new UnsupportedOperationException(); @@ -248,6 +271,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isEnclosed(ITypeSearchScope scope) { throw new UnsupportedOperationException(); @@ -266,6 +290,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public void addDerivedReference(ITypeReference location) { throw new UnsupportedOperationException(); @@ -275,6 +300,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeReference[] getDerivedReferences() { throw new UnsupportedOperationException(); @@ -284,6 +310,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasSubTypes() { throw new UnsupportedOperationException(); @@ -293,6 +320,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getSubTypes() { throw new UnsupportedOperationException(); @@ -302,6 +330,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean hasSuperTypes() { throw new UnsupportedOperationException(); @@ -311,6 +340,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ITypeInfo[] getSuperTypes() { throw new UnsupportedOperationException(); @@ -320,6 +350,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public ASTAccessVisibility getSuperTypeAccess(ITypeInfo superType) { throw new UnsupportedOperationException(); @@ -329,6 +360,7 @@ public class TypeInfo implements ITypeInfo { * @deprecated * @noreference This method is not intended to be referenced by clients. */ + @Override @Deprecated public boolean isClass() { throw new UnsupportedOperationException(); diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java index 4fcbd1f18a3..81be7d9b210 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java @@ -76,6 +76,7 @@ public class TypeReference implements ITypeReference { this(workingCopy, project, 0, 0); } + @Override public IPath getPath() { if (fWorkingCopy != null) { return fWorkingCopy.getPath(); @@ -86,6 +87,7 @@ public class TypeReference implements ITypeReference { } } + @Override public IPath getLocation() { if (fWorkingCopy != null) { IResource resource = fWorkingCopy.getUnderlyingResource(); @@ -104,14 +106,17 @@ public class TypeReference implements ITypeReference { } } + @Override public IResource getResource() { return fResource; } + @Override public IWorkingCopy getWorkingCopy() { return fWorkingCopy; } + @Override public IProject getProject() { if (fProject != null) { return fProject; @@ -129,6 +134,7 @@ public class TypeReference implements ITypeReference { } } + @Override public ITranslationUnit getTranslationUnit() { ITranslationUnit unit = null; if (fWorkingCopy != null) { @@ -172,6 +178,7 @@ public class TypeReference implements ITypeReference { return null; } + @Override public ICElement[] getCElements() { ITranslationUnit unit = getTranslationUnit(); if (unit != null) { @@ -189,14 +196,17 @@ public class TypeReference implements ITypeReference { return null; } + @Override public int getOffset() { return fOffset; } + @Override public int getLength() { return fLength; } + @Override public IPath getRelativeIncludePath(IProject project) { IPath path = getLocation(); if (path != null) { @@ -207,6 +217,7 @@ public class TypeReference implements ITypeReference { return path; } + @Override public IPath getRelativePath(IPath relativeToPath) { IPath path = getPath(); if (path != null) { @@ -246,7 +257,8 @@ public class TypeReference implements ITypeReference { return toString().equals(ref.toString()); } - public boolean isLineNumber() { + @Override + public boolean isLineNumber() { return offsetIsLineNumber; } } diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java index 1d3a9c8e02a..181607da0cb 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java @@ -57,19 +57,24 @@ public class TypeSearchScope implements ITypeSearchScope { add(project); } + @Override public Collection pathSet() { return fPathSet; } + @Override public Collection containerSet() { return fContainerSet; } + @Override public Collection projectSet() { return fProjectSet; } + @Override public Collection enclosingProjectSet() { return fEnclosingProjectSet; } + @Override public boolean encloses(ITypeSearchScope scope) { if (isWorkspaceScope()) return true; @@ -104,6 +109,7 @@ public class TypeSearchScope implements ITypeSearchScope { return true; } + @Override public boolean encloses(ICProject project) { if (isWorkspaceScope()) return true; @@ -115,6 +121,7 @@ public class TypeSearchScope implements ITypeSearchScope { return false; } + @Override public boolean encloses(IPath path) { if (isWorkspaceScope()) return true; @@ -155,18 +162,22 @@ public class TypeSearchScope implements ITypeSearchScope { return false; } + @Override public boolean encloses(String path) { return encloses(new Path(path)); } + @Override public boolean encloses(ICElement element) { return encloses(element.getPath()); } + @Override public boolean encloses(IWorkingCopy workingCopy) { return encloses(workingCopy.getOriginalElement().getPath()); } + @Override public ICProject[] getEnclosingProjects() { if (isWorkspaceScope()) { return getAllProjects(); @@ -242,22 +253,27 @@ public class TypeSearchScope implements ITypeSearchScope { } } + @Override public boolean isPathScope() { return !fPathSet.isEmpty(); } + @Override public boolean isProjectScope() { return !fProjectSet.isEmpty(); } + @Override public boolean isWorkspaceScope() { return fWorkspaceScope; } + @Override public boolean isEmpty() { return (!isWorkspaceScope() && fPathSet.isEmpty() && fContainerSet.isEmpty() && fProjectSet.isEmpty()); } + @Override public void add(IWorkingCopy workingCopy) { IPath path = workingCopy.getOriginalElement().getPath(); ICProject cProject = workingCopy.getCProject(); @@ -265,6 +281,7 @@ public class TypeSearchScope implements ITypeSearchScope { addEnclosingProject(cProject); } + @Override public void add(IPath path, boolean addSubfolders, ICProject enclosingProject) { if (addSubfolders) { fContainerSet.add(path); @@ -289,6 +306,7 @@ public class TypeSearchScope implements ITypeSearchScope { } } + @Override public void add(ICProject project) { fProjectSet.add(project); fProjects = null; @@ -300,12 +318,14 @@ public class TypeSearchScope implements ITypeSearchScope { fEnclosingProjectSet.add(project); } + @Override public void addWorkspace() { fWorkspaceScope = true; fProjects = null; fAllProjects = null; } + @Override public void add(ICElement elem) { if (elem == null) return; @@ -349,6 +369,7 @@ public class TypeSearchScope implements ITypeSearchScope { } } + @Override public void add(ITypeSearchScope scope) { fPathSet.addAll(scope.pathSet()); fContainerSet.addAll(scope.containerSet()); @@ -360,6 +381,7 @@ public class TypeSearchScope implements ITypeSearchScope { fWorkspaceScope |= scope.isWorkspaceScope(); } + @Override public void clear() { fPathSet.clear(); fContainerSet.clear(); diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java index dd2bcf27f8b..4c890273466 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java @@ -107,26 +107,32 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo { this.reference= reference; } + @Override public int getCElementType() { return elementType; } + @Override public String getName() { return fqn[fqn.length-1]; } + @Override public IQualifiedTypeName getQualifiedTypeName() { return new QualifiedTypeName(fqn); } + @Override public ITypeReference getResolvedReference() { return reference; } + @Override public ITypeReference[] getReferences() { return new ITypeReference[] {reference}; } + @Override public ICProject getEnclosingProject() { if(getResolvedReference()!=null) { IProject project = reference.getProject(); @@ -137,6 +143,7 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo { return null; } + @Override public String[] getParameters() { return params; } @@ -144,6 +151,7 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo { /* * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getReturnType() */ + @Override public String getReturnType() { return returnType; } @@ -206,132 +214,158 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo { return null; } + @Override @Deprecated public void addDerivedReference(ITypeReference location) { throw new UnsupportedOperationException(); } + @Override @Deprecated public void addReference(ITypeReference location) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean canSubstituteFor(ITypeInfo info) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean encloses(ITypeInfo info) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean exists() { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeReference[] getDerivedReferences() { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo[] getEnclosedTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo[] getEnclosedTypes(int[] kinds) { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo getEnclosingType() { // TODO not sure return null; } + @Override @Deprecated public ITypeInfo getEnclosingType(int[] kinds) { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo[] getSubTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public ASTAccessVisibility getSuperTypeAccess(ITypeInfo subType) { throw new UnsupportedOperationException(); } + @Override @Deprecated public ITypeInfo[] getSuperTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean hasEnclosedTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean hasSubTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean hasSuperTypes() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isClass() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isEnclosed(ITypeInfo info) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isEnclosed(ITypeSearchScope scope) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isEnclosedType() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isEnclosingType() { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isReferenced(ITypeSearchScope scope) { throw new UnsupportedOperationException(); } + @Override @Deprecated public boolean isUndefinedType() { throw new UnsupportedOperationException(); } + @Override @Deprecated public void setCElementType(int type) { throw new UnsupportedOperationException(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java index 0a1b40c9e06..703f46208bf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java @@ -277,22 +277,22 @@ public class CDataUtil { public static ICLanguageSettingEntry createEntry(ICLanguageSettingEntry entry, int flags){ switch (entry.getKind()){ - case ICLanguageSettingEntry.INCLUDE_PATH: + case ICSettingEntry.INCLUDE_PATH: entry = new CIncludePathEntry(entry.getName(), flags); break; - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: entry = new CMacroEntry(entry.getName(), entry.getValue(), flags); break; - case ICLanguageSettingEntry.INCLUDE_FILE: + case ICSettingEntry.INCLUDE_FILE: entry = new CIncludeFileEntry(entry.getName(), flags); break; - case ICLanguageSettingEntry.MACRO_FILE: + case ICSettingEntry.MACRO_FILE: entry = new CMacroFileEntry(entry.getName(), flags); break; - case ICLanguageSettingEntry.LIBRARY_PATH: + case ICSettingEntry.LIBRARY_PATH: entry = new CLibraryPathEntry(entry.getName(), flags); break; - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: ICLibraryFileEntry libFile = (ICLibraryFileEntry)entry; entry = new CLibraryFileEntry(entry.getName(), flags, @@ -603,10 +603,10 @@ public class CDataUtil { if(addLang){ CLanguageData lData = factory.createLanguageData(cfgData, data, genId(data.getId()), des.getName(), des.getId(), - ICLanguageSettingEntry.INCLUDE_FILE - | ICLanguageSettingEntry.INCLUDE_PATH - | ICLanguageSettingEntry.MACRO - | ICLanguageSettingEntry.MACRO_FILE, + ICSettingEntry.INCLUDE_FILE + | ICSettingEntry.INCLUDE_PATH + | ICSettingEntry.MACRO + | ICSettingEntry.MACRO_FILE, ctypeIds, true); factory.link(data, lData); } @@ -798,11 +798,11 @@ public class CDataUtil { ICSourceEntry entry; if(absolute){ if(project != null) - entry = new CSourceEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new CSourceEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); else - entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); } else { - entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); } return new ICSourceEntry[]{entry}; } @@ -811,11 +811,11 @@ public class CDataUtil { ICOutputEntry entry; if(absolute){ if(project != null) - entry = new COutputEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new COutputEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); else - entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); } else { - entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED); + entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED); } return new ICOutputEntry[]{entry}; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java index b795b3e8de5..076ddd75cbd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java @@ -23,6 +23,7 @@ import org.eclipse.cdt.core.settings.model.ICLibraryFileEntry; import org.eclipse.cdt.core.settings.model.ICLibraryPathEntry; import org.eclipse.cdt.core.settings.model.ICMacroEntry; import org.eclipse.cdt.core.settings.model.ICMacroFileEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class EntryStore { private KindBasedStore> fStore = new KindBasedStore>(); @@ -67,17 +68,17 @@ public class EntryStore { if(list == null) list = new ArrayList(0); switch(kind){ - case ICLanguageSettingEntry.INCLUDE_PATH: + case ICSettingEntry.INCLUDE_PATH: return list.toArray(new ICIncludePathEntry[list.size()]); - case ICLanguageSettingEntry.INCLUDE_FILE: + case ICSettingEntry.INCLUDE_FILE: return list.toArray(new ICIncludeFileEntry[list.size()]); - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: return list.toArray(new ICMacroEntry[list.size()]); - case ICLanguageSettingEntry.MACRO_FILE: + case ICSettingEntry.MACRO_FILE: return list.toArray(new ICMacroFileEntry[list.size()]); - case ICLanguageSettingEntry.LIBRARY_PATH: + case ICSettingEntry.LIBRARY_PATH: return list.toArray(new ICLibraryPathEntry[list.size()]); - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: return list.toArray(new ICLibraryFileEntry[list.size()]); default: throw new IllegalArgumentException(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java index 3ced074d468..abe7357b868 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java @@ -97,17 +97,17 @@ public class KindBasedStore implements Cloneable { private int kindToIndex(int kind){ switch (kind){ - case ICLanguageSettingEntry.INCLUDE_PATH: + case ICSettingEntry.INCLUDE_PATH: return INDEX_INCLUDE_PATH; - case ICLanguageSettingEntry.INCLUDE_FILE: + case ICSettingEntry.INCLUDE_FILE: return INDEX_INCLUDE_FILE; - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: return INDEX_MACRO; - case ICLanguageSettingEntry.MACRO_FILE: + case ICSettingEntry.MACRO_FILE: return INDEX_MACRO_FILE; - case ICLanguageSettingEntry.LIBRARY_PATH: + case ICSettingEntry.LIBRARY_PATH: return INDEX_LIBRARY_PATH; - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: return INDEX_LIBRARY_FILE; case ICSettingEntry.SOURCE_PATH: if(INDEX_SOURCE_PATH < fEntryStorage.length) @@ -132,17 +132,17 @@ public class KindBasedStore implements Cloneable { private int indexToKind(int index){ switch (index){ case INDEX_INCLUDE_PATH: - return ICLanguageSettingEntry.INCLUDE_PATH; + return ICSettingEntry.INCLUDE_PATH; case INDEX_INCLUDE_FILE: - return ICLanguageSettingEntry.INCLUDE_FILE; + return ICSettingEntry.INCLUDE_FILE; case INDEX_MACRO: - return ICLanguageSettingEntry.MACRO; + return ICSettingEntry.MACRO; case INDEX_MACRO_FILE: - return ICLanguageSettingEntry.MACRO_FILE; + return ICSettingEntry.MACRO_FILE; case INDEX_LIBRARY_PATH: - return ICLanguageSettingEntry.LIBRARY_PATH; + return ICSettingEntry.LIBRARY_PATH; case INDEX_LIBRARY_FILE: - return ICLanguageSettingEntry.LIBRARY_FILE; + return ICSettingEntry.LIBRARY_FILE; case INDEX_SOURCE_PATH: return ICSettingEntry.SOURCE_PATH; case INDEX_OUPUT_PATH: diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java index 150b01a967b..6a1ac0045b1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java @@ -105,25 +105,25 @@ public class LanguageSettingEntriesSerializer { switch(kind){ - case ICLanguageSettingEntry.INCLUDE_PATH: + case ICSettingEntry.INCLUDE_PATH: return new CIncludePathEntry(name, flags); - case ICLanguageSettingEntry.INCLUDE_FILE: + case ICSettingEntry.INCLUDE_FILE: return new CIncludeFileEntry(name, flags); - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: String value = el.getAttribute(ATTRIBUTE_VALUE); return new CMacroEntry(name, value, flags); - case ICLanguageSettingEntry.MACRO_FILE: + case ICSettingEntry.MACRO_FILE: return new CMacroFileEntry(name, flags); - case ICLanguageSettingEntry.LIBRARY_PATH: + case ICSettingEntry.LIBRARY_PATH: return new CLibraryPathEntry(name, flags); - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: IPath srcPath = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_PATH); IPath srcRootPath = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_ROOT_PATH); IPath srcPrefixMapping = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_PREFIX_MAPPING); return new CLibraryFileEntry(name, flags, srcPath, srcRootPath, srcPrefixMapping); - case ICLanguageSettingEntry.OUTPUT_PATH: + case ICSettingEntry.OUTPUT_PATH: return new COutputEntry(name, loadExclusions(el), flags); - case ICLanguageSettingEntry.SOURCE_PATH: + case ICSettingEntry.SOURCE_PATH: return new CSourceEntry(name, loadExclusions(el), flags); } return null; @@ -185,16 +185,16 @@ public class LanguageSettingEntriesSerializer { element.setAttribute(ATTRIBUTE_FLAGS, flags); element.setAttribute(ATTRIBUTE_NAME, name); switch(entry.getKind()){ - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: String value = entry.getValue(); element.setAttribute(ATTRIBUTE_VALUE, value); break; - case ICLanguageSettingEntry.SOURCE_PATH: - case ICLanguageSettingEntry.OUTPUT_PATH: + case ICSettingEntry.SOURCE_PATH: + case ICSettingEntry.OUTPUT_PATH: IPath paths[] = ((ICExclusionPatternPathEntry)entry).getExclusionPatterns(); storeExclusions(element, paths); break; - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: ICLibraryFileEntry libFile = (ICLibraryFileEntry)entry; IPath path = libFile.getSourceAttachmentPath(); if(path != null) @@ -212,21 +212,21 @@ public class LanguageSettingEntriesSerializer { public static String kindToString(int kind){ switch(kind){ - case ICLanguageSettingEntry.INCLUDE_PATH: + case ICSettingEntry.INCLUDE_PATH: return INCLUDE_PATH; - case ICLanguageSettingEntry.INCLUDE_FILE: + case ICSettingEntry.INCLUDE_FILE: return INCLUDE_FILE; - case ICLanguageSettingEntry.MACRO: + case ICSettingEntry.MACRO: return MACRO; - case ICLanguageSettingEntry.MACRO_FILE: + case ICSettingEntry.MACRO_FILE: return MACRO_FILE; - case ICLanguageSettingEntry.LIBRARY_PATH: + case ICSettingEntry.LIBRARY_PATH: return LIBRARY_PATH; - case ICLanguageSettingEntry.LIBRARY_FILE: + case ICSettingEntry.LIBRARY_FILE: return LIBRARY_FILE; - case ICLanguageSettingEntry.SOURCE_PATH: + case ICSettingEntry.SOURCE_PATH: return SOURCE_PATH; - case ICLanguageSettingEntry.OUTPUT_PATH: + case ICSettingEntry.OUTPUT_PATH: return OUTPUT_PATH; } throw new IllegalArgumentException(); @@ -234,49 +234,49 @@ public class LanguageSettingEntriesSerializer { public static int stringToKind(String kind){ if(INCLUDE_PATH.equals(kind)) - return ICLanguageSettingEntry.INCLUDE_PATH; + return ICSettingEntry.INCLUDE_PATH; if(INCLUDE_FILE.equals(kind)) - return ICLanguageSettingEntry.INCLUDE_FILE; + return ICSettingEntry.INCLUDE_FILE; if(MACRO.equals(kind)) - return ICLanguageSettingEntry.MACRO; + return ICSettingEntry.MACRO; if(MACRO_FILE.equals(kind)) - return ICLanguageSettingEntry.MACRO_FILE; + return ICSettingEntry.MACRO_FILE; if(LIBRARY_PATH.equals(kind)) - return ICLanguageSettingEntry.LIBRARY_PATH; + return ICSettingEntry.LIBRARY_PATH; if(LIBRARY_FILE.equals(kind)) - return ICLanguageSettingEntry.LIBRARY_FILE; + return ICSettingEntry.LIBRARY_FILE; if(SOURCE_PATH.equals(kind)) - return ICLanguageSettingEntry.SOURCE_PATH; + return ICSettingEntry.SOURCE_PATH; if(OUTPUT_PATH.equals(kind)) - return ICLanguageSettingEntry.OUTPUT_PATH; + return ICSettingEntry.OUTPUT_PATH; return 0; // throw new UnsupportedOperationException(); } public static String composeFlagsString(int flags){ StringBuffer buf = new StringBuffer(); - if((flags & ICLanguageSettingEntry.BUILTIN) != 0){ + if((flags & ICSettingEntry.BUILTIN) != 0){ buf.append(BUILTIN); } - if((flags & ICLanguageSettingEntry.READONLY) != 0){ + if((flags & ICSettingEntry.READONLY) != 0){ if(buf.length() != 0) buf.append(FLAGS_SEPARATOR); buf.append(READONLY); } - if((flags & ICLanguageSettingEntry.LOCAL) != 0){ + if((flags & ICSettingEntry.LOCAL) != 0){ if(buf.length() != 0) buf.append(FLAGS_SEPARATOR); buf.append(LOCAL); } - if((flags & ICLanguageSettingEntry.VALUE_WORKSPACE_PATH) != 0){ + if((flags & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0){ if(buf.length() != 0) buf.append(FLAGS_SEPARATOR); buf.append(VALUE_WORKSPACE_PATH); } - if((flags & ICLanguageSettingEntry.RESOLVED) != 0){ + if((flags & ICSettingEntry.RESOLVED) != 0){ if(buf.length() != 0) buf.append(FLAGS_SEPARATOR); @@ -310,19 +310,19 @@ public class LanguageSettingEntriesSerializer { while(tokenizer.hasMoreElements()){ f = tokenizer.nextToken(); if(BUILTIN.equals(f)) - flags |= ICLanguageSettingEntry.BUILTIN; + flags |= ICSettingEntry.BUILTIN; if(READONLY.equals(f)) - flags |= ICLanguageSettingEntry.READONLY; + flags |= ICSettingEntry.READONLY; if(LOCAL.equals(f)) - flags |= ICLanguageSettingEntry.LOCAL; + flags |= ICSettingEntry.LOCAL; if(VALUE_WORKSPACE_PATH.equals(f)) - flags |= ICLanguageSettingEntry.VALUE_WORKSPACE_PATH; + flags |= ICSettingEntry.VALUE_WORKSPACE_PATH; if(RESOLVED.equals(f)) - flags |= ICLanguageSettingEntry.RESOLVED; + flags |= ICSettingEntry.RESOLVED; if(UNDEFINED.equals(f)) - flags |= ICLanguageSettingEntry.UNDEFINED; + flags |= ICSettingEntry.UNDEFINED; if(FRAMEWORK.equals(f)) - flags |= ICLanguageSettingEntry.FRAMEWORKS_MAC; + flags |= ICSettingEntry.FRAMEWORKS_MAC; } return flags; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java index 4ad6b180bc0..5bb8f290845 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java @@ -37,7 +37,7 @@ class CSettingsRefInfo { CSettingsRefInfo(ICStorageElement el) { for (ICStorageElement child : el.getChildren()) { String name = child.getName(); - if(CRefSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER.equals(name)) { + if(CExternalSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER.equals(name)) { CRefSettingsHolder h = new CRefSettingsHolder(child); CContainerRef r = h.getContainerInfo(); fESHolderMap.put(r, h); @@ -74,7 +74,7 @@ class CSettingsRefInfo { void serialize(ICStorageElement element){ for (CRefSettingsHolder h : fESHolderMap.values()) { - ICStorageElement child = element.createChild(CRefSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER); + ICStorageElement child = element.createChild(CExternalSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER); h.serialize(child); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java index baa316c70b0..b9bd2a0b0cd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java @@ -36,21 +36,25 @@ public class ASTCompletionNode implements IASTCompletionNode { } + @Override public String getPrefix() { return completionToken.getType() == IToken.tEOC ? "" : completionToken.getImage(); //$NON-NLS-1$ } + @Override public int getLength() { return completionToken.getLength(); } + @Override public IASTName[] getNames() { return names.toArray(new IASTName[names.size()]); } + @Override public IASTTranslationUnit getTranslationUnit() { return translationUnit; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java index 4901899be61..9705a2da9c1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java @@ -20,6 +20,7 @@ public class ASTTypeMatcher implements IObjectMatcher { /** * Returns true if the two objects are equal or represent the same type. */ + @Override public boolean isEquivalent(Object o1, Object o2) { if (o1 == o2) { return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java index e65c1f82ab6..cd6693c48f6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java @@ -476,14 +476,14 @@ public class ASTTypeUtil { } else { // Output reference, qualifier and typedef, then stop. if (ref != null) { - types = (IType[]) ArrayUtil.append(IType.class, types, ref); + types = ArrayUtil.append(IType.class, types, ref); ref= null; } if (cvq != null) { - types = (IType[]) ArrayUtil.append(IType.class, types, cvq); + types = ArrayUtil.append(IType.class, types, cvq); cvq= null; } - types = (IType[]) ArrayUtil.append(IType.class, types, type); + types = ArrayUtil.append(IType.class, types, type); type= null; } } else { @@ -509,14 +509,14 @@ public class ASTTypeUtil { } else { // no reference, no cv qualifier: output reference and cv-qualifier if (ref != null) { - types = (IType[]) ArrayUtil.append(IType.class, types, ref); + types = ArrayUtil.append(IType.class, types, ref); ref= null; } if (cvq != null) { - types = (IType[]) ArrayUtil.append(IType.class, types, cvq); + types = ArrayUtil.append(IType.class, types, cvq); cvq= null; } - types = (IType[]) ArrayUtil.append(IType.class, types, type); + types = ArrayUtil.append(IType.class, types, type); } } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java index dc8c67af5ab..0ec7865b919 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java @@ -35,10 +35,12 @@ public interface IASTASMDeclaration extends IASTDeclaration { /** * @since 5.1 */ + @Override public IASTASMDeclaration copy(); /** * @since 5.3 */ + @Override public IASTASMDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java index 6f0624bbeac..e43f0b4756c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java @@ -54,6 +54,8 @@ public interface IASTBinaryTypeIdExpression extends IASTExpression { */ public void setOperand2(IASTTypeId typeId); + @Override public IASTBinaryTypeIdExpression copy(); + @Override public IASTBinaryTypeIdExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java index 1dc73d44d02..280e7d185f2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java @@ -21,10 +21,12 @@ public interface IASTBreakStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTBreakStatement copy(); /** * @since 5.3 */ + @Override public IASTBreakStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java index 52eb6c38d98..bc2a47204ea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java @@ -44,10 +44,12 @@ public interface IASTCaseStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTCaseStatement copy(); /** * @since 5.3 */ + @Override public IASTCaseStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java index 2290a205ffd..edfe26cacc2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java @@ -91,11 +91,13 @@ public interface IASTConditionalExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IASTConditionalExpression copy(); /** * @since 5.3 */ + @Override public IASTConditionalExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java index 2653f336abf..68ca0313abb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java @@ -21,10 +21,12 @@ public interface IASTContinueStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTContinueStatement copy(); /** * @since 5.3 */ + @Override public IASTContinueStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java index 712c3bcb0dc..69d1f60d13f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java @@ -22,10 +22,12 @@ public interface IASTDeclaration extends IASTNode { /** * @since 5.1 */ + @Override public IASTDeclaration copy(); /** * @since 5.3 */ + @Override public IASTDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java index cda8805e846..3646c7b0e0f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java @@ -42,11 +42,13 @@ public interface IASTDeclarationStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTDeclarationStatement copy(); /** * @since 5.3 */ + @Override public IASTDeclarationStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java index fbcff0fc4c9..c58c80f80f0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java @@ -24,10 +24,12 @@ public interface IASTDefaultStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTDefaultStatement copy(); /** * @since 5.3 */ + @Override public IASTDefaultStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java index 9bd63ca8e51..2cfc7582a46 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java @@ -66,11 +66,13 @@ public interface IASTDoStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTDoStatement copy(); /** * @since 5.3 */ + @Override public IASTDoStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java index 0737acce6e5..9b6f7879f84 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java @@ -78,5 +78,6 @@ public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTName /** * @since 5.1 */ + @Override public IASTElaboratedTypeSpecifier copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java index 515e126f2cd..db16a75e72f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java @@ -75,11 +75,13 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn /** * @since 5.1 */ + @Override public IASTEnumerator copy(); /** * @since 5.3 */ + @Override public IASTEnumerator copy(CopyStyle style); } @@ -129,10 +131,12 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn /** * @since 5.1 */ + @Override public IASTEnumerationSpecifier copy(); /** * @since 5.3 */ + @Override public IASTEnumerationSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java index 9c38baed2cd..c5b548b3238 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java @@ -73,10 +73,12 @@ public interface IASTExpression extends IASTInitializerClause { /** * @since 5.1 */ + @Override public IASTExpression copy(); /** * @since 5.3 */ + @Override public IASTExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java index f745cc2629b..5d2a951c03b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java @@ -42,10 +42,12 @@ public interface IASTExpressionStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTExpressionStatement copy(); /** * @since 5.3 */ + @Override public IASTExpressionStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java index c07b1f612e5..52ebc25457f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java @@ -45,10 +45,12 @@ public interface IASTFieldDeclarator extends IASTDeclarator { /** * @since 5.1 */ + @Override public IASTFieldDeclarator copy(); /** * @since 5.3 */ + @Override public IASTFieldDeclarator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java index 0f380df8d70..36d43ae27e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java @@ -83,11 +83,13 @@ public interface IASTFieldReference extends IASTExpression, IASTNameOwner { /** * @since 5.1 */ + @Override public IASTFieldReference copy(); /** * @since 5.3 */ + @Override public IASTFieldReference copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java index f3a85ea5187..9e7ab27a51c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java @@ -28,11 +28,13 @@ public interface IASTFileLocation extends IASTNodeLocation { /** * Returns the offset within the file where this location starts. */ + @Override public int getNodeOffset(); /** * Returns the length of this location in terms of characters. */ + @Override public int getNodeLength(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java index 83dcc637943..4b4634c6251 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java @@ -116,10 +116,12 @@ public interface IASTForStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTForStatement copy(); /** * @since 5.3 */ + @Override public IASTForStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java index d6f26ef178d..ac3e387af3b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java @@ -43,11 +43,13 @@ public interface IASTFunctionCallExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IASTFunctionCallExpression copy(); /** * @since 5.3 */ + @Override public IASTFunctionCallExpression copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java index 8b9a687fd28..70bbb3f460c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java @@ -22,10 +22,12 @@ public interface IASTFunctionDeclarator extends IASTDeclarator { /** * @since 5.1 */ + @Override public IASTFunctionDeclarator copy(); /** * @since 5.3 */ + @Override public IASTFunctionDeclarator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java index 6fb715963a6..29eaec67a21 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java @@ -38,11 +38,13 @@ public interface IASTGotoStatement extends IASTStatement, IASTNameOwner { /** * @since 5.1 */ + @Override public IASTGotoStatement copy(); /** * @since 5.3 */ + @Override public IASTGotoStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java index afb6f2e5202..838b56f3a98 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java @@ -42,10 +42,12 @@ public interface IASTIdExpression extends IASTExpression, IASTNameOwner { /** * @since 5.1 */ + @Override public IASTIdExpression copy(); /** * @since 5.3 */ + @Override public IASTIdExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java index 11faa3f8b08..ba040b734a8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java @@ -89,10 +89,12 @@ public interface IASTIfStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTIfStatement copy(); /** * @since 5.3 */ + @Override public IASTIfStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java index 3756816d45a..1f22ba47f6a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java @@ -31,6 +31,7 @@ public interface IASTImplicitName extends IASTName { * Will not return null or a problem binding. * Implicit names are not generated unless they resolve to something. */ + @Override public IBinding resolveBinding(); /** @@ -58,5 +59,6 @@ public interface IASTImplicitName extends IASTName { * * @throws UnsupportedOperationException always */ + @Override IASTName copy() throws UnsupportedOperationException; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java index 3d394b4f132..4684dc536ba 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java @@ -26,10 +26,12 @@ public interface IASTInitializer extends IASTNode { /** * @since 5.1 */ + @Override public IASTInitializer copy(); /** * @since 5.3 */ + @Override public IASTInitializer copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java index 1199ab83241..8243d6a663c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java @@ -18,10 +18,12 @@ package org.eclipse.cdt.core.dom.ast; */ public interface IASTInitializerClause extends IASTNode { + @Override IASTInitializerClause copy(); /** * @since 5.3 */ + @Override IASTInitializerClause copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java index 4dc413bdf9a..7de70794e85 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java @@ -44,10 +44,12 @@ public interface IASTInitializerExpression extends IASTEqualsInitializer { /** * @since 5.1 */ + @Override public IASTInitializerExpression copy(); /** * @since 5.3 */ + @Override public IASTInitializerExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java index a4fdb2b84a3..412d61e7d58 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java @@ -49,11 +49,13 @@ public interface IASTInitializerList extends IASTInitializer, IASTInitializerCla /** * @since 5.1 */ + @Override public IASTInitializerList copy(); /** * @since 5.3 */ + @Override public IASTInitializerList copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java index 68290dea2b1..e856f4c5de6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java @@ -46,11 +46,13 @@ public interface IASTLabelStatement extends IASTStatement, IASTNameOwner { /** * @since 5.1 */ + @Override public IASTLabelStatement copy(); /** * @since 5.3 */ + @Override public IASTLabelStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java index 15bd17cf24f..afbf2d4b8be 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java @@ -34,6 +34,7 @@ public interface IASTMacroExpansion extends IASTNodeLocation { * nodes within the same macro-expansion. However, it does not serve as an offset * into a file. */ + @Override public int getNodeOffset(); /** @@ -41,6 +42,7 @@ public interface IASTMacroExpansion extends IASTNodeLocation { * with others from within the same macro-expansion. However, the length does not neccessarily * relate to a length in terms of characters. */ + @Override public int getNodeLength(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java index d5d0d710298..4edf83d7dcf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java @@ -30,6 +30,7 @@ public interface IASTMacroExpansionLocation extends IASTNodeLocation { * nodes within the same macro-expansion. However, it does not serve as an offset * into a file. */ + @Override public int getNodeOffset(); /** @@ -37,5 +38,6 @@ public interface IASTMacroExpansionLocation extends IASTNodeLocation { * with others from within the same macro-expansion. However, the length does not neccessarily * relate to a length in terms of characters. */ + @Override public int getNodeLength(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java index 17fbf27f116..06079daeb77 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java @@ -43,5 +43,6 @@ public interface IASTNamedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner /** * @since 5.1 */ + @Override public IASTNamedTypeSpecifier copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java index b3e7a8cbccf..3e1ac165c3d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java @@ -21,10 +21,12 @@ public interface IASTNullStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTNullStatement copy(); /** * @since 5.3 */ + @Override public IASTNullStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java index 4cf5ca99645..a3b29a8e594 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java @@ -53,6 +53,7 @@ public interface IASTPreprocessorIncludeStatement extends IASTPreprocessorStatem * Returns whether this include directive was actually taken. * @since 4.0 */ + @Override public boolean isActive(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java index 64ab382c073..693cc8fe32f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java @@ -46,6 +46,7 @@ public interface IASTPreprocessorMacroDefinition extends IASTPreprocessorStateme * Returns whether this macro definition occurs in active code. * @since 5.1 */ + @Override public boolean isActive(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java index 8524afc5520..e479ec909a6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java @@ -28,5 +28,6 @@ public interface IASTPreprocessorUndefStatement extends IASTPreprocessorStatemen * Returns whether this macro definition occurs in active code. * @since 5.1 */ + @Override public boolean isActive(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java index fcb42f6e0c2..9906c152a54 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java @@ -23,10 +23,12 @@ public interface IASTProblem extends IProblem, IASTNode { /** * @since 5.1 */ + @Override public IASTProblem copy(); /** * @since 5.3 */ + @Override public IASTProblem copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java index bd23de9370b..9179487a073 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java @@ -22,10 +22,12 @@ public interface IASTProblemDeclaration extends IASTDeclaration, IASTProblemHold /** * @since 5.1 */ + @Override public IASTProblemDeclaration copy(); /** * @since 5.3 */ + @Override public IASTProblemDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java index 12d679045de..cee135c89e2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java @@ -22,10 +22,12 @@ public interface IASTProblemExpression extends IASTExpression, IASTProblemHolder /** * @since 5.1 */ + @Override public IASTProblemExpression copy(); /** * @since 5.3 */ + @Override public IASTProblemExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java index b019a9b69c2..2c0e197c72c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java @@ -22,10 +22,12 @@ public interface IASTProblemStatement extends IASTStatement, IASTProblemHolder { /** * @since 5.1 */ + @Override public IASTProblemStatement copy(); /** * @since 5.3 */ + @Override public IASTProblemStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java index c87b4e2ad8b..6f80ccc40ac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java @@ -22,10 +22,12 @@ public interface IASTProblemTypeId extends IASTTypeId, IASTProblemHolder { /** * @since 5.1 */ + @Override public IASTProblemTypeId copy(); /** * @since 5.3 */ + @Override public IASTProblemTypeId copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java index 2f015c3b106..9a5e1d6266b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java @@ -48,10 +48,12 @@ public interface IASTReturnStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTReturnStatement copy(); /** * @since 5.3 */ + @Override public IASTReturnStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java index f9fe7e36048..aa2cf3b3561 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java @@ -105,6 +105,7 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier { /** * @since 5.1 */ + @Override public IASTSimpleDeclSpecifier copy(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java index c306d561790..668fce1f490 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java @@ -69,10 +69,12 @@ public interface IASTSimpleDeclaration extends IASTDeclaration { /** * @since 5.1 */ + @Override public IASTSimpleDeclaration copy(); /** * @since 5.3 */ + @Override public IASTSimpleDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java index 8340c43605d..eab95eb8392 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java @@ -25,11 +25,13 @@ public interface IASTStatement extends IASTNode { /** * @since 5.1 */ + @Override public IASTStatement copy(); /** * @since 5.3 */ + @Override public IASTStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java index c515d50c74f..d98fbf5b7ed 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java @@ -68,10 +68,12 @@ public interface IASTSwitchStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTSwitchStatement copy(); /** * @since 5.3 */ + @Override public IASTSwitchStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java index 5f297e428d7..9161a767800 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java @@ -63,10 +63,12 @@ public interface IASTTypeId extends IASTNode { /** * @since 5.1 */ + @Override public IASTTypeId copy(); /** * @since 5.3 */ + @Override public IASTTypeId copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java index 7614957effd..f62f4313551 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java @@ -169,10 +169,12 @@ public interface IASTTypeIdExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IASTTypeIdExpression copy(); /** * @since 5.3 */ + @Override public IASTTypeIdExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java index b14626cc687..e46da278b5e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java @@ -56,5 +56,6 @@ public interface IASTTypeIdInitializerExpression extends IASTExpression { */ public void setInitializer(IASTInitializer initializer); + @Override public IASTTypeIdInitializerExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java index 1677d06e0a1..7af56b5f991 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java @@ -162,10 +162,12 @@ public interface IASTUnaryExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IASTUnaryExpression copy(); /** * @since 5.3 */ + @Override public IASTUnaryExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java index ba64a78776b..77dbe1ed089 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java @@ -62,10 +62,12 @@ public interface IASTWhileStatement extends IASTStatement { /** * @since 5.1 */ + @Override public IASTWhileStatement copy(); /** * @since 5.3 */ + @Override public IASTWhileStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java index 7c59f1479fc..6b96a2f8de9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java @@ -25,5 +25,6 @@ public interface IParameter extends IVariable { * Inherited from {@link IVariable}, always returns null. * @since 5.1 */ + @Override IValue getInitialValue(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java index 63ca49b1a92..f1a460525eb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java @@ -47,10 +47,12 @@ public interface ICASTArrayDesignator extends ICASTDesignator { /** * @since 5.1 */ + @Override public ICASTArrayDesignator copy(); /** * @since 5.3 */ + @Override public ICASTArrayDesignator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java index 386bbdd8a39..2dedeac2302 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java @@ -99,10 +99,12 @@ public interface ICASTArrayModifier extends IASTArrayModifier { /** * @since 5.1 */ + @Override public ICASTArrayModifier copy(); /** * @since 5.3 */ + @Override public ICASTArrayModifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java index 2bd039803e0..95a2dd0f31e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java @@ -23,10 +23,12 @@ public interface ICASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifier, /** * @since 5.1 */ + @Override public ICASTCompositeTypeSpecifier copy(); /** * @since 5.3 */ + @Override public ICASTCompositeTypeSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java index 1665ac244b7..14ba0dc05b3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java @@ -24,6 +24,7 @@ public interface ICASTDeclSpecifier extends IASTDeclSpecifier { /** * @since 5.1 */ + @Override public ICASTDeclSpecifier copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java index 7f6fbc3c315..aacfdab36d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java @@ -57,11 +57,13 @@ public interface ICASTDesignatedInitializer extends IASTInitializer, IASTInitial /** * @since 5.1 */ + @Override public ICASTDesignatedInitializer copy(); /** * @since 5.3 */ + @Override public ICASTDesignatedInitializer copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java index 567b4d3fbfd..59606cd7fcb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java @@ -23,10 +23,12 @@ public interface ICASTDesignator extends IASTNode { /** * @since 5.1 */ + @Override public ICASTDesignator copy(); /** * @since 5.3 */ + @Override public ICASTDesignator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java index 6638e61c18a..1230f774b6c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java @@ -25,10 +25,12 @@ public interface ICASTElaboratedTypeSpecifier extends /** * @since 5.1 */ + @Override public ICASTElaboratedTypeSpecifier copy(); /** * @since 5.3 */ + @Override public ICASTElaboratedTypeSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java index 8ffd70a56db..704f4fc9804 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java @@ -24,10 +24,12 @@ public interface ICASTEnumerationSpecifier extends ICASTDeclSpecifier, /** * @since 5.1 */ + @Override public ICASTEnumerationSpecifier copy(); /** * @since 5.3 */ + @Override public ICASTEnumerationSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java index 3b0c8b3ff1d..5efadb4bf8a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java @@ -46,10 +46,12 @@ public interface ICASTFieldDesignator extends ICASTDesignator { /** * @since 5.1 */ + @Override public ICASTFieldDesignator copy(); /** * @since 5.3 */ + @Override public ICASTFieldDesignator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java index 03d0314ad83..2b0df4a1b27 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java @@ -24,10 +24,12 @@ public interface ICASTPointer extends IASTPointer { /** * @since 5.1 */ + @Override public ICASTPointer copy(); /** * @since 5.3 */ + @Override public ICASTPointer copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java index 8bfbc7a65af..ad6d8553207 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java @@ -24,11 +24,13 @@ public interface ICASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICAST /** * @since 5.1 */ + @Override public ICASTSimpleDeclSpecifier copy(); /** * @since 5.3 */ + @Override public ICASTSimpleDeclSpecifier copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java index 6f31a0f8eeb..fdbe18184d5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java @@ -27,10 +27,12 @@ public interface ICASTTypeIdInitializerExpression extends IASTTypeIdInitializerE /** * @since 5.1 */ + @Override public ICASTTypeIdInitializerExpression copy(); /** * @since 5.3 */ + @Override public ICASTTypeIdInitializerExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java index 3206ef68694..e3187db6ef4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java @@ -24,10 +24,12 @@ public interface ICASTTypedefNameSpecifier extends IASTNamedTypeSpecifier, ICAST /** * @since 5.1 */ + @Override public ICASTTypedefNameSpecifier copy(); /** * @since 5.3 */ + @Override public ICASTTypedefNameSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java index da6e5c4ce89..d8637c81ec9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java @@ -33,10 +33,12 @@ public interface ICNodeFactory extends INodeFactory { public ICASTArrayDesignator newArrayDesignator(IASTExpression exp); + @Override public ICASTArrayModifier newArrayModifier(IASTExpression expr); public IGCCASTArrayRangeDesignator newArrayRangeDesignatorGCC(IASTExpression floor, IASTExpression ceiling); + @Override public ICASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name); /** @@ -50,16 +52,20 @@ public interface ICNodeFactory extends INodeFactory { */ public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializerClause initializer); + @Override public ICASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name); + @Override public ICASTEnumerationSpecifier newEnumerationSpecifier(IASTName name); public ICASTFieldDesignator newFieldDesignator(IASTName name); public ICASTKnRFunctionDeclarator newKnRFunctionDeclarator(IASTName[] parameterNames, IASTDeclaration[] parameterDeclarations); + @Override public ICASTPointer newPointer(); + @Override public ICASTSimpleDeclSpecifier newSimpleDeclSpecifier(); /** @@ -68,7 +74,9 @@ public interface ICNodeFactory extends INodeFactory { @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTSimpleDeclSpecifier newSimpleDeclSpecifierGCC(IASTExpression typeofExpression); + @Override public ICASTTypedefNameSpecifier newTypedefNameSpecifier(IASTName name); + @Override public ICASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer); } \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java index 49e598380b3..4db773eb9ee 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java @@ -22,5 +22,6 @@ public interface ICPointerType extends IPointerType { * is this a restrict pointer * */ + @Override boolean isRestrict(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java index 285e4547c02..0168f8cb828 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner; */ public interface ICPPASTArraySubscriptExpression extends IASTArraySubscriptExpression, IASTImplicitNameOwner { + @Override public ICPPASTArraySubscriptExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTArraySubscriptExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java index b1bf7a0e199..6f7e75df787 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java @@ -43,11 +43,13 @@ public interface ICPPASTBinaryExpression extends IASTBinaryExpression, IASTImpli /** * @since 5.1 */ + @Override public ICPPASTBinaryExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTBinaryExpression copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java index e579e3c6d11..de263711268 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java @@ -24,8 +24,10 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; public interface ICPPASTCapture extends IASTNode, ICPPASTPackExpandable { ASTNodeProperty IDENTIFIER = new ASTNodeProperty("ICPPASTCapture - IDENTIFIER [IASTName]"); //$NON-NLS-1$ + @Override ICPPASTCapture copy(); + @Override ICPPASTCapture copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java index 1b0597bf177..717d788641a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java @@ -49,5 +49,6 @@ public interface ICPPASTCastExpression extends IASTCastExpression { /** * @since 5.1 */ + @Override public ICPPASTCastExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java index 890501281d0..89aea7607d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java @@ -52,11 +52,13 @@ public interface ICPPASTConstructorChainInitializer extends IASTInitializer, ICP /** * @since 5.1 */ + @Override public ICPPASTConstructorChainInitializer copy(); /** * @since 5.3 */ + @Override public ICPPASTConstructorChainInitializer copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java index 02308e5f3a8..06b7039541c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java @@ -42,11 +42,13 @@ public interface ICPPASTConstructorInitializer extends IASTInitializer { /** * @since 5.1 */ + @Override public ICPPASTConstructorInitializer copy(); /** * @since 5.3 */ + @Override public ICPPASTConstructorInitializer copy(CopyStyle style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java index 0af83088fdf..ab3523e7e88 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java @@ -42,10 +42,12 @@ public interface ICPPASTConversionName extends IASTName { /** * @since 5.1 */ + @Override public ICPPASTConversionName copy(); /** * @since 5.3 */ + @Override public ICPPASTConversionName copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java index c3f9584e2be..16567e54292 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java @@ -70,11 +70,13 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier { /** * @since 5.1 */ + @Override public ICPPASTDeclSpecifier copy(); /** * @since 5.3 */ + @Override public ICPPASTDeclSpecifier copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java index 55fc3fdb996..d28d9316313 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java @@ -76,11 +76,13 @@ public interface ICPPASTDeleteExpression extends IASTExpression, IASTImplicitNam /** * @since 5.1 */ + @Override public ICPPASTDeleteExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTDeleteExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java index fc965e02b71..d343e8088d7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java @@ -34,11 +34,13 @@ public interface ICPPASTElaboratedTypeSpecifier extends /** * @since 5.1 */ + @Override public ICPPASTElaboratedTypeSpecifier copy(); /** * @since 5.3 */ + @Override public ICPPASTElaboratedTypeSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java index d4744fda95a..0910d79f7c9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java @@ -25,11 +25,13 @@ public interface ICPPASTEnumerationSpecifier extends IASTEnumerationSpecifier, I public static final ASTNodeProperty BASE_TYPE = new ASTNodeProperty( "ICPPASTEnumerationSpecifier.BASE_TYPE [ICPPASTDeclSpecifier]"); //$NON-NLS-1$ + @Override public ICPPASTEnumerationSpecifier copy(); /** * @since 5.3 */ + @Override public ICPPASTEnumerationSpecifier copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java index 3adecb972ea..1f9f0095a6c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java @@ -63,11 +63,13 @@ public interface ICPPASTExplicitTemplateInstantiation extends IASTDeclaration { /** * @since 5.1 */ + @Override public ICPPASTExplicitTemplateInstantiation copy(); /** * @since 5.3 */ + @Override public ICPPASTExplicitTemplateInstantiation copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java index 0393e524063..3c8cca4cbf8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner; */ public interface ICPPASTExpressionList extends IASTExpressionList, IASTImplicitNameOwner { + @Override public ICPPASTExpressionList copy(); /** * @since 5.3 */ + @Override public ICPPASTExpressionList copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java index 03a06174cbe..9e1a55b47ea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java @@ -40,11 +40,13 @@ public interface ICPPASTFieldReference extends IASTFieldReference, IASTImplicitN /** * @since 5.1 */ + @Override public ICPPASTFieldReference copy(); /** * @since 5.3 */ + @Override public ICPPASTFieldReference copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java index fb5281dd524..ae47d0d8b67 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java @@ -28,10 +28,12 @@ public interface ICPPASTForStatement extends IASTForStatement { /** * @since 5.1 */ + @Override public ICPPASTForStatement copy(); /** * @since 5.3 */ + @Override public ICPPASTForStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java index 985dfe12840..2898b98af9d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner; */ public interface ICPPASTFunctionCallExpression extends IASTFunctionCallExpression, IASTImplicitNameOwner { + @Override ICPPASTFunctionCallExpression copy(); /** * @since 5.3 */ + @Override ICPPASTFunctionCallExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java index ffc45aa2df2..e5d8af0d57b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java @@ -46,5 +46,6 @@ public interface ICPPASTFunctionTryBlockDeclarator extends /** * @since 5.1 */ + @Override public ICPPASTFunctionTryBlockDeclarator copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java index b92519009d3..49aeb1c9f62 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java @@ -45,10 +45,12 @@ public interface ICPPASTIfStatement extends IASTIfStatement { /** * @since 5.1 */ + @Override public ICPPASTIfStatement copy(); /** * @since 5.3 */ + @Override public ICPPASTIfStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java index 141fbfca63e..2dc1d7b2c4f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerList; */ public interface ICPPASTInitializerList extends IASTInitializerList, ICPPASTPackExpandable { + @Override ICPPASTInitializerList copy(); /** * @since 5.3 */ + @Override ICPPASTInitializerList copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java index d1e6aab720c..6f4450f157a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java @@ -57,15 +57,18 @@ public interface ICPPASTLinkageSpecification extends IASTDeclaration, IASTDeclar * @param declaration * IASTDeclaration */ + @Override public void addDeclaration(IASTDeclaration declaration); /** * @since 5.1 */ + @Override public ICPPASTLinkageSpecification copy(); /** * @since 5.3 */ + @Override public ICPPASTLinkageSpecification copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java index f1f8f8856ac..e93a7e76a7c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java @@ -45,10 +45,12 @@ public interface ICPPASTLiteralExpression extends IASTLiteralExpression { /** * @since 5.1 */ + @Override public ICPPASTLiteralExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTLiteralExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java index 92b0bac98b1..884c2b2f077 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java @@ -40,11 +40,13 @@ public interface ICPPASTNamedTypeSpecifier extends IASTNamedTypeSpecifier, /** * @since 5.1 */ + @Override public ICPPASTNamedTypeSpecifier copy(); /** * @since 5.3 */ + @Override public ICPPASTNamedTypeSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java index a01bf8c6c53..146c9d79512 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java @@ -72,11 +72,13 @@ public interface ICPPASTNamespaceAlias extends IASTDeclaration, IASTNameOwner { /** * @since 5.1 */ + @Override public ICPPASTNamespaceAlias copy(); /** * @since 5.3 */ + @Override public ICPPASTNamespaceAlias copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java index af0d7b76706..6c466746c56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java @@ -74,11 +74,13 @@ public interface ICPPASTNewExpression extends IASTExpression, IASTImplicitNameOw /** * @since 5.1 */ + @Override public ICPPASTNewExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTNewExpression copy(CopyStyle style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java index 403a4bd6094..344960f2a06 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java @@ -23,10 +23,12 @@ public interface ICPPASTOperatorName extends IASTName { /** * @since 5.1 */ + @Override public ICPPASTOperatorName copy(); /** * @since 5.3 */ + @Override public ICPPASTOperatorName copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java index 3f8c82d5307..b84858e4d84 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java @@ -46,6 +46,7 @@ public interface ICPPASTPointerToMember extends IASTPointer, IASTNameOwner { /** * @since 5.1 */ + @Override public ICPPASTPointerToMember copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java index ea1eae11229..d5c72f49e73 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java @@ -47,6 +47,7 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner { * The last name is often semantically significant. * */ + @Override public IASTName getLastName(); /** @@ -74,10 +75,12 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner { /** * @since 5.1 */ + @Override public ICPPASTQualifiedName copy(); /** * @since 5.3 */ + @Override public ICPPASTQualifiedName copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java index f4de4049c8b..fde6289ad40 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java @@ -23,11 +23,13 @@ public interface ICPPASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICP /** * @since 5.1 */ + @Override public ICPPASTSimpleDeclSpecifier copy(); /** * @since 5.3 */ + @Override public ICPPASTSimpleDeclSpecifier copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java index 12e1dcbd208..0b15cd95447 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java @@ -53,11 +53,13 @@ public interface ICPPASTSimpleTypeConstructorExpression extends IASTExpression { /** * @since 5.1 */ + @Override public ICPPASTSimpleTypeConstructorExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTSimpleTypeConstructorExpression copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java index 01ffd316f2d..34ccc93a17d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java @@ -86,10 +86,12 @@ public interface ICPPASTSimpleTypeTemplateParameter extends ICPPASTTemplateParam /** * @since 5.1 */ + @Override public ICPPASTSimpleTypeTemplateParameter copy(); /** * @since 5.3 */ + @Override public ICPPASTSimpleTypeTemplateParameter copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java index 87753ab4ca0..e97f618e8f2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java @@ -53,10 +53,12 @@ public interface ICPPASTSwitchStatement extends IASTSwitchStatement { /** * @since 5.1 */ + @Override public ICPPASTSwitchStatement copy(); /** * @since 5.3 */ + @Override public ICPPASTSwitchStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java index af99c09645f..7ef6c4e6661 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java @@ -94,10 +94,12 @@ public interface ICPPASTTemplateDeclaration extends IASTDeclaration { /** * @since 5.1 */ + @Override public ICPPASTTemplateDeclaration copy(); /** * @since 5.3 */ + @Override public ICPPASTTemplateDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java index 5f379d33fa5..147bcbc4962 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java @@ -87,11 +87,13 @@ public interface ICPPASTTemplateId extends IASTName, IASTNameOwner { /** * @since 5.1 */ + @Override public ICPPASTTemplateId copy(); /** * @since 5.3 */ + @Override public ICPPASTTemplateId copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java index 98d731a4204..d1e4a69d408 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java @@ -31,10 +31,12 @@ public interface ICPPASTTemplateParameter extends IASTNode { /** * @since 5.1 */ + @Override public ICPPASTTemplateParameter copy(); /** * @since 5.3 */ + @Override public ICPPASTTemplateParameter copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java index 7dae09c69ec..e6fd269b0e5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java @@ -45,10 +45,12 @@ public interface ICPPASTTemplateSpecialization extends IASTDeclaration { /** * @since 5.1 */ + @Override public ICPPASTTemplateSpecialization copy(); /** * @since 5.3 */ + @Override public ICPPASTTemplateSpecialization copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java index dc285516c86..ff40b2ac774 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java @@ -63,11 +63,13 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends ICPPASTTemplatePa /** * @since 5.1 */ + @Override public ICPPASTTemplatedTypeTemplateParameter copy(); /** * @since 5.3 */ + @Override public ICPPASTTemplatedTypeTemplateParameter copy(CopyStyle style); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java index ac1d24e5a0d..2c8c4a3a725 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java @@ -30,10 +30,12 @@ public interface ICPPASTTranslationUnit extends IASTTranslationUnit { /** * @since 5.1 */ + @Override public ICPPASTTranslationUnit copy(); /** * @since 5.3 */ + @Override public ICPPASTTranslationUnit copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java index 5cba5dac7c1..c367cdf8ea6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java @@ -67,11 +67,13 @@ public interface ICPPASTTryBlockStatement extends IASTStatement { /** * @since 5.1 */ + @Override public ICPPASTTryBlockStatement copy(); /** * @since 5.3 */ + @Override public ICPPASTTryBlockStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java index 985f77caf75..f5f4f32c1ed 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java @@ -31,10 +31,12 @@ public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression { /** * @since 5.1 */ + @Override public ICPPASTTypeIdExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTTypeIdExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java index 2123f9ab9be..94d54fe9e48 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java @@ -71,6 +71,7 @@ public interface ICPPASTTypenameExpression extends ICPPASTSimpleTypeConstructorE * @param expressionList * IASTExpression */ + @Override public void setInitialValue(IASTExpression expressionList); /** @@ -78,11 +79,13 @@ public interface ICPPASTTypenameExpression extends ICPPASTSimpleTypeConstructorE * * @return IASTExpression */ + @Override public IASTExpression getInitialValue(); /** * @since 5.1 */ + @Override public ICPPASTTypenameExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java index d6ef6b705a5..db93cccbd88 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java @@ -39,10 +39,12 @@ public interface ICPPASTUnaryExpression extends IASTUnaryExpression, IASTImplici /** * @since 5.1 */ + @Override public ICPPASTUnaryExpression copy(); /** * @since 5.3 */ + @Override public ICPPASTUnaryExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java index cb5dfc9e57d..146b3153ccd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java @@ -61,10 +61,12 @@ public interface ICPPASTUsingDeclaration extends IASTDeclaration, IASTNameOwner /** * @since 5.1 */ + @Override public ICPPASTUsingDeclaration copy(); /** * @since 5.3 */ + @Override public ICPPASTUsingDeclaration copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java index 6591412b6e3..63898bbc283 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java @@ -52,11 +52,13 @@ public interface ICPPASTUsingDirective extends IASTDeclaration, IASTNameOwner { /** * @since 5.1 */ + @Override public ICPPASTUsingDirective copy(); /** * @since 5.3 */ + @Override public ICPPASTUsingDirective copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java index d73108b7d51..f068d05de17 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java @@ -54,10 +54,12 @@ public interface ICPPASTWhileStatement extends IASTWhileStatement { /** * @since 5.1 */ + @Override public ICPPASTWhileStatement copy(); /** * @since 5.3 */ + @Override public ICPPASTWhileStatement copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java index 540197cef52..597770da991 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java @@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IBinding; */ public interface ICPPClassSpecialization extends ICPPSpecialization, ICPPClassType { + @Override ICPPClassType getSpecializedBinding(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java index 23893ba0fa1..8c5f0ceef41 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java @@ -30,7 +30,8 @@ public interface ICPPFunction extends IFunction, ICPPBinding { /** * is this an inline function */ - public boolean isInline(); + @Override + public boolean isInline(); /** * Returns whether this function is declared as extern "C". @@ -49,12 +50,14 @@ public interface ICPPFunction extends IFunction, ICPPBinding { * {@inheritDoc} * @since 5.1 */ - public ICPPFunctionType getType(); + @Override + public ICPPFunctionType getType(); /** * @since 5.2 */ - public ICPPParameter[] getParameters(); + @Override + public ICPPParameter[] getParameters(); /** * @since 5.2 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java index f002e328c31..d0ec04341c8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java @@ -41,8 +41,10 @@ public interface ICPPNodeFactory extends INodeFactory { /** * @since 5.2 */ + @Override public ICPPASTArrayDeclarator newArrayDeclarator(IASTName name); + @Override public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript); /** @@ -52,6 +54,7 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTBaseSpecifier newBaseSpecifier(IASTName name, int visibility, boolean isVirtual); + @Override public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2); /** @@ -69,10 +72,12 @@ public interface ICPPNodeFactory extends INodeFactory { */ public ICPPASTCapture newCapture(); + @Override public ICPPASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand); public ICPPASTCatchHandler newCatchHandler(IASTDeclaration decl, IASTStatement body); + @Override public ICPPASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name); /** @@ -102,10 +107,12 @@ public interface ICPPNodeFactory extends INodeFactory { /** * @since 5.2 */ + @Override public ICPPASTDeclarator newDeclarator(IASTName name); public ICPPASTDeleteExpression newDeleteExpression(IASTExpression operand); + @Override public ICPPASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name); /** @@ -121,13 +128,16 @@ public interface ICPPNodeFactory extends INodeFactory { @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiationGPP(IASTDeclaration declaration); + @Override public ICPPASTExpressionList newExpressionList(); /** * @since 5.2 */ + @Override public ICPPASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize); + @Override public ICPPASTFieldReference newFieldReference(IASTName name, IASTExpression owner); public ICPPASTForStatement newForStatement(); @@ -135,22 +145,27 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTForStatement newForStatement(IASTStatement init, IASTDeclaration condition, IASTExpression iterationExpression, IASTStatement body); + @Override public ICPPASTForStatement newForStatement(IASTStatement init, IASTExpression condition, IASTExpression iterationExpression, IASTStatement body); /** * @deprecated Replaced by {@link #newFunctionCallExpression(IASTExpression, IASTInitializerClause[])}. */ + @Override @Deprecated public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList); /** * @since 5.2 */ + @Override public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments); + @Override public ICPPASTFunctionDeclarator newFunctionDeclarator(IASTName name); + @Override public ICPPASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator, IASTStatement bodyStatement); @@ -161,11 +176,13 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTIfStatement newIfStatement(IASTDeclaration condition, IASTStatement then, IASTStatement elseClause); + @Override public ICPPASTIfStatement newIfStatement(IASTExpression condition, IASTStatement then, IASTStatement elseClause); /** * @since 5.2 */ + @Override public ICPPASTInitializerList newInitializerList(); /** @@ -175,6 +192,7 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTLinkageSpecification newLinkageSpecification(String literal); + @Override public ICPPASTLiteralExpression newLiteralExpression(int kind, String rep); public ICPPASTNamespaceAlias newNamespaceAlias(IASTName alias, IASTName qualifiedName); @@ -200,6 +218,7 @@ public interface ICPPNodeFactory extends INodeFactory { */ public ICPPASTPackExpansionExpression newPackExpansionExpression(IASTExpression pattern); + @Override public ICPPASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator); /** @@ -242,6 +261,7 @@ public interface ICPPNodeFactory extends INodeFactory { */ public IASTReturnStatement newReturnStatement(IASTInitializerClause retValue); + @Override public ICPPASTSimpleDeclSpecifier newSimpleDeclSpecifier(); /** @@ -273,6 +293,7 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTSwitchStatement newSwitchStatement(IASTDeclaration controller, IASTStatement body); + @Override public ICPPASTSwitchStatement newSwitchStatement(IASTExpression controlloer, IASTStatement body); public ICPPASTTemplateDeclaration newTemplateDeclaration(IASTDeclaration declaration); @@ -286,6 +307,7 @@ public interface ICPPNodeFactory extends INodeFactory { /** * @deprecated Replaced by {@link #newTranslationUnit(IScanner)}. */ + @Override @Deprecated public ICPPASTTranslationUnit newTranslationUnit(); @@ -295,17 +317,21 @@ public interface ICPPNodeFactory extends INodeFactory { * @scanner the preprocessor the translation unit interacts with. * @since 5.2 */ + @Override public ICPPASTTranslationUnit newTranslationUnit(IScanner scanner); public ICPPASTTryBlockStatement newTryBlockStatement(IASTStatement body); + @Override public ICPPASTNamedTypeSpecifier newTypedefNameSpecifier(IASTName name); /** * @since 5.2 */ + @Override public ICPPASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator); + @Override public ICPPASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId); /** @@ -314,6 +340,7 @@ public interface ICPPNodeFactory extends INodeFactory { @Deprecated public ICPPASTTypenameExpression newTypenameExpression(IASTName qualifiedName, IASTExpression expr, boolean isTemplate); + @Override public ICPPASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand); public ICPPASTUsingDeclaration newUsingDeclaration(IASTName name); @@ -326,5 +353,6 @@ public interface ICPPNodeFactory extends INodeFactory { public ICPPASTWhileStatement newWhileStatement(IASTDeclaration condition, IASTStatement body); + @Override public ICPPASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java index 90801b4d4ac..e86fa831fa2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java @@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IType; */ public interface ICPPTemplateTemplateParameter extends ICPPTemplateParameter, ICPPClassTemplate { + @Override public ICPPTemplateParameter[] getTemplateParameters(); /** @@ -36,5 +37,6 @@ public interface ICPPTemplateTemplateParameter extends ICPPTemplateParameter, IC * * @since 5.1 */ + @Override public boolean isSameType(IType type); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java index ca78643bc97..0c494c5bc52 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java @@ -33,5 +33,6 @@ public interface ICPPTemplateTypeParameter extends ICPPTemplateParameter, IType * * @since 5.1 */ + @Override public boolean isSameType(IType type); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java index 6990d2188b3..fccaed20501 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java @@ -49,10 +49,12 @@ public interface IGNUASTCompoundStatementExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IGNUASTCompoundStatementExpression copy(); /** * @since 5.3 */ + @Override public IGNUASTCompoundStatementExpression copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java index 89987eb3b6e..6d934b3f0f3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java @@ -44,5 +44,6 @@ public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression { /** * @since 5.1 */ + @Override public IGNUASTTypeIdExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java index 86be3b62afe..e1573bb2ae2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java @@ -24,5 +24,6 @@ public interface IGNUASTUnaryExpression extends IASTUnaryExpression { /** * @since 5.1 */ + @Override public IGNUASTUnaryExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java index f92d0611008..bb22d42ff5a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java @@ -55,10 +55,12 @@ public class GCCLanguage extends AbstractCLikeLanguage { return super.getAdapter(adapter); } + @Override public String getId() { return ID; } + @Override public int getLinkageID() { return ILinkage.C_LINKAGE_ID; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java index 7bc8b0fde85..d5d2c07bed2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java @@ -78,10 +78,12 @@ public interface ICASTKnRFunctionDeclarator extends IASTFunctionDeclarator { /** * @since 5.1 */ + @Override public ICASTKnRFunctionDeclarator copy(); /** * @since 5.3 */ + @Override public ICASTKnRFunctionDeclarator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java index 31750550de2..cae2ac013c4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java @@ -72,10 +72,12 @@ public interface IGCCASTArrayRangeDesignator extends ICASTDesignator { /** * @since 5.1 */ + @Override public IGCCASTArrayRangeDesignator copy(); /** * @since 5.3 */ + @Override public IGCCASTArrayRangeDesignator copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java index 9c4b5b1717e..21462ad6aa2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java @@ -57,10 +57,12 @@ public interface IGCCASTSimpleDeclSpecifier extends ICASTSimpleDeclSpecifier { /** * @since 5.1 */ + @Override public IGCCASTSimpleDeclSpecifier copy(); /** * @since 5.3 */ + @Override public IGCCASTSimpleDeclSpecifier copy(CopyStyle style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java index 152fd297ed0..5336a2b409d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java @@ -41,6 +41,7 @@ public interface IGPPASTBinaryExpression extends ICPPASTBinaryExpression { /** * @since 5.1 */ + @Override public IGPPASTBinaryExpression copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java index f95edf9008a..9650c5cfc63 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java @@ -25,5 +25,6 @@ public interface IGPPASTDeclSpecifier extends IASTDeclSpecifier { /** * @since 5.1 */ + @Override public IGPPASTDeclSpecifier copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java index fbaedb9da24..87300b8545f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java @@ -41,5 +41,6 @@ public interface IGPPASTExplicitTemplateInstantiation extends /** * @since 5.1 */ + @Override public IGPPASTExplicitTemplateInstantiation copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java index a3920683fc6..0c8c914f42c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java @@ -21,5 +21,6 @@ public interface IGPPASTPointer extends IASTPointer { /** * @since 5.1 */ + @Override public IGPPASTPointer copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java index 18e97ab3af0..cc4feb7a0fc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java @@ -21,5 +21,6 @@ public interface IGPPASTPointerToMember extends IGPPASTPointer, ICPPASTPointerTo /** * @since 5.1 */ + @Override public IGPPASTPointerToMember copy(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java index 3db6a29fe56..3f0ee07f146 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java @@ -39,6 +39,7 @@ public interface IGPPASTSimpleDeclSpecifier extends IGPPASTDeclSpecifier, ICPPAS /** * @since 5.1 */ + @Override public IGPPASTSimpleDeclSpecifier copy(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java index debfb193ba5..e9ec9210087 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java @@ -37,9 +37,11 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE fExpansion= expansion; } + @Override public char[] getSignature() { return fSignature; } + @Override public char[] getExpansion() { return fExpansion; } @@ -51,6 +53,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE /* * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#support$InIdentifiers() */ + @Override public boolean support$InIdentifiers() { return false; } @@ -59,6 +62,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportAtSignInIdentifiers() { return false; } @@ -68,6 +72,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportUTFLiterals() { return true; } @@ -77,6 +82,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportSlashPercentComments() { return false; } @@ -84,6 +90,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE /* * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#supportAdditionalNumericLiteralSuffixes() */ + @Override public char[] supportAdditionalNumericLiteralSuffixes() { return null; } @@ -91,18 +98,22 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE /* * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#supportMinAndMaxOperators() */ + @Override public boolean supportMinAndMaxOperators() { return false; } + @Override public CharArrayIntMap getAdditionalPreprocessorKeywords() { return fAddPreprocessorKeywords; } + @Override public CharArrayIntMap getAdditionalKeywords() { return fAddKeywords; } + @Override public IMacro[] getAdditionalMacros() { if (fAddMacros == null) { if (fAddMacroList == null) { @@ -190,6 +201,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE /** * @deprecated see {@link IScannerExtensionConfiguration#initializeMacroValuesTo1()} */ + @Override @Deprecated public boolean initializeMacroValuesTo1() { return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java index cb54e9cd27c..51a89884fbc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java @@ -49,6 +49,7 @@ public class CLanguageKeywords implements ICLanguageKeywords { this.config = config; } + @Override public String[] getKeywords() { if (keywords == null) { Set keywordSet = new HashSet(KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, language)); @@ -64,6 +65,7 @@ public class CLanguageKeywords implements ICLanguageKeywords { return keywords; } + @Override public String[] getBuiltinTypes() { if (builtinTypes == null) { Set types = KeywordSets.getKeywords(KeywordSetKey.TYPES, language); @@ -72,6 +74,7 @@ public class CLanguageKeywords implements ICLanguageKeywords { return builtinTypes; } + @Override public String[] getPreprocessorKeywords() { if (preprocessorKeywords == null) { Set keywords = new HashSet(KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, language)); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java index 2589220e106..27c97674c41 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java @@ -25,6 +25,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportAlignOfUnaryExpression() */ + @Override public boolean supportAlignOfUnaryExpression() { return false; } @@ -32,6 +33,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportAttributeSpecifiers() */ + @Override public boolean supportAttributeSpecifiers() { return false; } @@ -39,6 +41,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportDeclspecSpecifiers() */ + @Override public boolean supportDeclspecSpecifiers() { return false; } @@ -46,6 +49,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportGCCOtherBuiltinSymbols() */ + @Override public boolean supportGCCOtherBuiltinSymbols() { return false; } @@ -53,6 +57,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportGCCStyleDesignators() */ + @Override public boolean supportGCCStyleDesignators() { return false; } @@ -60,6 +65,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportKnRC() */ + @Override public boolean supportKnRC() { return false; } @@ -67,6 +73,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportStatementsInExpressions() */ + @Override public boolean supportStatementsInExpressions() { return false; } @@ -74,6 +81,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportTypeofUnaryExpressions() */ + @Override public boolean supportTypeofUnaryExpressions() { return false; } @@ -81,6 +89,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE /* * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#getBuiltinSymbolProvider() */ + @Override public IBuiltinBindingsProvider getBuiltinBindingsProvider() { return new GCCBuiltinSymbolProvider(ParserLanguage.C, supportGCCOtherBuiltinSymbols()); } @@ -89,6 +98,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportParameterInfoBlock() { return false; } @@ -97,6 +107,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportExtendedSizeofOperator() { return false; } @@ -105,6 +116,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportFunctionStyleAssembler() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java index 20b8b98a1d9..07f3913ca02 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java @@ -26,6 +26,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#allowRestrictPointerOperators() */ + @Override public boolean allowRestrictPointerOperators() { return false; } @@ -33,6 +34,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportAlignOfUnaryExpression() */ + @Override public boolean supportAlignOfUnaryExpression() { return false; } @@ -40,6 +42,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportAttributeSpecifiers() */ + @Override public boolean supportAttributeSpecifiers() { return false; } @@ -47,6 +50,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportComplexNumbers() */ + @Override public boolean supportComplexNumbers() { return false; } @@ -54,6 +58,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportDeclspecSpecifiers() */ + @Override public boolean supportDeclspecSpecifiers() { return false; } @@ -61,6 +66,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportExtendedTemplateSyntax() */ + @Override public boolean supportExtendedTemplateSyntax() { return false; } @@ -68,6 +74,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportGCCOtherBuiltinSymbols() */ + @Override public boolean supportGCCOtherBuiltinSymbols() { return false; } @@ -75,6 +82,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportKnRC() */ + @Override public boolean supportKnRC() { return false; } @@ -82,6 +90,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportLongLongs() */ + @Override public boolean supportLongLongs() { return false; } @@ -89,6 +98,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportMinAndMaxOperators() */ + @Override public boolean supportMinAndMaxOperators() { return false; } @@ -96,6 +106,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportRestrictKeyword() */ + @Override public boolean supportRestrictKeyword() { return false; } @@ -103,6 +114,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportStatementsInExpressions() */ + @Override public boolean supportStatementsInExpressions() { return false; } @@ -110,6 +122,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportTypeofUnaryExpressions() */ + @Override public boolean supportTypeofUnaryExpressions() { return false; } @@ -118,6 +131,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportParameterInfoBlock() { return false; } @@ -126,6 +140,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportExtendedSizeofOperator() { return false; } @@ -134,6 +149,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar * {@inheritDoc} * @since 5.1 */ + @Override public boolean supportFunctionStyleAssembler() { return false; } @@ -141,6 +157,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar /* * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#getBuiltinBindingsProvider() */ + @Override public IBuiltinBindingsProvider getBuiltinBindingsProvider() { return new GCCBuiltinSymbolProvider(ParserLanguage.CPP, supportGCCOtherBuiltinSymbols()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java index 6156ab8ddac..fe3ca770572 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java @@ -48,6 +48,7 @@ public abstract class AbstractExportProjectProvider implements IExportProjectPro /* * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#setApplicationArguments(java.lang.String[]) */ + @Override public void setApplicationArguments(String[] arguments) { this.appArguments= arguments.clone(); this.arguments= Collections.unmodifiableMap(CLIUtil.parseToMap(arguments)); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java index d0180819be1..5bcfcf05be3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java @@ -74,6 +74,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider * (non-Javadoc) * @see org.eclipse.cdt.core.index.export.IProjectForExportManager#createProject(java.util.Map) */ + @Override public ICProject createProject() throws CoreException { // -source File source= new File(getSingleString(OPT_SOURCE)); @@ -115,6 +116,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider final ICProject newProject[] = new ICProject[1]; ws.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspace workspace= ResourcesPlugin.getWorkspace(); IProject project= workspace.getRoot().getProject("__prebuilt_index_temp__" + System.currentTimeMillis()); //$NON-NLS-1$ @@ -181,6 +183,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider /* * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getLocationConverter(org.eclipse.cdt.core.model.ICProject) */ + @Override public IIndexLocationConverter getLocationConverter(final ICProject cproject) { return new ResourceContainerRelativeLocationConverter(content); } @@ -188,6 +191,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider /* * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getExportProperties() */ + @Override public Map getExportProperties() { Map properties= new HashMap(); Date now= Calendar.getInstance().getTime(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java index 64650e13a17..4841d81b535 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java @@ -24,6 +24,7 @@ public abstract class AbstractParserLogService implements IParserLogService { return new ParserLogServiceWrapper(log); } + @Override public void traceLog(String message) { } @@ -46,6 +47,7 @@ public abstract class AbstractParserLogService implements IParserLogService { public void errorLog(String message) { } + @Override public boolean isTracing(){ return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java index 22ffa0c17f9..92be2a93c94 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java @@ -63,6 +63,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getMacroFiles() */ + @Override public String[] getMacroFiles() { if (macroFiles == null) return EMPTY_STRING_ARRAY; @@ -72,6 +73,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getIncludeFiles() */ + @Override public String[] getIncludeFiles() { if (includeFiles == null) return EMPTY_STRING_ARRAY; @@ -81,6 +83,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getLocalIncludePath() */ + @Override public String[] getLocalIncludePath() { if (localIncludePaths == null) return EMPTY_STRING_ARRAY; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java index 51fa91c3aef..5c8d957b0b6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java @@ -33,6 +33,7 @@ public interface ITokenDuple { public int getSegmentCount(); public abstract Iterator iterator(); + @Override public abstract String toString(); public char [] toCharArray(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java index fe4e415a9ec..cab4145565e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java @@ -38,14 +38,16 @@ public class ScannerInfo implements IScannerInfo { /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.IScannerInfo#getDefinedSymbols() */ - public Map getDefinedSymbols() { + @Override + public Map getDefinedSymbols() { return definedSymbols; } /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.IScannerInfo#getIncludePaths() */ - public String[] getIncludePaths() { + @Override + public String[] getIncludePaths() { return includePaths; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ArrayUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ArrayUtil.java index 029c609b77e..5bd2d9863ba 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ArrayUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ArrayUtil.java @@ -16,6 +16,8 @@ package org.eclipse.cdt.core.parser.util; import java.lang.reflect.Array; +import org.eclipse.core.runtime.Assert; + /** * @noextend This class is not intended to be subclassed by clients. */ @@ -28,11 +30,12 @@ public abstract class ArrayUtil { * If the array is null or not large enough, a larger one is allocated, using * the given class object. */ - static public Object[] append(Class c, Object[] array, Object obj) { + @SuppressWarnings("unchecked") + static public T[] append(Class c, T[] array, T obj) { if (obj == null) return array; if (array == null || array.length == 0) { - array = (Object[]) Array.newInstance(c, DEFAULT_LENGTH); + array = (T[]) Array.newInstance(c, DEFAULT_LENGTH); array[0] = obj; return array; } @@ -43,7 +46,7 @@ public abstract class ArrayUtil { return array; } - Object[] temp = (Object[]) Array.newInstance(c, Math.max(array.length * 2, DEFAULT_LENGTH)); + T[] temp = (T[]) Array.newInstance(c, Math.max(array.length * 2, DEFAULT_LENGTH)); System.arraycopy(array, 0, temp, 0, array.length); temp[array.length] = obj; return temp; @@ -69,38 +72,12 @@ public abstract class ArrayUtil { return haveNull ? right + 1 : -1; } - /** - * Assumes that array contains nulls at the end, only. - * Appends object using the current length of the array. - * @since 4.0 - */ - static public Object[] append(Class c, Object[] array, int currentLength, Object obj) { - if (obj == null) - return array; - if (array == null || array.length == 0) { - array = (Object[]) Array.newInstance(c, DEFAULT_LENGTH); - array[0] = obj; - return array; - } - - if (currentLength < array.length) { - assert array[currentLength] == null; - assert currentLength == 0 || array[currentLength - 1] != null; - array[currentLength]= obj; - return array; - } - - Object[] temp = (Object[]) Array.newInstance(c, array.length * 2); - System.arraycopy(array, 0, temp, 0, array.length); - temp[array.length] = obj; - return temp; - } - /** * Assumes that array contains nulls at the end, only. * Appends element after the last non-null element. * If the array is not large enough, a larger one is allocated. - * Null array is supported for backward compatibility only and only when T is Object. + * Null array is supported for backward compatibility only and only when T is + * Object. */ @SuppressWarnings("unchecked") static public T[] append(T[] array, T obj) { @@ -127,12 +104,41 @@ public abstract class ArrayUtil { } /** - * Type safe version of {@link #append(Class, Object[], int, Object)} + * @deprecated Use {@link #appendAt(Class, Object[], int, Object)} instead. + * @since 4.0 + */ + @Deprecated + @SuppressWarnings("unchecked") + static public Object[] append(Class c, Object[] array, int currentLength, Object obj) { + return appendAt((Class) c, array, currentLength, obj); + } + + /** + * Assumes that array contains nulls at the end, only. + * Appends object using the current length of the array. * @since 5.1 */ @SuppressWarnings("unchecked") static public T[] appendAt(Class c, T[] array, int currentLength, T obj) { - return (T[]) append(c, array, currentLength, obj); + if (obj == null) + return array; + if (array == null || array.length == 0) { + array = (T[]) Array.newInstance(c, DEFAULT_LENGTH); + array[0] = obj; + return array; + } + + if (currentLength < array.length) { + Assert.isTrue(array[currentLength] == null); + Assert.isTrue(currentLength == 0 || array[currentLength - 1] != null); + array[currentLength]= obj; + return array; + } + + T[] temp = (T[]) Array.newInstance(c, array.length * 2); + System.arraycopy(array, 0, temp, 0, array.length); + temp[array.length] = obj; + return temp; } /** @@ -147,9 +153,10 @@ public abstract class ArrayUtil { * @param array the array to be trimmed * @param forceNew */ - static public Object[] trim(Class c, Object[] array, boolean forceNew) { + @SuppressWarnings("unchecked") + static public T[] trim(Class c, T[] array, boolean forceNew) { if (array == null) - return (Object[]) Array.newInstance(c, 0); + return (T[]) Array.newInstance(c, 0); int i = array.length; if (i == 0 || array[i - 1] != null) { @@ -158,15 +165,15 @@ public abstract class ArrayUtil { } } else { i= findFirstNull(array); - assert i >= 0; + Assert.isTrue(i >= 0); } - Object[] temp = (Object[]) Array.newInstance(c, i); + T[] temp = (T[]) Array.newInstance(c, i); System.arraycopy(array, 0, temp, 0, i); return temp; } - public static Object[] trim(Class c, Object[] array) { + public static T[] trim(Class c, T[] array) { return trim(c, array, false); } @@ -190,7 +197,7 @@ public abstract class ArrayUtil { } } else { i= findFirstNull(array); - assert i >= 0; + Assert.isTrue(i >= 0); } T[] temp = (T[]) Array.newInstance(array.getClass().getComponentType(), i); @@ -219,7 +226,8 @@ public abstract class ArrayUtil { * @param source The source array. May not be null. * @return The concatenated array, which may be the same as the first parameter. */ - public static Object[] addAll(Class c, Object[] dest, Object[] source) { + @SuppressWarnings("unchecked") + public static T[] addAll(Class c, T[] dest, T[] source) { if (source == null || source.length == 0) return dest; @@ -232,7 +240,7 @@ public abstract class ArrayUtil { } if (dest == null || dest.length == 0) { - dest = (Object[]) Array.newInstance(c, numToAdd); + dest = (T[]) Array.newInstance(c, numToAdd); System.arraycopy(source, 0, dest, 0, numToAdd); return dest; } @@ -246,7 +254,7 @@ public abstract class ArrayUtil { System.arraycopy(source, 0, dest, firstFree, numToAdd); return dest; } - Object[] temp = (Object[]) Array.newInstance(c, firstFree + numToAdd); + T[] temp = (T[]) Array.newInstance(c, firstFree + numToAdd); System.arraycopy(dest, 0, temp, 0, firstFree); System.arraycopy(source, 0, temp, firstFree, numToAdd); return temp; @@ -302,21 +310,22 @@ public abstract class ArrayUtil { * object identity. * @param array the array to search * @param obj the object to search for - * @return true if the specified array contains the specified object, or the specified array is null + * @return true if the specified array contains the specified object, or + * the specified array is null */ - public static boolean contains(Object[] array, Object obj) { + public static boolean contains(T[] array, T obj) { return indexOf(array, obj) >= 0; } /** - * Returns the index into the specified array of the specified object, or -1 if the array does not - * contain the object, or if the array is null. Comparison is by object identity. + * Returns the index into the specified array of the specified object, or -1 if the array does + * not contain the object, or if the array is null. Comparison is by object identity. * @param array the array to search * @param obj the object to search for - * @return the index into the specified array of the specified object, or -1 if the array does not - * contain the object, or if the array is null + * @return the index into the specified array of the specified object, or -1 if the array does + * not contain the object, or if the array is null */ - public static int indexOf(Object[] array, Object obj) { + public static int indexOf(T[] array, T obj) { int result = -1; if (array != null) { for (int i = 0; i < array.length; i++) { @@ -333,22 +342,23 @@ public abstract class ArrayUtil { * object identity. * @param array the array to search * @param obj the object to search for - * @return true if the specified array contains the specified object, or the specified array is null + * @return true if the specified array contains the specified object, or the specified array is + * null */ - public static boolean containsEqual(Object[] array, Object obj) { + public static boolean containsEqual(T[] array, T obj) { return indexOfEqual(array, obj) != -1; } /** * Assumes that array contains nulls at the end, only. - * Returns the index into the specified array of the specified object, or -1 if the array does not - * contain the object, or if the array is null. Comparison is by equals(). + * Returns the index into the specified array of the specified object, or -1 if the array does + * not contain the object, or if the array is null. Comparison is by equals(). * @param comments the array to search * @param comment the object to search for - * @return the index into the specified array of the specified object, or -1 if the array does not - * contain an equal object, or if the array is null + * @return the index into the specified array of the specified object, or -1 if the array does + * not contain an equal object, or if the array is null */ - public static int indexOfEqual(Object[] comments, Object comment) { + public static int indexOfEqual(T[] comments, T comment) { int result = -1; if (comments != null) { for (int i= 0; (i < comments.length) && (comments[i] != null); i++) { @@ -368,9 +378,10 @@ public abstract class ArrayUtil { * * If there are no nulls in the original array then the original array is returned. */ - public static Object[] removeNulls(Class c, Object[] array) { + @SuppressWarnings("unchecked") + public static T[] removeNulls(Class c, T[] array) { if (array == null) - return (Object[]) Array.newInstance(c, 0); + return (T[]) Array.newInstance(c, 0); int i; int validEntries = 0; @@ -382,7 +393,7 @@ public abstract class ArrayUtil { if (array.length == validEntries) return array; - Object[] newArray = (Object[]) Array.newInstance(c, validEntries); + T[] newArray = (T[]) Array.newInstance(c, validEntries); int j = 0; for (i = 0; i < array.length; i++) { if (array[i] != null) @@ -404,9 +415,8 @@ public abstract class ArrayUtil { */ @SuppressWarnings("unchecked") public static T[] removeNulls(T[] array) { - int i; int validEntries = 0; - for (i = 0; i < array.length; i++) { + for (int i = 0; i < array.length; i++) { if (array[i] != null) validEntries++; } @@ -416,7 +426,7 @@ public abstract class ArrayUtil { T[] newArray = (T[]) Array.newInstance(array.getClass().getComponentType(), validEntries); int j = 0; - for (i = 0; i < array.length; i++) { + for (int i = 0; i < array.length; i++) { if (array[i] != null) newArray[j++] = array[i]; } @@ -425,40 +435,45 @@ public abstract class ArrayUtil { } /** - * To improve performance, this method should be used instead of ArrayUtil#removeNulls(Class, Object[]) when - * all of the non-null elements in the array are grouped together at the beginning of the array - * and all of the nulls are at the end of the array. - * The position of the last non-null element in the array must also be known. + * @deprecated Use {@link #trimAt(Class, Object[], int)} instead */ + @SuppressWarnings("unchecked") + @Deprecated public static Object[] removeNullsAfter(Class c, Object[] array, int index) { + return trimAt((Class) c, array, index); + } + + /** + * To improve performance, this method should be used instead of + * {@link #removeNulls(Class, Object[])} when all of the non-null elements in + * the array are grouped together at the beginning of the array and all of the nulls are at + * the end of the array. The position of the last non-null element in the array must also + * be known. + * + * @since 5.1 + */ + @SuppressWarnings("unchecked") + public static T[] trimAt(Class c, T[] array, int index) { final int newLen= index + 1; if (array != null && array.length == newLen) return array; - Object[] newArray = (Object[]) Array.newInstance(c, newLen); + T[] newArray = (T[]) Array.newInstance(c, newLen); if (array != null && newLen > 0) System.arraycopy(array, 0, newArray, 0, newLen); return newArray; } - /** - * Type safe version of {@link #removeNullsAfter(Class, Object[], int)} - * @since 5.1 - */ - @SuppressWarnings("unchecked") - public static T[] trimAt(Class c, T[] array, int index) { - return (T[]) removeNullsAfter(c, array, index); - } - /** * Inserts the obj at the beginning of the array, shifting the whole thing one index * Assumes that array contains nulls at the end, only. */ - public static Object[] prepend(Class c, Object[] array, Object obj) { + @SuppressWarnings("unchecked") + public static T[] prepend(Class c, T[] array, T obj) { if (obj == null) return array; if (array == null || array.length == 0) { - array = (Object[]) Array.newInstance(c, DEFAULT_LENGTH); + array = (T[]) Array.newInstance(c, DEFAULT_LENGTH); array[0] = obj; return array; } @@ -468,7 +483,7 @@ public abstract class ArrayUtil { System.arraycopy(array, 0, array, 1, i); array[0] = obj; } else { - Object[] temp = (Object[]) Array.newInstance(c, array.length * 2); + T[] temp = (T[]) Array.newInstance(c, array.length * 2); System.arraycopy(array, 0, temp, 1, array.length); temp[0] = obj; array = temp; @@ -484,7 +499,7 @@ public abstract class ArrayUtil { * @since 5.2 */ public static T[] prepend(T[] array, T obj) { - assert array != null; + Assert.isNotNull(array); if (obj == null) return array; @@ -517,7 +532,7 @@ public abstract class ArrayUtil { * Removes first occurrence of element in array and moves objects behind up front. * @since 4.0 */ - public static void remove(Object[] array, Object element) { + public static void remove(T[] array, T element) { if (array != null) { for (int i = 0; i < array.length; i++) { if (element == array[i]) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java index 55d6a80a95d..b471eda38d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java @@ -109,7 +109,8 @@ public final class CharArrayMap { } - public int compareTo(Key other) { + @Override + public int compareTo(Key other) { char[] b1 = buffer, b2 = other.buffer; for(int i = start, j = other.start; i < b1.length && j < b2.length; i++, j++) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java index b8d9a6c1494..4ada6ff99f4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java @@ -36,12 +36,15 @@ public final class CollectionUtils { return new Iterator() { ListIterator iterator = list.listIterator(list.size()); + @Override public boolean hasNext() { return iterator.hasPrevious(); } + @Override public T next() { return iterator.previous(); } + @Override public void remove() { throw new UnsupportedOperationException("remove() not supported"); //$NON-NLS-1$ } @@ -80,6 +83,7 @@ public final class CollectionUtils { throw new NullPointerException("iter parameter is null"); //$NON-NLS-1$ return new Iterable() { + @Override public Iterator iterator() { return iter; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java index ba5e8d456d0..5d4a3216080 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java @@ -167,14 +167,17 @@ public abstract class ObjectTable extends HashTable implements Iterable { /** * @since 5.4 */ + @Override public Iterator iterator() { return new Iterator() { int nextIndex; + @Override public boolean hasNext() { return nextIndex < size(); } + @Override public T next() { T element = keyAt(nextIndex); if (element == null) { @@ -184,6 +187,7 @@ public abstract class ObjectTable extends HashTable implements Iterable { return element; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java index 3f56c3c2d08..107c0b498f1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java @@ -39,13 +39,13 @@ public abstract class ASTAmbiguousNode extends ASTNode { public int visit(IASTName name) { if (name != null) { namesPos++; - names = (IASTName[]) ArrayUtil.append(IASTName.class, names, name); + names = ArrayUtil.append(IASTName.class, names, name); } return PROCESS_CONTINUE; } public IASTName[] getNames() { - names = (IASTName[]) ArrayUtil.removeNullsAfter(IASTName.class, names, namesPos); + names = ArrayUtil.trimAt(IASTName.class, names, namesPos); return names; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java index 81679d19643..eccb9bf1a2c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java @@ -137,7 +137,7 @@ public class ASTQueries { active[j++]= d; } } - active= (IASTDeclaration[]) ArrayUtil.removeNullsAfter(IASTDeclaration.class, active, j-1); + active= ArrayUtil.trimAt(IASTDeclaration.class, active, j-1); } return active; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java index 61fe996efaf..a64776cf43e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java @@ -91,7 +91,7 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat if (d != null) { d.setParent(this); d.setPropertyInParent(OWNED_DECLARATION); - fAllDeclarations = (IASTDeclaration[]) ArrayUtil.append(IASTDeclaration.class, + fAllDeclarations = ArrayUtil.appendAt(IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, d); fActiveDeclarations= null; } @@ -110,7 +110,7 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat @Override public final IASTDeclaration[] getDeclarations(boolean includeInactive) { if (includeInactive) { - fAllDeclarations= (IASTDeclaration[]) ArrayUtil.removeNullsAfter(IASTDeclaration.class, + fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration); return fAllDeclarations; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java index ad142186219..d4d5e6d835b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java @@ -29,10 +29,12 @@ public class CASTASMDeclaration extends ASTNode implements IASTASMDeclaration { setAssembly(assembly); } + @Override public CASTASMDeclaration copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTASMDeclaration copy(CopyStyle style) { CASTASMDeclaration copy = new CASTASMDeclaration(); copy.assembly = assembly == null ? null : assembly.clone(); @@ -43,12 +45,14 @@ public class CASTASMDeclaration extends ASTNode implements IASTASMDeclaration { return copy; } + @Override public String getAssembly() { if( assembly == null ) return ""; //$NON-NLS-1$ return new String( assembly ); } - public void setAssembly(String assembly) { + @Override + public void setAssembly(String assembly) { assertNotFrozen(); this.assembly = assembly == null ? null : assembly.toCharArray(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java index 5bccbb1cd58..4279aec37cf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java @@ -51,17 +51,19 @@ public class CASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTAmb } } + @Override public void addDeclarator(IASTDeclarator d) { assertNotFrozen(); if (d != null) { - dtors = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, dtors, ++dtorPos, d); + dtors = ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d); d.setParent(this); d.setPropertyInParent(SUBDECLARATOR); } } - public IASTDeclarator[] getDeclarators() { - dtors = (IASTDeclarator[]) ArrayUtil.removeNullsAfter(IASTDeclarator.class, dtors, dtorPos ); + @Override + public IASTDeclarator[] getDeclarators() { + dtors = ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); return dtors; } @@ -70,50 +72,61 @@ public class CASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTAmb return getDeclarators(); } + @Override public IASTInitializer getInitializer() { return dtors[0].getInitializer(); } + @Override public IASTName getName() { return dtors[0].getName(); } + @Override public IASTDeclarator getNestedDeclarator() { return dtors[0].getNestedDeclarator(); } + @Override public IASTPointerOperator[] getPointerOperators() { return dtors[0].getPointerOperators(); } + @Override public int getRoleForName(IASTName name) { return dtors[0].getRoleForName(name); } + @Override public void addPointerOperator(IASTPointerOperator operator) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setInitializer(IASTInitializer initializer) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setName(IASTName name) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setNestedDeclarator(IASTDeclarator nested) { assertNotFrozen(); Assert.isLegal(false); } + @Override public IASTDeclarator copy() { throw new UnsupportedOperationException(); } + @Override public IASTDeclarator copy(CopyStyle style) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java index 7e4b98eadbd..df951fc272c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java @@ -28,17 +28,19 @@ public class CASTAmbiguousExpression extends ASTAmbiguousNode implements IASTAmb addExpression(e); } + @Override public void addExpression(IASTExpression e) { assertNotFrozen(); if (e != null) { - expressions = (IASTExpression[]) ArrayUtil.append( IASTExpression.class, expressions, ++expressionsPos, e ); + expressions = ArrayUtil.appendAt( IASTExpression.class, expressions, ++expressionsPos, e ); e.setParent(this); e.setPropertyInParent(SUBEXPRESSION); } } - public IASTExpression[] getExpressions() { - expressions = (IASTExpression[]) ArrayUtil.removeNullsAfter( IASTExpression.class, expressions, expressionsPos ); + @Override + public IASTExpression[] getExpressions() { + expressions = ArrayUtil.trimAt( IASTExpression.class, expressions, expressionsPos ); return expressions; } @@ -47,10 +49,12 @@ public class CASTAmbiguousExpression extends ASTAmbiguousNode implements IASTAmb return getExpressions(); } + @Override public IASTExpression copy() { throw new UnsupportedOperationException(); } + @Override public IASTExpression copy(CopyStyle style) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java index 9c457577c21..1a930d55fbf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java @@ -38,10 +38,11 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen addParameterDeclaration(d); } + @Override public void addParameterDeclaration(IASTParameterDeclaration d) { assertNotFrozen(); if (d != null) { - paramDecls = (IASTParameterDeclaration[]) ArrayUtil.append(IASTParameterDeclaration.class, paramDecls, ++declPos, d); + paramDecls = ArrayUtil.appendAt(IASTParameterDeclaration.class, paramDecls, ++declPos, d); d.setParent(this); d.setPropertyInParent(SUBDECLARATION); } @@ -56,8 +57,9 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen } } - public IASTParameterDeclaration[] getParameterDeclarations() { - paramDecls = (IASTParameterDeclaration[]) ArrayUtil.removeNullsAfter(IASTParameterDeclaration.class, paramDecls, declPos ); + @Override + public IASTParameterDeclaration[] getParameterDeclarations() { + paramDecls = ArrayUtil.trimAt(IASTParameterDeclaration.class, paramDecls, declPos ); return paramDecls; } @@ -66,28 +68,34 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen return getParameterDeclarations(); } + @Override public IASTDeclSpecifier getDeclSpecifier() { return paramDecls[0].getDeclSpecifier(); } + @Override public IASTDeclarator getDeclarator() { return paramDecls[0].getDeclarator(); } + @Override public void setDeclSpecifier(IASTDeclSpecifier declSpec) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setDeclarator(IASTDeclarator declarator) { assertNotFrozen(); Assert.isLegal(false); } + @Override public IASTParameterDeclaration copy() { throw new UnsupportedOperationException(); } + @Override public IASTParameterDeclaration copy(CopyStyle style) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java index 6bc13e2de8f..1c85de5bb5b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java @@ -73,7 +73,7 @@ public class CASTAmbiguousStatement extends ASTAmbiguousNode implements IASTAmbi public void addStatement(IASTStatement s) { assertNotFrozen(); if (s != null) { - stmts = (IASTStatement[]) ArrayUtil.append( IASTStatement.class, stmts, ++stmtsPos, s ); + stmts = ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s ); s.setParent(this); s.setPropertyInParent(STATEMENT); } @@ -81,7 +81,7 @@ public class CASTAmbiguousStatement extends ASTAmbiguousNode implements IASTAmbi @Override public IASTStatement[] getStatements() { - stmts = (IASTStatement[]) ArrayUtil.removeNullsAfter( IASTStatement.class, stmts, stmtsPos ); + stmts = ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos ); return stmts; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java index 6c64668ab1e..6c45aeb7425 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java @@ -57,7 +57,7 @@ public class CASTArrayDeclarator extends CASTDeclarator implements IASTArrayDecl public IASTArrayModifier[] getArrayModifiers() { if (arrayMods == null) return IASTArrayModifier.EMPTY_ARRAY; - arrayMods = (IASTArrayModifier[]) ArrayUtil.removeNullsAfter(IASTArrayModifier.class, + arrayMods = ArrayUtil.trimAt(IASTArrayModifier.class, arrayMods, arrayModsPos); return arrayMods; @@ -69,7 +69,7 @@ public class CASTArrayDeclarator extends CASTDeclarator implements IASTArrayDecl if (arrayModifier != null) { arrayModifier.setParent(this); arrayModifier.setPropertyInParent(ARRAY_MODIFIER); - arrayMods = (IASTArrayModifier[]) ArrayUtil.append(IASTArrayModifier.class, arrayMods, + arrayMods = ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods, ++arrayModsPos, arrayModifier); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java index 384181d0d6c..8335c471d2c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java @@ -35,10 +35,12 @@ public class CASTArrayDesignator extends ASTNode implements setSubscriptExpression(exp); } + @Override public CASTArrayDesignator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTArrayDesignator copy(CopyStyle style) { CASTArrayDesignator copy = new CASTArrayDesignator(exp == null ? null : exp.copy(style)); copy.setOffsetAndLength(this); @@ -48,11 +50,13 @@ public class CASTArrayDesignator extends ASTNode implements return copy; } - public IASTExpression getSubscriptExpression() { + @Override + public IASTExpression getSubscriptExpression() { return exp; } - public void setSubscriptExpression(IASTExpression value) { + @Override + public void setSubscriptExpression(IASTExpression value) { assertNotFrozen(); exp = value; if(value != null) { @@ -79,7 +83,8 @@ public class CASTArrayDesignator extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == exp ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java index 71879af4e2f..e57ecbc271a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java @@ -37,10 +37,12 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA setConstantExpression(exp); } + @Override public CASTArrayModifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTArrayModifier copy(CopyStyle style) { CASTArrayModifier copy = new CASTArrayModifier(exp == null ? null : exp.copy(style)); copy.setOffsetAndLength(this); @@ -55,11 +57,13 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA return copy; } - public IASTExpression getConstantExpression() { + @Override + public IASTExpression getConstantExpression() { return exp; } - public void setConstantExpression(IASTExpression expression) { + @Override + public void setConstantExpression(IASTExpression expression) { assertNotFrozen(); this.exp = expression; if(expression != null) { @@ -68,47 +72,57 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA } } + @Override public boolean isConst() { return isConst; } - public boolean isStatic() { + @Override + public boolean isStatic() { return isStatic; } - public boolean isRestrict() { + @Override + public boolean isRestrict() { return isRestrict; } - public boolean isVolatile() { + @Override + public boolean isVolatile() { return isVolatile; } - public void setConst(boolean value) { + @Override + public void setConst(boolean value) { assertNotFrozen(); this.isConst = value; } - public void setVolatile(boolean value) { + @Override + public void setVolatile(boolean value) { assertNotFrozen(); this.isVolatile = value; } - public void setRestrict(boolean value) { + @Override + public void setRestrict(boolean value) { assertNotFrozen(); this.isRestrict = value; } - public void setStatic(boolean value) { + @Override + public void setStatic(boolean value) { assertNotFrozen(); this.isStatic = value; } - public boolean isVariableSized() { + @Override + public boolean isVariableSized() { return isVarSized; } - public void setVariableSized(boolean value) { + @Override + public void setVariableSized(boolean value) { assertNotFrozen(); isVarSized = value; } @@ -131,7 +145,8 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == exp ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java index 84cf3d16635..f248e614109 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java @@ -35,10 +35,12 @@ public class CASTArrayRangeDesignator extends ASTNode implements setRangeCeiling(ceiling); } + @Override public CASTArrayRangeDesignator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTArrayRangeDesignator copy(CopyStyle style) { CASTArrayRangeDesignator copy = new CASTArrayRangeDesignator(); copy.setRangeFloor(floor == null ? null : floor.copy(style)); @@ -50,11 +52,13 @@ public class CASTArrayRangeDesignator extends ASTNode implements return copy; } + @Override public IASTExpression getRangeFloor() { return this.floor; } - public void setRangeFloor(IASTExpression expression) { + @Override + public void setRangeFloor(IASTExpression expression) { assertNotFrozen(); floor = expression; if(expression != null) { @@ -63,11 +67,13 @@ public class CASTArrayRangeDesignator extends ASTNode implements } } - public IASTExpression getRangeCeiling() { + @Override + public IASTExpression getRangeCeiling() { return ceiling; } - public void setRangeCeiling(IASTExpression expression) { + @Override + public void setRangeCeiling(IASTExpression expression) { assertNotFrozen(); ceiling = expression; if(expression != null) { @@ -96,7 +102,8 @@ public class CASTArrayRangeDesignator extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == floor ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java index adbeef10a4b..292ab6d1957 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java @@ -40,10 +40,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements setSubscriptExpression(subscript); } + @Override public CASTArraySubscriptExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTArraySubscriptExpression copy(CopyStyle style) { CASTArraySubscriptExpression copy = new CASTArraySubscriptExpression(); copy.setArrayExpression(array == null ? null : array.copy(style)); @@ -55,11 +57,13 @@ public class CASTArraySubscriptExpression extends ASTNode implements return copy; } + @Override public IASTExpression getArrayExpression() { return array; } - public void setArrayExpression(IASTExpression expression) { + @Override + public void setArrayExpression(IASTExpression expression) { assertNotFrozen(); array = expression; if(expression != null) { @@ -68,11 +72,13 @@ public class CASTArraySubscriptExpression extends ASTNode implements } } - public IASTExpression getSubscriptExpression() { + @Override + public IASTExpression getSubscriptExpression() { return subscript; } - public void setSubscriptExpression(IASTExpression expression) { + @Override + public void setSubscriptExpression(IASTExpression expression) { assertNotFrozen(); this.subscript = expression; if(expression != null) { @@ -81,10 +87,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements } } - public IASTInitializerClause getArgument() { + @Override + public IASTInitializerClause getArgument() { return getSubscriptExpression(); } + @Override public void setArgument(IASTInitializerClause expression) { if (expression instanceof IASTExpression) { setSubscriptExpression((IASTExpression) expression); @@ -116,7 +124,8 @@ public class CASTArraySubscriptExpression extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == array ) { other.setPropertyInParent( child.getPropertyInParent() ); @@ -131,7 +140,8 @@ public class CASTArraySubscriptExpression extends ASTNode implements } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IType t = getArrayExpression().getExpressionType(); t = CVisitor.unwrapTypedefs(t); if (t instanceof IPointerType) @@ -141,10 +151,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements return t; } + @Override public boolean isLValue() { return true; } + @Override public final ValueCategory getValueCategory() { return ValueCategory.LVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java index e4bcbe5bca7..86d7f355079 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java @@ -26,47 +26,57 @@ public abstract class CASTBaseDeclSpecifier extends ASTNode implements ICASTDecl protected boolean isInline; + @Override public boolean isRestrict() { return isRestrict; } - public int getStorageClass() { + @Override + public int getStorageClass() { return storageClass; } - public boolean isConst() { + @Override + public boolean isConst() { return isConst; } - public boolean isVolatile() { + @Override + public boolean isVolatile() { return isVolatile; } - public boolean isInline() { + @Override + public boolean isInline() { return isInline; } - public void setStorageClass(int storageClass) { + @Override + public void setStorageClass(int storageClass) { assertNotFrozen(); this.storageClass = storageClass; } - public void setConst(boolean value) { + @Override + public void setConst(boolean value) { assertNotFrozen(); this.isConst = value; } - public void setVolatile(boolean value) { + @Override + public void setVolatile(boolean value) { assertNotFrozen(); this.isVolatile = value; } - public void setRestrict(boolean value) { + @Override + public void setRestrict(boolean value) { assertNotFrozen(); this.isRestrict = value; } - public void setInline(boolean value) { + @Override + public void setInline(boolean value) { assertNotFrozen(); this.isInline = value; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java index dd4519af63c..085c2ecd08a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java @@ -44,10 +44,12 @@ public class CASTBinaryExpression extends ASTNode implements setOperand2(operand2); } + @Override public CASTBinaryExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTBinaryExpression copy(CopyStyle style) { CASTBinaryExpression copy = new CASTBinaryExpression(); copy.op = op; @@ -60,31 +62,37 @@ public class CASTBinaryExpression extends ASTNode implements return copy; } + @Override public int getOperator() { return op; } - public IASTExpression getOperand1() { + @Override + public IASTExpression getOperand1() { return operand1; } - public IASTExpression getOperand2() { + @Override + public IASTExpression getOperand2() { return operand2; } - public IASTInitializerClause getInitOperand2() { + @Override + public IASTInitializerClause getInitOperand2() { return operand2; } /** * @param op An op_X field from {@link IASTBinaryExpression} */ - public void setOperator(int op) { + @Override + public void setOperator(int op) { assertNotFrozen(); this.op = op; } - public void setOperand1(IASTExpression expression) { + @Override + public void setOperand1(IASTExpression expression) { assertNotFrozen(); operand1 = expression; if (expression != null) { @@ -93,7 +101,8 @@ public class CASTBinaryExpression extends ASTNode implements } } - public void setOperand2(IASTExpression expression) { + @Override + public void setOperand2(IASTExpression expression) { assertNotFrozen(); operand2 = expression; if (expression != null) { @@ -186,7 +195,8 @@ public class CASTBinaryExpression extends ASTNode implements } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == operand1 ) { other.setPropertyInParent( child.getPropertyInParent() ); @@ -201,7 +211,8 @@ public class CASTBinaryExpression extends ASTNode implements } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { final int op = getOperator(); final IType t1= CVisitor.unwrapTypedefs(getOperand1().getExpressionType()); final IType t2= CVisitor.unwrapTypedefs(getOperand2().getExpressionType()); @@ -248,6 +259,7 @@ public class CASTBinaryExpression extends ASTNode implements (type.isVolatile() ? CPointerType.IS_VOLATILE : 0)); } + @Override public boolean isLValue() { switch (getOperator()) { case op_assign: @@ -266,6 +278,7 @@ public class CASTBinaryExpression extends ASTNode implements return false; } + @Override public final ValueCategory getValueCategory() { return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java index d3a88bab4c4..3aefeac8f18 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java @@ -41,10 +41,12 @@ public class CASTBreakStatement extends ASTNode implements IASTBreakStatement { return true; } - public CASTBreakStatement copy() { + @Override + public CASTBreakStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTBreakStatement copy(CopyStyle style) { CASTBreakStatement copy = new CASTBreakStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java index 98ed38a8545..b22164b200c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java @@ -33,10 +33,12 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS setExpression(expression); } + @Override public CASTCaseStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTCaseStatement copy(CopyStyle style) { CASTCaseStatement copy = new CASTCaseStatement(expression == null ? null : expression.copy()); copy.setOffsetAndLength(this); @@ -46,11 +48,13 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS return copy; } + @Override public IASTExpression getExpression() { return expression; } - public void setExpression(IASTExpression expression) { + @Override + public void setExpression(IASTExpression expression) { assertNotFrozen(); this.expression = expression; if (expression != null) { @@ -80,7 +84,8 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == expression ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java index 69b7e6e32b7..ff2ac45fe11 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java @@ -39,10 +39,12 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I setTypeId(typeId); } + @Override public CASTCastExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTCastExpression copy(CopyStyle style) { CASTCastExpression copy = new CASTCastExpression(); copy.setTypeId(typeId == null ? null : typeId.copy(style)); @@ -55,20 +57,24 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I return copy; } + @Override public int getOperator() { return operator; } - public void setOperator(int value) { + @Override + public void setOperator(int value) { assertNotFrozen(); this.operator = value; } - public IASTExpression getOperand() { + @Override + public IASTExpression getOperand() { return operand; } - public void setOperand(IASTExpression expression) { + @Override + public void setOperand(IASTExpression expression) { assertNotFrozen(); operand = expression; if (expression != null) { @@ -77,6 +83,7 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I } } + @Override public void setTypeId(IASTTypeId typeId) { assertNotFrozen(); this.typeId = typeId; @@ -86,7 +93,8 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I } } - public IASTTypeId getTypeId() { + @Override + public IASTTypeId getTypeId() { return typeId; } @@ -116,6 +124,7 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == operand) { other.setPropertyInParent(child.getPropertyInParent()); @@ -124,15 +133,18 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I } } + @Override public IType getExpressionType() { IASTTypeId id= getTypeId(); return CVisitor.createType(id.getAbstractDeclarator()); } + @Override public boolean isLValue() { return false; } + @Override public final ValueCategory getValueCategory() { return ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java index 446625861d9..874bc35b21d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java @@ -28,10 +28,12 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem private IASTStatement [] statements = null; private IScope scope = null; - public CASTCompoundStatement copy() { + @Override + public CASTCompoundStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTCompoundStatement copy(CopyStyle style) { CASTCompoundStatement copy = new CASTCompoundStatement(); for (IASTStatement statement : getStatements()) @@ -43,21 +45,24 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem return copy; } - public IASTStatement[] getStatements() { + @Override + public IASTStatement[] getStatements() { if (statements == null) return IASTStatement.EMPTY_STATEMENT_ARRAY; - return (IASTStatement[]) ArrayUtil.trim(IASTStatement.class, statements); + return ArrayUtil.trim(IASTStatement.class, statements); } - public void addStatement(IASTStatement statement) { + @Override + public void addStatement(IASTStatement statement) { assertNotFrozen(); - statements = (IASTStatement[]) ArrayUtil.append(IASTStatement.class, statements, statement); + statements = ArrayUtil.append(IASTStatement.class, statements, statement); if (statement != null) { statement.setParent(this); statement.setPropertyInParent(NESTED_STATEMENT); } } - public IScope getScope() { + @Override + public IScope getScope() { if (scope == null) scope = new CScope(this, EScopeKind.eLocal); return scope; @@ -86,7 +91,8 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (statements == null) return; for (int i = 0; i < statements.length; ++i) { if (statements[i] == child) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java index 43008679d9c..0dae9369d99 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java @@ -36,10 +36,12 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC setCompoundStatement(statement); } + @Override public CASTCompoundStatementExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTCompoundStatementExpression copy(CopyStyle style) { CASTCompoundStatementExpression copy = new CASTCompoundStatementExpression(); copy.setCompoundStatement(statement == null ? null : statement.copy(style)); @@ -50,11 +52,13 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC return copy; } + @Override public IASTCompoundStatement getCompoundStatement() { return statement; } - public void setCompoundStatement(IASTCompoundStatement statement) { + @Override + public void setCompoundStatement(IASTCompoundStatement statement) { assertNotFrozen(); this.statement = statement; if (statement != null) { @@ -84,7 +88,8 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC return true; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IASTCompoundStatement compound = getCompoundStatement(); IASTStatement[] statements = compound.getStatements(); if (statements.length > 0) { @@ -95,6 +100,7 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { IASTCompoundStatement compound = getCompoundStatement(); IASTStatement[] statements = compound.getStatements(); @@ -106,6 +112,7 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC return false; } + @Override public final ValueCategory getValueCategory() { return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java index 69774aed6f8..e44f92c83e3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java @@ -41,10 +41,12 @@ public class CASTConditionalExpression extends ASTNode implements setNegativeResultExpression(negative); } + @Override public CASTConditionalExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTConditionalExpression copy(CopyStyle style) { CASTConditionalExpression copy = new CASTConditionalExpression(); copy.setLogicalConditionExpression(condition == null ? null : condition.copy(style)); @@ -57,11 +59,13 @@ public class CASTConditionalExpression extends ASTNode implements return copy; } + @Override public IASTExpression getLogicalConditionExpression() { return condition; } - public void setLogicalConditionExpression(IASTExpression expression) { + @Override + public void setLogicalConditionExpression(IASTExpression expression) { assertNotFrozen(); condition = expression; if (expression != null) { @@ -70,11 +74,13 @@ public class CASTConditionalExpression extends ASTNode implements } } - public IASTExpression getPositiveResultExpression() { + @Override + public IASTExpression getPositiveResultExpression() { return positive; } - public void setPositiveResultExpression(IASTExpression expression) { + @Override + public void setPositiveResultExpression(IASTExpression expression) { assertNotFrozen(); this.positive = expression; if (expression != null) { @@ -83,11 +89,13 @@ public class CASTConditionalExpression extends ASTNode implements } } - public IASTExpression getNegativeResultExpression() { + @Override + public IASTExpression getNegativeResultExpression() { return negative; } - public void setNegativeResultExpression(IASTExpression expression) { + @Override + public void setNegativeResultExpression(IASTExpression expression) { assertNotFrozen(); this.negative = expression; if (expression != null) { @@ -119,7 +127,8 @@ public class CASTConditionalExpression extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == condition ) { other.setPropertyInParent( child.getPropertyInParent() ); @@ -140,7 +149,8 @@ public class CASTConditionalExpression extends ASTNode implements } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IASTExpression positiveExpression = getPositiveResultExpression(); if (positiveExpression == null) { positiveExpression= getLogicalConditionExpression(); @@ -152,10 +162,12 @@ public class CASTConditionalExpression extends ASTNode implements return t2; } + @Override public boolean isLValue() { return false; } + @Override public final ValueCategory getValueCategory() { return ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java index 0edff204ad1..a1dfa309ece 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java @@ -39,10 +39,12 @@ public class CASTContinueStatement extends ASTNode implements IASTContinueStatem return true; } - public CASTContinueStatement copy() { + @Override + public CASTContinueStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTContinueStatement copy(CopyStyle style) { CASTContinueStatement copy = new CASTContinueStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java index 2c1055f195c..d09045f102f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java @@ -35,10 +35,12 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration } + @Override public CASTDeclarationStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTDeclarationStatement copy(CopyStyle style) { CASTDeclarationStatement copy = new CASTDeclarationStatement(); copy.setDeclaration(declaration == null ? null : declaration.copy(style)); @@ -49,11 +51,13 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration return copy; } + @Override public IASTDeclaration getDeclaration() { return declaration; } - public void setDeclaration(IASTDeclaration declaration) { + @Override + public void setDeclaration(IASTDeclaration declaration) { assertNotFrozen(); this.declaration = declaration; if (declaration != null) { @@ -82,6 +86,7 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == declaration) { other.setPropertyInParent(child.getPropertyInParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java index ed669b53a32..2b6e8bf4943 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java @@ -51,10 +51,12 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig setName(name); } + @Override public CASTDeclarator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTDeclarator copy(CopyStyle style) { CASTDeclarator copy = new CASTDeclarator(); copyBaseDeclarator(copy, style); @@ -74,25 +76,30 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig } + @Override public IASTPointerOperator[] getPointerOperators() { if (pointerOps == null) return IASTPointerOperator.EMPTY_ARRAY; - pointerOps = (IASTPointerOperator[]) ArrayUtil.removeNullsAfter(IASTPointerOperator.class, pointerOps, pointerOpsPos); + pointerOps = ArrayUtil.trimAt(IASTPointerOperator.class, pointerOps, pointerOpsPos); return pointerOps; } - public IASTDeclarator getNestedDeclarator() { + @Override + public IASTDeclarator getNestedDeclarator() { return nestedDeclarator; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public IASTInitializer getInitializer() { + @Override + public IASTInitializer getInitializer() { return initializer; } - public void setInitializer(IASTInitializer initializer) { + @Override + public void setInitializer(IASTInitializer initializer) { assertNotFrozen(); this.initializer = initializer; if (initializer != null) { @@ -101,16 +108,18 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig } } - public void addPointerOperator(IASTPointerOperator operator) { + @Override + public void addPointerOperator(IASTPointerOperator operator) { assertNotFrozen(); if (operator != null) { operator.setParent(this); operator.setPropertyInParent(POINTER_OPERATOR); - pointerOps = (IASTPointerOperator[]) ArrayUtil.append(IASTPointerOperator.class, pointerOps, ++pointerOpsPos, operator); + pointerOps = ArrayUtil.appendAt(IASTPointerOperator.class, pointerOps, ++pointerOpsPos, operator); } } - public void setNestedDeclarator(IASTDeclarator nested) { + @Override + public void setNestedDeclarator(IASTDeclarator nested) { assertNotFrozen(); this.nestedDeclarator = nested; if (nested != null) { @@ -119,7 +128,8 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig } } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -176,6 +186,7 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig return true; } + @Override public int getRoleForName(IASTName n) { if (n == this.name) { IASTNode getParent = getParent(); @@ -226,6 +237,7 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig return r_unclear; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == nestedDeclarator) { other.setPropertyInParent(child.getPropertyInParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java index c8f11013496..8b8277b434d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java @@ -39,10 +39,12 @@ public class CASTDefaultStatement extends ASTNode implements IASTDefaultStatemen return true; } - public CASTDefaultStatement copy() { + @Override + public CASTDefaultStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTDefaultStatement copy(CopyStyle style) { CASTDefaultStatement copy = new CASTDefaultStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java index 6ac163ae905..98426ffa7e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java @@ -40,10 +40,12 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate setOperand(init); } + @Override public CASTDesignatedInitializer copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTDesignatedInitializer copy(CopyStyle style) { CASTDesignatedInitializer copy = new CASTDesignatedInitializer(rhs == null ? null : rhs.copy(style)); @@ -56,28 +58,32 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate return copy; } + @Override public void addDesignator(ICASTDesignator designator) { assertNotFrozen(); if (designator != null) { designator.setParent(this); designator.setPropertyInParent(DESIGNATOR); - designators = (ICASTDesignator[]) ArrayUtil.append( ICASTDesignator.class, designators, ++designatorsPos, designator ); + designators = ArrayUtil.appendAt( ICASTDesignator.class, designators, ++designatorsPos, designator ); } } - public ICASTDesignator[] getDesignators() { + @Override + public ICASTDesignator[] getDesignators() { if( designators == null ) return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY; - designators = (ICASTDesignator[]) ArrayUtil.removeNullsAfter( ICASTDesignator.class, designators, designatorsPos ); + designators = ArrayUtil.trimAt( ICASTDesignator.class, designators, designatorsPos ); return designators; } - public IASTInitializerClause getOperand() { + @Override + public IASTInitializerClause getOperand() { return rhs; } + @Override public void setOperand(IASTInitializerClause operand) { assertNotFrozen(); this.rhs = operand; @@ -87,6 +93,7 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate } } + @Override @Deprecated public IASTInitializer getOperandInitializer() { if (rhs instanceof IASTInitializer) { @@ -101,7 +108,8 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate return null; } - @Deprecated + @Override + @Deprecated public void setOperandInitializer(IASTInitializer rhs) { if (rhs instanceof IASTEqualsInitializer) { setOperand(((IASTEqualsInitializer) rhs).getInitializerClause()); @@ -137,7 +145,8 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == rhs) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java index cf9a4b921fd..03014d200eb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java @@ -36,10 +36,12 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb setCondition(condition); } + @Override public CASTDoStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTDoStatement copy(CopyStyle style) { CASTDoStatement copy = new CASTDoStatement(); copy.setBody(body == null ? null : body.copy(style)); @@ -51,11 +53,13 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb return copy; } + @Override public IASTStatement getBody() { return body; } - public void setBody(IASTStatement body) { + @Override + public void setBody(IASTStatement body) { assertNotFrozen(); this.body = body; if (body != null) { @@ -65,12 +69,14 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb } - public IASTExpression getCondition() { + @Override + public IASTExpression getCondition() { return condition; } - public void setCondition(IASTExpression condition) { + @Override + public void setCondition(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -100,7 +106,8 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( body == child ) { other.setPropertyInParent( body.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java index 49a78944aec..6d76acc21f9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java @@ -43,10 +43,12 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement setName(name); } + @Override public CASTElaboratedTypeSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTElaboratedTypeSpecifier copy(CopyStyle style) { CASTElaboratedTypeSpecifier copy = new CASTElaboratedTypeSpecifier(kind, name == null ? null : name.copy(style)); @@ -57,20 +59,24 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement return copy; } + @Override public int getKind() { return kind; } - public void setKind(int value) { + @Override + public void setKind(int value) { assertNotFrozen(); this.kind = value; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -99,6 +105,7 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement return true; } + @Override public int getRoleForName(IASTName n ) { if( n != name ) return r_unclear; @@ -122,6 +129,7 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement return r_reference; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { IBinding[] result= CVisitor.findBindingsForContentAssist(n, isPrefix); int nextPos= 0; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java index f608ab7fedf..d601733693d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java @@ -35,10 +35,12 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier setName(name); } + @Override public CASTEnumerationSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTEnumerationSpecifier copy(CopyStyle style) { CASTEnumerationSpecifier copy = new CASTEnumerationSpecifier(); copyEnumerationSpecifier(copy, style); @@ -56,6 +58,7 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier } + @Override public boolean startValueComputation() { if (valuesComputed) return false; @@ -64,19 +67,21 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier return true; } + @Override public void addEnumerator(IASTEnumerator enumerator) { assertNotFrozen(); if (enumerator != null) { enumerator.setParent(this); enumerator.setPropertyInParent(ENUMERATOR); - enumerators = (IASTEnumerator[]) ArrayUtil.append( IASTEnumerator.class, enumerators, ++enumeratorsPos, enumerator ); + enumerators = ArrayUtil.appendAt( IASTEnumerator.class, enumerators, ++enumeratorsPos, enumerator ); } } - public IASTEnumerator[] getEnumerators() { + @Override + public IASTEnumerator[] getEnumerators() { if( enumerators == null ) return IASTEnumerator.EMPTY_ENUMERATOR_ARRAY; - enumerators = (IASTEnumerator[]) ArrayUtil.removeNullsAfter( IASTEnumerator.class, enumerators, enumeratorsPos ); + enumerators = ArrayUtil.trimAt( IASTEnumerator.class, enumerators, enumeratorsPos ); return enumerators; } @@ -84,7 +89,8 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier private int enumeratorsPos=-1; - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -93,7 +99,8 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier } } - public IASTName getName() { + @Override + public IASTName getName() { return name; } @@ -121,6 +128,7 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier return true; } + @Override public int getRoleForName(IASTName n ) { if( this.name == n ) return r_definition; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java index ae177dd50df..b5706d94dac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java @@ -27,10 +27,12 @@ public class CASTEnumerator extends ASTEnumerator { super(name, value); } + @Override public CASTEnumerator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTEnumerator copy(CopyStyle style) { CASTEnumerator copy = new CASTEnumerator(); copyAbstractEnumerator(copy, style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java index 3adfd1895f3..e699e9c2282 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java @@ -25,10 +25,12 @@ public class CASTEqualsInitializer extends ASTEqualsInitializer { super(arg); } + @Override public CASTEqualsInitializer copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTEqualsInitializer copy(CopyStyle style) { IASTInitializerClause arg = getInitializerClause(); CASTEqualsInitializer copy = new CASTEqualsInitializer(arg == null ? null : arg.copy(style)); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java index f9ae206921a..8182750f5fb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java @@ -29,10 +29,12 @@ import org.eclipse.cdt.internal.core.dom.parser.ProblemType; public class CASTExpressionList extends ASTNode implements IASTExpressionList, IASTAmbiguityParent { + @Override public CASTExpressionList copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTExpressionList copy(CopyStyle style) { CASTExpressionList copy = new CASTExpressionList(); for(IASTExpression expr : getExpressions()) @@ -44,15 +46,17 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList, return copy; } - public IASTExpression[] getExpressions() { + @Override + public IASTExpression[] getExpressions() { if (expressions == null) return IASTExpression.EMPTY_EXPRESSION_ARRAY; - return (IASTExpression[]) ArrayUtil.trim( IASTExpression.class, expressions ); + return ArrayUtil.trim( IASTExpression.class, expressions ); } - public void addExpression(IASTExpression expression) { + @Override + public void addExpression(IASTExpression expression) { assertNotFrozen(); - expressions = (IASTExpression[]) ArrayUtil.append( IASTExpression.class, expressions, expression ); + expressions = ArrayUtil.append( IASTExpression.class, expressions, expression ); if(expression != null) { expression.setParent(this); expression.setPropertyInParent(NESTED_EXPRESSION); @@ -92,7 +96,8 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList, return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( expressions == null ) return; for (int i = 0; i < expressions.length; ++i) { if (child == expressions[i]) { @@ -103,7 +108,8 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList, } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { for (int i = expressions.length-1; i >= 0; i--) { IASTExpression expr= expressions[i]; if (expr != null) @@ -112,6 +118,7 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList, return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { for (int i = expressions.length-1; i >= 0; i--) { IASTExpression expr= expressions[i]; @@ -121,6 +128,7 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList, return false; } + @Override public final ValueCategory getValueCategory() { return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java index 7518341f860..55e5daf039e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java @@ -34,10 +34,12 @@ public class CASTExpressionStatement extends ASTNode implements setExpression(expression); } + @Override public CASTExpressionStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTExpressionStatement copy(CopyStyle style) { CASTExpressionStatement copy = new CASTExpressionStatement(); copy.setExpression(expression == null ? null : expression.copy(style)); @@ -48,11 +50,13 @@ public class CASTExpressionStatement extends ASTNode implements return copy; } + @Override public IASTExpression getExpression() { return expression; } - public void setExpression(IASTExpression expression) { + @Override + public void setExpression(IASTExpression expression) { assertNotFrozen(); this.expression = expression; if (expression != null) { @@ -91,7 +95,8 @@ public class CASTExpressionStatement extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == expression) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java index cca54bc845a..4624d5cb1d9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java @@ -47,12 +47,14 @@ public class CASTFieldDeclarator extends CASTDeclarator implements IASTFieldDecl return copy; } + @Override public IASTExpression getBitFieldSize() { return bitFieldSize; } - public void setBitFieldSize(IASTExpression size) { + @Override + public void setBitFieldSize(IASTExpression size) { assertNotFrozen(); bitFieldSize = size; if (size != null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java index 567324b2ab7..7d8a6edf8e0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java @@ -34,10 +34,12 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator setName(name); } + @Override public CASTFieldDesignator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTFieldDesignator copy(CopyStyle style) { CASTFieldDesignator copy = new CASTFieldDesignator(name == null ? null : name.copy(style)); copy.setOffsetAndLength(this); @@ -47,11 +49,13 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator return copy; } + @Override public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -77,6 +81,7 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator return true; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return CVisitor.findBindingsForContentAssist(n, isPrefix); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java index 93f6f5d5dc5..094e90b0f39 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java @@ -51,10 +51,12 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I this.ptr = ptr; } + @Override public CASTFieldReference copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTFieldReference copy(CopyStyle style) { CASTFieldReference copy = new CASTFieldReference(); copy.setFieldOwner(owner == null ? null : owner.copy(style)); @@ -67,11 +69,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I return copy; } + @Override public IASTExpression getFieldOwner() { return owner; } - public void setFieldOwner(IASTExpression expression) { + @Override + public void setFieldOwner(IASTExpression expression) { assertNotFrozen(); this.owner = expression; if (expression != null) { @@ -80,11 +84,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I } } - public IASTName getFieldName() { + @Override + public IASTName getFieldName() { return name; } - public void setFieldName(IASTName name) { + @Override + public void setFieldName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -93,11 +99,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I } } - public boolean isPointerDereference() { + @Override + public boolean isPointerDereference() { return ptr; } - public void setIsPointerDereference(boolean value) { + @Override + public void setIsPointerDereference(boolean value) { assertNotFrozen(); ptr = value; } @@ -125,13 +133,15 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I return true; } + @Override public int getRoleForName(IASTName n ) { if( n == this.name ) return r_reference; return r_unclear; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == owner) { other.setPropertyInParent( child.getPropertyInParent() ); @@ -140,7 +150,8 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IBinding binding = getFieldName().resolveBinding(); if (binding instanceof IVariable) { return ((IVariable)binding).getType(); @@ -149,6 +160,7 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I } + @Override public boolean isLValue() { if (isPointerDereference()) return true; @@ -156,10 +168,12 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I return getFieldOwner().isLValue(); } + @Override public final ValueCategory getValueCategory() { return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return CVisitor.findBindingsForContentAssist(n, isPrefix); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java index 12ffbeda5ad..0fb9f9aa28a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java @@ -43,10 +43,12 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA setBody(body); } + @Override public CASTForStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTForStatement copy(CopyStyle style) { CASTForStatement copy = new CASTForStatement(); copyForStatement(copy, style); @@ -65,11 +67,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA copy.setOffsetAndLength(this); } + @Override public IASTExpression getConditionExpression() { return condition; } - public void setConditionExpression(IASTExpression condition) { + @Override + public void setConditionExpression(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -78,11 +82,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA } } - public IASTExpression getIterationExpression() { + @Override + public IASTExpression getIterationExpression() { return iterationExpression; } - public void setIterationExpression(IASTExpression iterator) { + @Override + public void setIterationExpression(IASTExpression iterator) { assertNotFrozen(); this.iterationExpression = iterator; if (iterator != null) { @@ -91,11 +97,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA } } - public IASTStatement getInitializerStatement() { + @Override + public IASTStatement getInitializerStatement() { return init; } - public void setInitializerStatement(IASTStatement statement) { + @Override + public void setInitializerStatement(IASTStatement statement) { assertNotFrozen(); init = statement; if (statement != null) { @@ -103,11 +111,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA statement.setPropertyInParent(INITIALIZER); } } - public IASTStatement getBody() { + @Override + public IASTStatement getBody() { return body; } - public void setBody(IASTStatement statement) { + @Override + public void setBody(IASTStatement statement) { assertNotFrozen(); body = statement; if (statement != null) { @@ -116,7 +126,8 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA } } - public IScope getScope() { + @Override + public IScope getScope() { if( scope == null ) scope = new CScope( this, EScopeKind.eLocal); return scope; @@ -147,7 +158,8 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( body == child ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java index efd9268ac22..ad9a34be1b3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java @@ -45,10 +45,12 @@ public class CASTFunctionCallExpression extends ASTNode implements setArguments(args); } + @Override public CASTFunctionCallExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTFunctionCallExpression copy(CopyStyle style) { IASTInitializerClause[] args = null; if (fArguments.length > 0) { @@ -67,6 +69,7 @@ public class CASTFunctionCallExpression extends ASTNode implements return copy; } + @Override public void setFunctionNameExpression(IASTExpression expression) { assertNotFrozen(); this.functionName = expression; @@ -76,15 +79,18 @@ public class CASTFunctionCallExpression extends ASTNode implements } } - public IASTExpression getFunctionNameExpression() { + @Override + public IASTExpression getFunctionNameExpression() { return functionName; } + @Override public IASTInitializerClause[] getArguments() { return fArguments; } - public void setArguments(IASTInitializerClause[] arguments) { + @Override + public void setArguments(IASTInitializerClause[] arguments) { assertNotFrozen(); if (arguments == null) { fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY; @@ -121,7 +127,8 @@ public class CASTFunctionCallExpression extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == functionName) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); @@ -136,6 +143,7 @@ public class CASTFunctionCallExpression extends ASTNode implements } } + @Override public IType getExpressionType() { IType type = getFunctionNameExpression().getExpressionType(); while (type instanceof ITypeContainer) @@ -145,14 +153,17 @@ public class CASTFunctionCallExpression extends ASTNode implements return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { return false; } + @Override public final ValueCategory getValueCategory() { return ValueCategory.PRVALUE; } + @Override @Deprecated public IASTExpression getParameterExpression() { if (fArguments.length == 0) @@ -175,6 +186,7 @@ public class CASTFunctionCallExpression extends ASTNode implements return result; } + @Override @Deprecated public void setParameterExpression(IASTExpression expression) { assertNotFrozen(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java index 5248612a2a9..72e03dc67d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java @@ -60,26 +60,30 @@ public class CASTFunctionDeclarator extends CASTDeclarator implements IASTStanda return copy; } + @Override public IASTParameterDeclaration[] getParameters() { if( parameters == null ) return IASTParameterDeclaration.EMPTY_PARAMETERDECLARATION_ARRAY; - parameters = (IASTParameterDeclaration[]) ArrayUtil.removeNullsAfter( IASTParameterDeclaration.class, parameters, parametersPos ); + parameters = ArrayUtil.trimAt( IASTParameterDeclaration.class, parameters, parametersPos ); return parameters; } - public void addParameterDeclaration(IASTParameterDeclaration parameter) { + @Override + public void addParameterDeclaration(IASTParameterDeclaration parameter) { assertNotFrozen(); if (parameter != null) { parameter.setParent(this); parameter.setPropertyInParent(FUNCTION_PARAMETER); - parameters = (IASTParameterDeclaration[]) ArrayUtil.append( IASTParameterDeclaration.class, parameters, ++parametersPos, parameter ); + parameters = ArrayUtil.appendAt( IASTParameterDeclaration.class, parameters, ++parametersPos, parameter ); } } - public boolean takesVarArgs() { + @Override + public boolean takesVarArgs() { return varArgs; } - public void setVarArgs(boolean value) { + @Override + public void setVarArgs(boolean value) { assertNotFrozen(); varArgs = value; } @@ -109,6 +113,7 @@ public class CASTFunctionDeclarator extends CASTDeclarator implements IASTStanda super.replace(child, other); } + @Override public IScope getFunctionScope() { if (scope != null) return scope; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java index 3cda61a2d81..6947035e1cf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java @@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; +import org.eclipse.cdt.internal.core.dom.parser.ASTQueries; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; /** @@ -43,18 +44,20 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin setBody(bodyStatement); } + @Override public CASTFunctionDefinition copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTFunctionDefinition copy(CopyStyle style) { CASTFunctionDefinition copy = new CASTFunctionDefinition(); copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy(style)); if (declarator != null) { - IASTDeclarator outer = CVisitor.findOutermostDeclarator(declarator); + IASTDeclarator outer = ASTQueries.findOutermostDeclarator(declarator); outer = outer.copy(style); - copy.setDeclarator((IASTFunctionDeclarator) CVisitor.findTypeRelevantDeclarator(outer)); + copy.setDeclarator((IASTFunctionDeclarator) ASTQueries.findTypeRelevantDeclarator(outer)); } copy.setBody(bodyStatement == null ? null : bodyStatement.copy(style)); @@ -66,11 +69,13 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin return copy; } + @Override public IASTDeclSpecifier getDeclSpecifier() { return declSpecifier; } - public void setDeclSpecifier(IASTDeclSpecifier declSpec) { + @Override + public void setDeclSpecifier(IASTDeclSpecifier declSpec) { assertNotFrozen(); declSpecifier = declSpec; if (declSpec != null) { @@ -79,25 +84,29 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin } } - public IASTFunctionDeclarator getDeclarator() { + @Override + public IASTFunctionDeclarator getDeclarator() { return declarator; } - public void setDeclarator(IASTFunctionDeclarator declarator) { + @Override + public void setDeclarator(IASTFunctionDeclarator declarator) { assertNotFrozen(); this.declarator = declarator; if (declarator != null) { - IASTDeclarator outerDtor= CVisitor.findOutermostDeclarator(declarator); + IASTDeclarator outerDtor= ASTQueries.findOutermostDeclarator(declarator); outerDtor.setParent(this); outerDtor.setPropertyInParent(DECLARATOR); } } - public IASTStatement getBody() { + @Override + public IASTStatement getBody() { return bodyStatement; } - public void setBody(IASTStatement statement) { + @Override + public void setBody(IASTStatement statement) { assertNotFrozen(); bodyStatement = statement; if (statement != null) { @@ -106,6 +115,7 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin } } + @Override public IScope getScope() { if (scope == null) scope = new CFunctionScope(this); @@ -123,7 +133,7 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin } if (declSpecifier != null && !declSpecifier.accept(action)) return false; - final IASTDeclarator outerDtor= CVisitor.findOutermostDeclarator(declarator); + final IASTDeclarator outerDtor= ASTQueries.findOutermostDeclarator(declarator); if (outerDtor != null && !outerDtor.accept(action)) return false; if (bodyStatement != null && !bodyStatement.accept(action)) return false; @@ -137,7 +147,8 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (bodyStatement == child) { other.setPropertyInParent(bodyStatement.getPropertyInParent()); other.setParent(bodyStatement.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java index b8434f3a55c..a9b0317631d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java @@ -30,10 +30,12 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement { setName(name); } + @Override public CASTGotoStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTGotoStatement copy(CopyStyle style) { CASTGotoStatement copy = new CASTGotoStatement(name == null ? null : name.copy(style)); copy.setOffsetAndLength(this); @@ -43,11 +45,13 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement { return copy; } + @Override public IASTName getName() { return this.name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -77,6 +81,7 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement { return true; } + @Override public int getRoleForName(IASTName n) { if( n == name ) return r_reference; return r_unclear; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java index 6f2d3ae1acd..78ec3a7a3b2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java @@ -46,10 +46,12 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC setName(name); } + @Override public CASTIdExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTIdExpression copy(CopyStyle style) { CASTIdExpression copy = new CASTIdExpression(name == null ? null : name.copy(style)); copy.setOffsetAndLength(this); @@ -59,11 +61,13 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC return copy; } + @Override public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -94,11 +98,13 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC return true; } + @Override public int getRoleForName(IASTName n) { if( n == name ) return r_reference; return r_unclear; } + @Override public IType getExpressionType() { IBinding binding = getName().resolveBinding(); try { @@ -120,15 +126,18 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { return true; } + @Override public final ValueCategory getValueCategory() { return ValueCategory.LVALUE; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { IBinding[] bindings = CVisitor.findBindingsForContentAssist(n, isPrefix); @@ -138,6 +147,6 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC } } - return (IBinding[]) ArrayUtil.removeNulls(IBinding.class, bindings); + return ArrayUtil.removeNulls(IBinding.class, bindings); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java index 3f036955cad..5c07fd3cd93 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java @@ -45,10 +45,12 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb setElseClause(elseClause); } + @Override public CASTIfStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTIfStatement copy(CopyStyle style) { CASTIfStatement copy = new CASTIfStatement(); copy.setConditionExpression(condition == null ? null : condition.copy(style)); @@ -61,11 +63,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb return copy; } + @Override public IASTExpression getConditionExpression() { return condition; } - public void setConditionExpression(IASTExpression condition) { + @Override + public void setConditionExpression(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -74,11 +78,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb } } - public IASTStatement getThenClause() { + @Override + public IASTStatement getThenClause() { return thenClause; } - public void setThenClause(IASTStatement thenClause) { + @Override + public void setThenClause(IASTStatement thenClause) { assertNotFrozen(); this.thenClause = thenClause; if (thenClause != null) { @@ -87,11 +93,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb } } - public IASTStatement getElseClause() { + @Override + public IASTStatement getElseClause() { return elseClause; } - public void setElseClause(IASTStatement elseClause) { + @Override + public void setElseClause(IASTStatement elseClause) { assertNotFrozen(); this.elseClause = elseClause; if (elseClause != null) { @@ -155,7 +163,8 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( thenClause == child ) { other.setParent( child.getParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java index bf7404a3598..134fbfb2e65 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java @@ -32,10 +32,12 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList, private int initializersPos=-1; private int actualSize; + @Override public CASTInitializerList copy() { return copy(CopyStyle.withoutLocations); } + @Override public CASTInitializerList copy(CopyStyle style) { CASTInitializerList copy = new CASTInitializerList(); for (IASTInitializerClause initializer : getClauses()) @@ -48,10 +50,12 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList, return copy; } + @Override public int getSize() { return actualSize; } + @Override public IASTInitializerClause[] getClauses() { if (initializers == null) return IASTExpression.EMPTY_EXPRESSION_ARRAY; @@ -59,6 +63,7 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList, return initializers; } + @Override @Deprecated public IASTInitializer[] getInitializers() { IASTInitializerClause[] clauses= getClauses(); @@ -80,16 +85,18 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList, return inits; } + @Override public void addClause(IASTInitializerClause d) { assertNotFrozen(); if (d != null) { - initializers = (IASTInitializerClause[]) ArrayUtil.append( IASTInitializerClause.class, initializers, ++initializersPos, d ); + initializers = ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d ); d.setParent(this); d.setPropertyInParent(NESTED_INITIALIZER); } actualSize++; } + @Override @Deprecated public void addInitializer(IASTInitializer d) { assertNotFrozen(); @@ -126,6 +133,7 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList, return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (initializers != null) { for (int i = 0; i < initializers.length; ++i) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java index db49f4ce404..429d70fd358 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java @@ -71,6 +71,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn return copy; } + @Override public void setParameterNames(IASTName[] names) { assertNotFrozen(); parameterNames = names; @@ -85,11 +86,13 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn } + @Override public IASTName[] getParameterNames() { return parameterNames; } + @Override public void setParameterDeclarations(IASTDeclaration[] decls) { assertNotFrozen(); parameterDeclarations = decls; @@ -104,6 +107,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn } + @Override public IASTDeclaration[] getParameterDeclarations() { return parameterDeclarations; } @@ -125,6 +129,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn return super.postAccept(action); } + @Override public IASTDeclarator getDeclaratorForParameterName(IASTName name) { boolean found=false; for(int i=0; i 0) { @@ -189,6 +199,7 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return getName(); } + @Override public long getMinValue() { if (fMinValue != null) return fMinValue.longValue(); @@ -211,6 +222,7 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return minValue; } + @Override public long getMaxValue() { if (fMaxValue != null) return fMaxValue.longValue(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java index dd1a7c1c05a..5155944da3b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java @@ -35,6 +35,7 @@ public class CEnumerator extends PlatformObject implements IEnumerator { public CEnumeratorProblem(IASTNode node, int id, char[] arg) { super(node, id, arg); } + @Override public IValue getValue() { return Value.UNKNOWN; } @@ -54,38 +55,45 @@ public class CEnumerator extends PlatformObject implements IEnumerator { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ - public String getName() { + @Override + public String getName() { return enumeratorName.toString(); } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return enumeratorName.toCharArray(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return CVisitor.getContainingScope(enumeratorName.getParent()); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType() */ + @Override public IType getType() { return (IType) getOwner(); } + @Override public ILinkage getLinkage() { return Linkage.C_LINKAGE; } + @Override public IBinding getOwner() { IASTEnumerator etor = (IASTEnumerator) enumeratorName.getParent(); IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent(); return enumSpec.getName().resolveBinding(); } + @Override public IValue getValue() { IASTNode parent= enumeratorName.getParent(); if (parent instanceof ASTEnumerator) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java index 35fca520f1c..1485032958d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java @@ -26,6 +26,7 @@ public class CField extends CVariable implements IField { fOwner = owner; } + @Override public ICompositeType getCompositeTypeOwner() { return fOwner; } @@ -35,6 +36,7 @@ public class CField extends CVariable implements IField { super(name); } + @Override public ICompositeType getCompositeTypeOwner() { ICCompositeTypeScope scope = (ICCompositeTypeScope) getScope(); return scope.getCompositeType(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java index 0624d1fac92..62ef92945e8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java @@ -62,11 +62,12 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu && ASTQueries.findOutermostDeclarator(declarator).getParent() instanceof IASTFunctionDefinition) { definition = (IASTFunctionDeclarator) declarator; } else { - declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, declarator); + declarators = ArrayUtil.append(IASTDeclarator.class, declarators, declarator); } } } + @Override public IASTDeclarator getPhysicalNode() { if (definition != null) return definition; @@ -75,6 +76,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu return null; } + @Override public void addDeclarator(IASTDeclarator fnDeclarator) { if (!fnDeclarator.isActive()) return; @@ -100,7 +102,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu if( tu != null ){ CVisitor.getDeclarations( tu, this ); } - declarators = (IASTDeclarator[]) ArrayUtil.trim(IASTDeclarator.class, declarators); + declarators = ArrayUtil.trim(IASTDeclarator.class, declarators); bits |= FULLY_RESOLVED; bits &= ~RESOLUTION_IN_PROGRESS; } @@ -109,6 +111,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getParameters() */ + @Override public IParameter[] getParameters() { int j=-1; int len = declarators != null ? declarators.length : 0; @@ -162,10 +165,12 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public String getName() { return getASTName().toString(); } + @Override public char[] getNameCharArray(){ return getASTName().toCharArray(); } @@ -177,6 +182,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { IASTDeclarator dtor = getPhysicalNode(); if (dtor != null) @@ -187,6 +193,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getFunctionScope() */ + @Override public IScope getFunctionScope() { if (definition != null) { IASTFunctionDefinition def = (IASTFunctionDefinition) definition.getParent(); @@ -195,7 +202,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu return null; } - public IFunctionType getType() { + @Override + public IFunctionType getType() { if (type == null) { type = createType(); } @@ -329,11 +337,13 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#isStatic() */ - public boolean isStatic() { + @Override + public boolean isStatic() { return isStatic(true); } - public boolean isStatic(boolean resolveAll) { + @Override + public boolean isStatic(boolean resolveAll) { if( resolveAll && (bits & FULLY_RESOLVED) == 0 ){ resolveAllDeclarations(); } @@ -371,7 +381,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu } - public boolean isExtern() { + @Override + public boolean isExtern() { return isExtern(true); } @@ -383,7 +394,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu } - public boolean isAuto() { + @Override + public boolean isAuto() { if( (bits & FULLY_RESOLVED) == 0 ){ resolveAllDeclarations(); } @@ -391,7 +403,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu } - public boolean isRegister() { + @Override + public boolean isRegister() { if( (bits & FULLY_RESOLVED) == 0 ){ resolveAllDeclarations(); } @@ -399,7 +412,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu } - public boolean isInline() { + @Override + public boolean isInline() { if( (bits & FULLY_RESOLVED) == 0 ){ resolveAllDeclarations(); } @@ -431,6 +445,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu } + @Override public boolean takesVarArgs() { if ((bits & FULLY_RESOLVED) == 0) { resolveAllDeclarations(); @@ -452,6 +467,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu return false; } + @Override public void setFullyResolved(boolean resolved) { if( resolved ) bits |= FULLY_RESOLVED; @@ -459,18 +475,22 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu bits &= ~FULLY_RESOLVED; } + @Override public ILinkage getLinkage() { return Linkage.C_LINKAGE; } + @Override public IASTNode[] getDeclarations() { return declarators; } + @Override public IASTNode getDefinition() { return definition; } + @Override public IBinding getOwner() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java index 61ed52b7dd0..802a92f1c92 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java @@ -31,11 +31,13 @@ public class CFunctionScope extends CScope implements ICFunctionScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.c.ICFunctionScope#getBinding(char[]) */ - public IBinding getBinding( char[] name ) { + @Override + public IBinding getBinding( char[] name ) { return super.getBinding( NAMESPACE_TYPE_OTHER, name ); } + @Override public IScope getBodyScope(){ IASTNode node = getPhysicalNode(); IASTStatement statement = ((IASTFunctionDefinition)node).getBody(); @@ -59,7 +61,7 @@ public class CFunctionScope extends CScope implements ICFunctionScope { result = (ILabel[]) ArrayUtil.append( ILabel.class, result, binding ); } } - return (ILabel[]) ArrayUtil.trim( ILabel.class, result ); + return ArrayUtil.trim( ILabel.class, result ); } static private class FindLabelsAction extends ASTVisitor { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java index bf49918cb5b..e50497f3f96 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java @@ -27,7 +27,8 @@ public class CFunctionType implements IFunctionType, ISerializableType { this.parameters = types; } - public boolean isSameType( IType o ){ + @Override + public boolean isSameType( IType o ){ if( o == this ) return true; if( o instanceof ITypedef ) @@ -50,14 +51,16 @@ public class CFunctionType implements IFunctionType, ISerializableType { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getReturnType() */ - public IType getReturnType() { + @Override + public IType getReturnType() { return returnType; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getParameterTypes() */ - public IType[] getParameterTypes() { + @Override + public IType[] getParameterTypes() { return parameters; } @@ -72,6 +75,7 @@ public class CFunctionType implements IFunctionType, ISerializableType { return t; } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java index 212ab0662cf..f125cc60292 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java @@ -42,6 +42,7 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#getType() */ + @Override public IType getType() { IASTDeclSpecifier declSpec = null; if (declaration instanceof IASTSimpleDeclaration) @@ -61,6 +62,7 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public String getName() { return name.toString(); } @@ -68,6 +70,7 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ + @Override public char[] getNameCharArray() { return name.toCharArray(); } @@ -75,6 +78,7 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { return CVisitor.getContainingScope( declaration ); } @@ -89,21 +93,24 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic() */ - public boolean isStatic() { + @Override + public boolean isStatic() { return false; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern() */ - public boolean isExtern() { + @Override + public boolean isExtern() { return false; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto() */ - public boolean isAuto() { + @Override + public boolean isAuto() { if( declaration instanceof IASTSimpleDeclaration ) return ((IASTSimpleDeclaration)declaration).getDeclSpecifier().getStorageClass() == IASTDeclSpecifier.sc_auto; return false; @@ -112,20 +119,24 @@ public class CKnRParameter extends PlatformObject implements IParameter { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister() */ - public boolean isRegister() { + @Override + public boolean isRegister() { if( declaration instanceof IASTSimpleDeclaration ) return ((IASTSimpleDeclaration)declaration).getDeclSpecifier().getStorageClass() == IASTDeclSpecifier.sc_register; return false; } + @Override public ILinkage getLinkage() { return Linkage.C_LINKAGE; } + @Override public IBinding getOwner() { return CVisitor.findEnclosingFunction(declaration); } + @Override public IValue getInitialValue() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java index d915d91162c..9a08e1e2431 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java @@ -95,38 +95,47 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { return DEFAULT_INSTANCE; } + @Override public IASTArrayDeclarator newArrayDeclarator(IASTName name) { return new CASTArrayDeclarator(name); } + @Override public ICASTArrayDesignator newArrayDesignator(IASTExpression exp) { return new CASTArrayDesignator(exp); } + @Override public ICASTArrayModifier newArrayModifier(IASTExpression expr) { return new CASTArrayModifier(expr); } + @Override public IGCCASTArrayRangeDesignator newArrayRangeDesignatorGCC(IASTExpression floor, IASTExpression ceiling) { return new CASTArrayRangeDesignator(floor, ceiling); } + @Override public IASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript) { return new CASTArraySubscriptExpression(arrayExpr, subscript); } + @Override public IASTASMDeclaration newASMDeclaration(String assembly) { return new CASTASMDeclaration(assembly); } + @Override public IASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2) { return new CASTBinaryExpression(op, expr1, expr2); } + @Override public IASTBreakStatement newBreakStatement() { return new CASTBreakStatement(); } + @Override public IASTCaseStatement newCaseStatement(IASTExpression expression) { return new CASTCaseStatement(expression); } @@ -134,38 +143,47 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { /** * @param operator */ + @Override public IASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) { return new CASTCastExpression(typeId, operand); } + @Override public ICASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name) { return new CASTCompositeTypeSpecifier(key, name); } + @Override public IASTCompoundStatement newCompoundStatement() { return new CASTCompoundStatement(); } + @Override public IASTConditionalExpression newConditionalExpession(IASTExpression condition, IASTExpression positive, IASTExpression negative) { return new CASTConditionalExpression(condition, positive, negative); } + @Override public IASTContinueStatement newContinueStatement() { return new CASTContinueStatement(); } + @Override public IASTDeclarationStatement newDeclarationStatement(IASTDeclaration declaration) { return new CASTDeclarationStatement(declaration); } + @Override public IASTDeclarator newDeclarator(IASTName name) { return new CASTDeclarator(name); } + @Override public IASTDefaultStatement newDefaultStatement() { return new CASTDefaultStatement(); } + @Override @Deprecated public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializer operandInitializer) { CASTDesignatedInitializer result = new CASTDesignatedInitializer(); @@ -173,55 +191,68 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { return result; } + @Override public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializerClause clause) { return new CASTDesignatedInitializer(clause); } + @Override public IASTDoStatement newDoStatement(IASTStatement body, IASTExpression condition) { return new CASTDoStatement(body, condition); } + @Override public ICASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name) { return new CASTElaboratedTypeSpecifier(kind, name); } + @Override public ICASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) { return new CASTEnumerationSpecifier(name); } + @Override public IASTEnumerator newEnumerator(IASTName name, IASTExpression value) { return new CASTEnumerator(name, value); } + @Override public IASTEqualsInitializer newEqualsInitializer(IASTInitializerClause initClause) { return new CASTEqualsInitializer(initClause); } + @Override public IASTExpressionList newExpressionList() { return new CASTExpressionList(); } + @Override public IASTExpressionStatement newExpressionStatement(IASTExpression expr) { return new CASTExpressionStatement(expr); } + @Override public IASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize) { return new CASTFieldDeclarator(name, bitFieldSize); } + @Override public ICASTFieldDesignator newFieldDesignator(IASTName name) { return new CASTFieldDesignator(name); } + @Override public IASTFieldReference newFieldReference(IASTName name, IASTExpression owner) { return new CASTFieldReference(name, owner); } + @Override public IASTForStatement newForStatement(IASTStatement init, IASTExpression condition, IASTExpression iterationExpression, IASTStatement body) { return new CASTForStatement(init, condition, iterationExpression, body); } + @Override @Deprecated public IASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) { CASTFunctionCallExpression result = new CASTFunctionCallExpression(idExpr, null); @@ -229,117 +260,145 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { return result; } + @Override public IASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments) { return new CASTFunctionCallExpression(idExpr, arguments); } + @Override public IASTStandardFunctionDeclarator newFunctionDeclarator(IASTName name) { return new CASTFunctionDeclarator(name); } + @Override public IASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator, IASTStatement bodyStatement) { return new CASTFunctionDefinition(declSpecifier, declarator, bodyStatement); } + @Override public IGNUASTCompoundStatementExpression newGNUCompoundStatementExpression(IASTCompoundStatement compoundStatement) { return new CASTCompoundStatementExpression(compoundStatement); } + @Override public IASTGotoStatement newGotoStatement(IASTName name) { return new CASTGotoStatement(name); } + @Override public IASTIdExpression newIdExpression(IASTName name) { return new CASTIdExpression(name); } + @Override public IASTIfStatement newIfStatement(IASTExpression expr, IASTStatement thenStat, IASTStatement elseClause) { return new CASTIfStatement(expr, thenStat, elseClause); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.IASTInitializerExpression newInitializerExpression(IASTExpression expression) { return new CASTInitializerExpression(expression); } + @Override public IASTInitializerList newInitializerList() { return new CASTInitializerList(); } + @Override public ICASTKnRFunctionDeclarator newKnRFunctionDeclarator(IASTName[] parameterNames, IASTDeclaration[] parameterDeclarations) { return new CASTKnRFunctionDeclarator(parameterNames, parameterDeclarations); } + @Override public IASTLabelStatement newLabelStatement(IASTName name, IASTStatement nestedStatement) { return new CASTLabelStatement(name, nestedStatement); } + @Override public IASTLiteralExpression newLiteralExpression(int kind, String rep) { return new CASTLiteralExpression(kind, rep.toCharArray()); } + @Override public IASTName newName() { return new CASTName(); } + @Override public IASTName newName(char[] name) { return new CASTName(name); } + @Override public IASTNullStatement newNullStatement() { return new CASTNullStatement(); } + @Override public IASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator) { return new CASTParameterDeclaration(declSpec, declarator); } + @Override public ICASTPointer newPointer() { return new CASTPointer(); } + @Override public IASTProblem newProblem(int id, char[] arg, boolean error) { return new CASTProblem(id, arg, error); } + @Override public IASTProblemDeclaration newProblemDeclaration(IASTProblem problem) { return new CASTProblemDeclaration(problem); } + @Override public IASTProblemExpression newProblemExpression(IASTProblem problem) { return new CASTProblemExpression(problem); } + @Override public IASTProblemStatement newProblemStatement(IASTProblem problem) { return new CASTProblemStatement(problem); } + @Override public IASTReturnStatement newReturnStatement(IASTExpression retValue) { return new CASTReturnStatement(retValue); } + @Override public IASTSimpleDeclaration newSimpleDeclaration(IASTDeclSpecifier declSpecifier) { return new CASTSimpleDeclaration(declSpecifier); } + @Override public ICASTSimpleDeclSpecifier newSimpleDeclSpecifier() { return new CASTSimpleDeclSpecifier(); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTSimpleDeclSpecifier newSimpleDeclSpecifierGCC(IASTExpression typeofExpression) { return new GCCASTSimpleDeclSpecifier(typeofExpression); } + @Override public IASTSwitchStatement newSwitchStatement(IASTExpression controller, IASTStatement body) { return new CASTSwitchStatement(controller, body); } + @Override public IASTTranslationUnit newTranslationUnit() { return newTranslationUnit(null); } + @Override public IASTTranslationUnit newTranslationUnit(IScanner scanner) { CASTTranslationUnit tu = new CASTTranslationUnit(); @@ -353,26 +412,32 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory { return tu; } + @Override public ICASTTypedefNameSpecifier newTypedefNameSpecifier(IASTName name) { return new CASTTypedefNameSpecifier(name); } + @Override public IASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator) { return new CASTTypeId(declSpecifier, declarator); } + @Override public IASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId) { return new CASTTypeIdExpression(operator, typeId); } + @Override public ICASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer) { return new CASTTypeIdInitializerExpression(typeId, initializer); } + @Override public IASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand) { return new CASTUnaryExpression(operator, operand); } + @Override public IASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body) { return new CASTWhileStatement(condition, body); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java index 4fac804d4cf..48452cd8ea5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java @@ -56,6 +56,7 @@ public class CParameter extends PlatformObject implements IParameter { * @see org.eclipse.cdt.core.dom.ast.IVariable#getType() */ + @Override public IType getType() { if (type == null && declarations[0].getParent() instanceof IASTDeclarator) type = CVisitor.createType((IASTDeclarator) declarations[0].getParent()); @@ -85,6 +86,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public String getName() { IASTName name = getPrimaryDeclaration(); if (name != null) @@ -92,6 +94,7 @@ public class CParameter extends PlatformObject implements IParameter { return CVisitor.EMPTY_STRING; } + @Override public char[] getNameCharArray() { IASTName name = getPrimaryDeclaration(); if (name != null) @@ -104,6 +107,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { // IASTParameterDeclaration or IASTSimpleDeclaration for (IASTName declaration : declarations) { @@ -131,7 +135,7 @@ public class CParameter extends PlatformObject implements IParameter { */ public void addDeclaration(IASTName name) { if (name != null && name.isActive()) - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name); + declarations = ArrayUtil.append(IASTName.class, declarations, name); } /* @@ -139,6 +143,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic() */ + @Override public boolean isStatic() { return false; } @@ -148,6 +153,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern() */ + @Override public boolean isExtern() { return false; } @@ -157,6 +163,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto() */ + @Override public boolean isAuto() { return hasStorageClass(IASTDeclSpecifier.sc_auto); } @@ -166,6 +173,7 @@ public class CParameter extends PlatformObject implements IParameter { * * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister() */ + @Override public boolean isRegister() { return hasStorageClass(IASTDeclSpecifier.sc_register); } @@ -191,10 +199,12 @@ public class CParameter extends PlatformObject implements IParameter { return false; } + @Override public ILinkage getLinkage() { return Linkage.C_LINKAGE; } + @Override public IBinding getOwner() { if (declarations == null || declarations.length == 0) return null; @@ -202,6 +212,7 @@ public class CParameter extends PlatformObject implements IParameter { return CVisitor.findEnclosingFunction(declarations[0]); } + @Override public IValue getInitialValue() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java index 6d0889f167d..1dae663aef2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java @@ -51,6 +51,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali this.isRestrict = isRestrict; } + @Override public boolean isSameType(IType obj) { if (obj == this) return true; @@ -73,6 +74,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isConst() */ + @Override public boolean isConst() { return isConst; } @@ -80,6 +82,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isVolatile() */ + @Override public boolean isVolatile() { return isVolatile; } @@ -87,6 +90,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.c.ICQualifierType#isRestrict() */ + @Override public boolean isRestrict() { return isRestrict; } @@ -117,10 +121,12 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali return new ProblemType(ISemanticProblem.TYPE_UNRESOLVED_NAME); } + @Override public IType getType() { return type; } + @Override public void setType(IType t) { type = t; } @@ -136,6 +142,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali return t; } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.CVQUALIFIER; if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java index 4e9b526a4b6..581d9ed3d22 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java @@ -148,7 +148,7 @@ public class CScope implements ICScope, IASTInternalScope { prop == IASTCompositeTypeSpecifier.TYPE_NAME || prop == IASTDeclarator.DECLARATOR_NAME) { if (CharArrayUtils.equals(n.toCharArray(), name)) - result = (IASTName[]) ArrayUtil.append(IASTName.class, result, n); + result = ArrayUtil.append(IASTName.class, result, n); } return PROCESS_CONTINUE; @@ -162,7 +162,7 @@ public class CScope implements ICScope, IASTInternalScope { } public IASTName[] getNames() { - return (IASTName[]) ArrayUtil.trim(IASTName.class, result); + return ArrayUtil.trim(IASTName.class, result); } } @@ -221,7 +221,7 @@ public class CScope implements ICScope, IASTInternalScope { if (n == name) return; } - final IASTName[] newNames= (IASTName[]) ArrayUtil.append(IASTName.class, names, name); + final IASTName[] newNames= ArrayUtil.append(IASTName.class, names, name); if (newNames != names) map.put(nchars, newNames); } else { @@ -392,13 +392,13 @@ public class CScope implements ICScope, IASTInternalScope { } } if (b != null) { - result = (IBinding[]) ArrayUtil.append(IBinding.class, result, b); + result = ArrayUtil.append(IBinding.class, result, b); } } } } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java index ca2cb5b2d0d..a6f23ab423e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java @@ -150,7 +150,7 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte } ICASTCompositeTypeSpecifier compSpec = (ICASTCompositeTypeSpecifier) definition.getParent(); IField[] fields = collectFields(compSpec, null); - return (IField[]) ArrayUtil.trim(IField.class, fields); + return ArrayUtil.trim(IField.class, fields); } private IField[] collectFields(ICASTCompositeTypeSpecifier compSpec, IField[] fields) { @@ -251,7 +251,7 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte declarations[0] = decl; decl = first; } - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, decl); + declarations = ArrayUtil.append(IASTName.class, declarations, decl); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java index 0a9eee1138e..9492c5dc544 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java @@ -51,7 +51,7 @@ public class CVariable extends PlatformObject implements IInternalVariable, ICIn public void addDeclaration(IASTName name) { if (name != null && name.isActive()) { - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name); + declarations = ArrayUtil.append(IASTName.class, declarations, name); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java index ef1504c09e4..68a1410a18b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java @@ -631,10 +631,10 @@ public class CVisitor extends ASTQueries { IField[] fields = ct.getFields(); for (IField field : fields) { if (matcher.match(field.getNameCharArray())) { - result = (IBinding[]) ArrayUtil.append(IBinding.class, result, field); + result = ArrayUtil.append(IBinding.class, result, field); } } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } static IType getPtrDiffType(IASTBinaryExpression expr) { @@ -1087,7 +1087,7 @@ public class CVisitor extends ASTQueries { final char[] n= b.getNameCharArray(); // consider binding only if no binding with the same name was found in another scope. if (!handled.containsKey(n)) { - result= (IBinding[]) ArrayUtil.append(IBinding.class, result, b); + result= ArrayUtil.append(IBinding.class, result, b); } } // store names of bindings @@ -1099,7 +1099,7 @@ public class CVisitor extends ASTQueries { scope= scope.getParent(); } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } private static IBinding externalBinding(IASTTranslationUnit tu, IASTName name) { @@ -1488,7 +1488,7 @@ public class CVisitor extends ASTQueries { } catch (DOMException e) { } } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } private static IBinding[] findBindingForContentAssist(ICASTFieldDesignator fd, boolean isPrefix) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java index f7c3f785e58..722ebb435fb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java @@ -42,10 +42,12 @@ public class GCCASTSimpleDeclSpecifier extends CASTSimpleDeclSpecifier implement return copy; } + @Override public void setTypeofExpression(IASTExpression expr) { setDeclTypeExpression(expr); } + @Override public IASTExpression getTypeofExpression() { return getDeclTypeExpression(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java index fc43de3fe4d..2819243d5d6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java @@ -342,9 +342,9 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { markBeforDtor= null; dtor= addInitializer(e, declOption); } - declarators= (IASTDeclarator[]) ArrayUtil.append( IASTDeclarator.class, declarators, dtor); + declarators= ArrayUtil.append( IASTDeclarator.class, declarators, dtor); } - declarators= (IASTDeclarator[]) ArrayUtil.removeNulls( IASTDeclarator.class, declarators ); + declarators= ArrayUtil.removeNulls( IASTDeclarator.class, declarators ); } final int lt1= LTcatchEOF(1); @@ -1543,7 +1543,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser { } } - parmDeclarations = (IASTDeclaration[]) ArrayUtil.removeNulls( IASTDeclaration.class, parmDeclarations ); + parmDeclarations = ArrayUtil.removeNulls( IASTDeclaration.class, parmDeclarations ); ICASTKnRFunctionDeclarator functionDecltor = nodeFactory.newKnRFunctionDeclarator(parmNames, parmDeclarations); ((ASTNode) functionDecltor).setOffsetAndLength(startOffset, endOffset-startOffset); return functionDecltor; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java index 77aadcda2b9..8e12dcb703b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java @@ -51,18 +51,22 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat this.specialClass= specialization; } + @Override public ICPPClassType getOriginalClassType() { return specialClass.getSpecializedBinding(); } + @Override public final IBinding getBinding(IASTName name, boolean resolve) { return getBinding(name, resolve, IIndexFileSet.EMPTY); } + @Override public final IBinding[] getBindings(IASTName name, boolean resolve, boolean prefix) { return getBindings(name, resolve, prefix, IIndexFileSet.EMPTY); } + @Override public IBinding getBinding(IASTName name, boolean forceResolve, IIndexFileSet fileSet) { char[] c = name.getLookupKey(); @@ -80,12 +84,13 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat IBinding[] specs = new IBinding[0]; for (IBinding binding : bindings) { - specs = (IBinding[]) ArrayUtil.append(IBinding.class, specs, specialClass.specializeMember(binding)); + specs = ArrayUtil.append(IBinding.class, specs, specialClass.specializeMember(binding)); } - specs = (IBinding[]) ArrayUtil.trim(IBinding.class, specs); + specs = ArrayUtil.trim(IBinding.class, specs); return CPPSemantics.resolveAmbiguities(name, specs); } + @Override final public IBinding[] getBindings(IASTName name, boolean forceResolve, boolean prefixLookup, IIndexFileSet fileSet) { return getBindings(name, forceResolve, prefixLookup, fileSet, true); @@ -111,15 +116,17 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat } else { binding= specialClass.specializeMember(binding); } - result = (IBinding[]) ArrayUtil.append(IBinding.class, result, binding); + result = ArrayUtil.append(IBinding.class, result, binding); } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } + @Override public ICPPClassSpecialization getClassType() { return specialClass; } + @Override public ICPPBase[] getBases() { if (fBases == null) { ICPPBase[] result = null; @@ -133,14 +140,14 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat if (origClass instanceof ICPPTemplateParameter && ((ICPPTemplateParameter) origClass).isParameterPack()) { IType[] specClasses= CPPTemplates.instantiateTypes(new IType[]{new CPPParameterPackType((IType) origClass)}, tpmap, -1, specialClass); if (specClasses.length == 1 && specClasses[0] instanceof ICPPParameterPackType) { - result= (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, base); + result= ArrayUtil.append(ICPPBase.class, result, base); } else { for (IType specClass : specClasses) { ICPPBase specBase = base.clone(); specClass = SemanticUtil.getUltimateType(specClass, false); if (specClass instanceof IBinding && !(specClass instanceof IProblemBinding)) { specBase.setBaseClass((IBinding) specClass); - result = (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, specBase); + result = ArrayUtil.append(ICPPBase.class, result, specBase); } } } @@ -153,10 +160,10 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat if (specClass instanceof IBinding && !(specClass instanceof IProblemBinding)) { specBase.setBaseClass((IBinding) specClass); } - result = (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, specBase); + result = ArrayUtil.append(ICPPBase.class, result, specBase); } } - result= (ICPPBase[]) ArrayUtil.trim(ICPPBase.class, result); + result= ArrayUtil.trim(ICPPBase.class, result); fBases= result; return result; } @@ -176,11 +183,13 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat return newArray; } + @Override public ICPPField[] getDeclaredFields() { ICPPField[] fields= specialClass.getSpecializedBinding().getDeclaredFields(); return specializeMembers(fields); } + @Override public ICPPMethod[] getImplicitMethods() { ICPPClassScope origClassScope= (ICPPClassScope) specialClass.getSpecializedBinding().getCompositeScope(); if (origClassScope == null) { @@ -190,32 +199,38 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat return specializeMembers(methods); } + @Override public IName getScopeName() { if (specialClass instanceof ICPPInternalBinding) return (IASTName) ((ICPPInternalBinding) specialClass).getDefinition(); return null; } + @Override public ICPPConstructor[] getConstructors() { ICPPConstructor[] ctors= specialClass.getSpecializedBinding().getConstructors(); return specializeMembers(ctors); } + @Override public ICPPMethod[] getDeclaredMethods() { ICPPMethod[] bindings = specialClass.getSpecializedBinding().getDeclaredMethods(); return specializeMembers(bindings); } + @Override public ICPPClassType[] getNestedClasses() { ICPPClassType[] bindings = specialClass.getSpecializedBinding().getNestedClasses(); return specializeMembers(bindings); } + @Override public IBinding[] getFriends() { // not yet supported return IBinding.EMPTY_BINDING_ARRAY; } + @Override public IScope getParent() throws DOMException { IBinding binding= specialClass.getOwner(); if (binding instanceof ICPPClassType) { @@ -227,6 +242,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat return getOriginalClassType().getScope(); } + @Override public IBinding[] find(String name) { return CPPSemantics.findBindings(this, name, false); } @@ -237,6 +253,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat return name != null ? name.toString() : String.valueOf(specialClass); } + @Override public EScopeKind getKind() { return EScopeKind.eClassType; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java index ea800d4ad32..715ff2b1ff6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java @@ -27,10 +27,12 @@ public class CPPASTASMDeclaration extends ASTNode implements IASTASMDeclaration setAssembly(assembly); } + @Override public CPPASTASMDeclaration copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTASMDeclaration copy(CopyStyle style) { CPPASTASMDeclaration copy = new CPPASTASMDeclaration(); copy.assembly = assembly.clone(); @@ -41,13 +43,15 @@ public class CPPASTASMDeclaration extends ASTNode implements IASTASMDeclaration return copy; } + @Override public String getAssembly() { if( assembly == null ) return ""; //$NON-NLS-1$ return new String( assembly ); } - public void setAssembly(String assembly) { + @Override + public void setAssembly(String assembly) { assertNotFrozen(); this.assembly = assembly.toCharArray(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java index 10d411031b4..f47bcda4a3a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java @@ -49,10 +49,12 @@ public class CPPASTAmbiguousCondition extends ASTAmbiguousNode implements IASTAm } } + @Override public IASTExpression copy() { throw new UnsupportedOperationException(); } + @Override public IASTExpression copy(CopyStyle style) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java index 7b2be658f5f..d7d03003e05 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java @@ -63,25 +63,29 @@ public class CPPASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTA } } + @Override public IASTDeclarator copy() { throw new UnsupportedOperationException(); } + @Override public IASTDeclarator copy(CopyStyle style) { throw new UnsupportedOperationException(); } + @Override public void addDeclarator(IASTDeclarator d) { assertNotFrozen(); if (d != null) { - dtors = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, dtors, ++dtorPos, d); + dtors = ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d); d.setParent(this); d.setPropertyInParent(SUBDECLARATOR); } } - public IASTDeclarator[] getDeclarators() { - dtors = (IASTDeclarator[]) ArrayUtil.removeNullsAfter(IASTDeclarator.class, dtors, dtorPos ); + @Override + public IASTDeclarator[] getDeclarators() { + dtors = ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); return dtors; } @@ -90,50 +94,61 @@ public class CPPASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTA return getDeclarators(); } + @Override public IASTInitializer getInitializer() { return fInitializer; } + @Override public IASTName getName() { return dtors[0].getName(); } + @Override public IASTDeclarator getNestedDeclarator() { return dtors[0].getNestedDeclarator(); } + @Override public IASTPointerOperator[] getPointerOperators() { return dtors[0].getPointerOperators(); } + @Override public int getRoleForName(IASTName name) { return dtors[0].getRoleForName(name); } + @Override public void addPointerOperator(IASTPointerOperator operator) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setInitializer(IASTInitializer initializer) { // store the initializer until the ambiguity is resolved fInitializer= initializer; } + @Override public void setName(IASTName name) { assertNotFrozen(); Assert.isLegal(false); } + @Override public void setNestedDeclarator(IASTDeclarator nested) { assertNotFrozen(); Assert.isLegal(false); } + @Override public boolean declaresParameterPack() { return false; } + @Override public void setDeclaresParameterPack(boolean val) { assertNotFrozen(); Assert.isLegal(false); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java index 9081750edc5..22b6a6175f3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java @@ -29,25 +29,29 @@ public class CPPASTAmbiguousExpression extends ASTAmbiguousNode implements } - public IASTExpression copy() { + @Override + public IASTExpression copy() { throw new UnsupportedOperationException(); } + @Override public IASTExpression copy(CopyStyle style) { throw new UnsupportedOperationException(); } + @Override public void addExpression(IASTExpression e) { assertNotFrozen(); if (e != null) { - exp = (IASTExpression[]) ArrayUtil.append( IASTExpression.class, exp, ++expPos, e ); + exp = ArrayUtil.appendAt( IASTExpression.class, exp, ++expPos, e ); e.setParent(this); e.setPropertyInParent(SUBEXPRESSION); } } - public IASTExpression[] getExpressions() { - exp = (IASTExpression[]) ArrayUtil.removeNullsAfter( IASTExpression.class, exp, expPos ); + @Override + public IASTExpression[] getExpressions() { + exp = ArrayUtil.trimAt( IASTExpression.class, exp, expPos ); return exp; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java index c168e86be94..ab68e647d17 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java @@ -84,7 +84,7 @@ public class CPPASTAmbiguousStatement extends ASTAmbiguousNode implements public void addStatement(IASTStatement s) { assertNotFrozen(); if (s != null) { - stmts = (IASTStatement[]) ArrayUtil.append( IASTStatement.class, stmts, ++stmtsPos, s ); + stmts = ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s ); s.setParent(this); s.setPropertyInParent(STATEMENT); } @@ -92,7 +92,7 @@ public class CPPASTAmbiguousStatement extends ASTAmbiguousNode implements @Override public IASTStatement[] getStatements() { - stmts = (IASTStatement[]) ArrayUtil.removeNullsAfter( IASTStatement.class, stmts, stmtsPos ); + stmts = ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos ); return stmts; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java index 480e4f2282c..f6deabd115f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java @@ -84,10 +84,12 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements } + @Override public IASTNode copy() { return copy(CopyStyle.withoutLocations); } + @Override public IASTNode copy(CopyStyle style) { int sizeOfNodes = fNodes.size(); @@ -111,16 +113,19 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements return fNodes.toArray(new IASTNode[fNodes.size()]); } + @Override public void addTypeId(IASTTypeId typeId) { assertNotFrozen(); addNode(typeId); } + @Override public void addIdExpression(IASTIdExpression idExpression) { assertNotFrozen(); addNode(idExpression); } + @Override public void addIdExpression(IASTExpression idExpression) { assertNotFrozen(); addNode(idExpression); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java index f695773d03e..a5bec51cd8f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java @@ -58,7 +58,7 @@ public class CPPASTArrayDeclarator extends CPPASTDeclarator implements ICPPASTAr public IASTArrayModifier[] getArrayModifiers() { if (arrayMods == null) return IASTArrayModifier.EMPTY_ARRAY; - arrayMods = (IASTArrayModifier[]) ArrayUtil.removeNullsAfter(IASTArrayModifier.class, + arrayMods = ArrayUtil.trimAt(IASTArrayModifier.class, arrayMods, arrayModsPos); return arrayMods; } @@ -67,7 +67,7 @@ public class CPPASTArrayDeclarator extends CPPASTDeclarator implements ICPPASTAr public void addArrayModifier(IASTArrayModifier arrayModifier) { assertNotFrozen(); if (arrayModifier != null) { - arrayMods = (IASTArrayModifier[]) ArrayUtil.append(IASTArrayModifier.class, arrayMods, + arrayMods = ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods, ++arrayModsPos, arrayModifier); arrayModifier.setParent(this); arrayModifier.setPropertyInParent(ARRAY_MODIFIER); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java index e832fe370cb..189abc2122c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java @@ -29,74 +29,90 @@ public abstract class CPPASTBaseDeclSpecifier extends ASTNode implements ICPPAST private boolean virtual; private boolean explicit; - public boolean isFriend() { + @Override + public boolean isFriend() { return friend; } - public int getStorageClass() { + @Override + public int getStorageClass() { return sc; } - public void setStorageClass(int storageClass) { + @Override + public void setStorageClass(int storageClass) { assertNotFrozen(); sc = storageClass; } - public boolean isConst() { + @Override + public boolean isConst() { return isConst; } - public void setConst(boolean value) { + @Override + public void setConst(boolean value) { assertNotFrozen(); isConst = value; } - public boolean isVolatile() { + @Override + public boolean isVolatile() { return isVolatile; } - public void setVolatile(boolean value) { + @Override + public void setVolatile(boolean value) { assertNotFrozen(); isVolatile = value; } - public boolean isRestrict() { + @Override + public boolean isRestrict() { return isRestrict; } - public void setRestrict(boolean value) { + @Override + public void setRestrict(boolean value) { assertNotFrozen(); isRestrict = value; } - public boolean isInline() { + @Override + public boolean isInline() { return inline; } - public void setInline(boolean value) { + @Override + public void setInline(boolean value) { assertNotFrozen(); this.inline = value; } - public void setFriend(boolean value) { + @Override + public void setFriend(boolean value) { assertNotFrozen(); friend = value; } - public boolean isVirtual() { + @Override + public boolean isVirtual() { return virtual; } - public void setVirtual(boolean value) { + @Override + public void setVirtual(boolean value) { assertNotFrozen(); virtual = value; } - public boolean isExplicit() { + @Override + public boolean isExplicit() { return explicit; } - public void setExplicit(boolean value) { + @Override + public void setExplicit(boolean value) { assertNotFrozen(); this.explicit = value; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java index bcd6f147c78..56feb529af0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java @@ -48,10 +48,12 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier setName(name); } + @Override public CPPASTBaseSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTBaseSpecifier copy(CopyStyle style) { CPPASTBaseSpecifier copy = new CPPASTBaseSpecifier(name == null ? null : name.copy(style)); copy.isVirtual = isVirtual; @@ -64,29 +66,35 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier return copy; } + @Override public boolean isVirtual() { return isVirtual; } - public void setVirtual(boolean value) { + @Override + public void setVirtual(boolean value) { assertNotFrozen(); isVirtual = value; } - public int getVisibility() { + @Override + public int getVisibility() { return visibility; } - public void setVisibility(int visibility) { + @Override + public void setVisibility(int visibility) { assertNotFrozen(); this.visibility = visibility; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -114,11 +122,13 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier return true; } + @Override public int getRoleForName(IASTName n) { if (name == n) return r_reference; return r_unclear; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); List filtered = new ArrayList(); @@ -146,15 +156,18 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier return filtered.toArray(new IBinding[filtered.size()]); } + @Override public boolean isPackExpansion() { return fIsPackExpansion; } + @Override public void setIsPackExpansion(boolean val) { assertNotFrozen(); fIsPackExpansion= val; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java index d22b8228c4a..8b04d2b0929 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java @@ -55,10 +55,12 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr setInitOperand2(operand2); } + @Override public CPPASTBinaryExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTBinaryExpression copy(CopyStyle style) { CPPASTBinaryExpression copy = new CPPASTBinaryExpression(); copy.op = op; @@ -71,30 +73,36 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr return copy; } + @Override public int getOperator() { return op; } - public IASTExpression getOperand1() { + @Override + public IASTExpression getOperand1() { return operand1; } - public IASTInitializerClause getInitOperand2() { + @Override + public IASTInitializerClause getInitOperand2() { return operand2; } - public IASTExpression getOperand2() { + @Override + public IASTExpression getOperand2() { if (operand2 instanceof IASTExpression) return (IASTExpression) operand2; return null; } - public void setOperator(int op) { + @Override + public void setOperator(int op) { assertNotFrozen(); this.op = op; } - public void setOperand1(IASTExpression expression) { + @Override + public void setOperand1(IASTExpression expression) { assertNotFrozen(); operand1 = expression; if (expression != null) { @@ -112,13 +120,15 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr } } - public void setOperand2(IASTExpression expression) { + @Override + public void setOperand2(IASTExpression expression) { setInitOperand2(expression); } /** * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames() */ + @Override public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPFunction overload = getOverload(); @@ -233,6 +243,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == operand1) { other.setPropertyInParent(child.getPropertyInParent()); @@ -246,21 +257,24 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { if (type == null) { type= createExpressionType(); } return type; } - public ICPPFunction getOverload() { + @Override + public ICPPFunction getOverload() { if (overload != UNINITIALIZED_FUNCTION) return overload; return overload = CPPSemantics.findOverloadedOperator(this); } - public ValueCategory getValueCategory() { + @Override + public ValueCategory getValueCategory() { ICPPFunction op = getOverload(); if (op != null) { return valueCategoryFromFunctionCall(op); @@ -294,6 +308,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr return PRVALUE; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java index 85fb6d4d8b8..ba3230b8fbd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java @@ -36,10 +36,12 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT setOperand2(typeId2); } + @Override public CPPASTBinaryTypeIdExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTBinaryTypeIdExpression copy(CopyStyle style) { CPPASTBinaryTypeIdExpression copy = new CPPASTBinaryTypeIdExpression(fOperator, fOperand1 == null ? null : fOperand1.copy(), @@ -51,16 +53,19 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT return copy; } + @Override public Operator getOperator() { return fOperator; } - public void setOperator(Operator value) { + @Override + public void setOperator(Operator value) { assertNotFrozen(); fOperator = value; } - public void setOperand1(IASTTypeId typeId) { + @Override + public void setOperand1(IASTTypeId typeId) { assertNotFrozen(); fOperand1 = typeId; if (typeId != null) { @@ -69,7 +74,8 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT } } - public void setOperand2(IASTTypeId typeId) { + @Override + public void setOperand2(IASTTypeId typeId) { assertNotFrozen(); fOperand2 = typeId; if (typeId != null) { @@ -78,11 +84,13 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT } } - public IASTTypeId getOperand1() { + @Override + public IASTTypeId getOperand1() { return fOperand1; } - public IASTTypeId getOperand2() { + @Override + public IASTTypeId getOperand2() { return fOperand2; } @@ -107,6 +115,7 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT return true; } + @Override public IType getExpressionType() { switch (getOperator()) { case __is_base_of: @@ -115,10 +124,12 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return isLValue() ? LVALUE : PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java index adb97f5e7de..f498af4e8ec 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java @@ -39,10 +39,12 @@ public class CPPASTBreakStatement extends ASTNode implements IASTBreakStatement return true; } - public CPPASTBreakStatement copy() { + @Override + public CPPASTBreakStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTBreakStatement copy(CopyStyle style) { CPPASTBreakStatement copy = new CPPASTBreakStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java index c747442d292..7fc7e052082 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java @@ -26,10 +26,12 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture { public CPPASTCapture() { } + @Override public CPPASTCapture copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTCapture copy(CopyStyle style) { final CPPASTCapture result = new CPPASTCapture(); if (fIdentifier != null) @@ -43,18 +45,22 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture { return result; } + @Override public boolean capturesThisPointer() { return fIdentifier == null; } + @Override public boolean isByReference() { return fByReference; } + @Override public boolean isPackExpansion() { return fPackExpansion; } + @Override public IASTName getIdentifier() { return fIdentifier; } @@ -78,6 +84,7 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture { return true; } + @Override public void setIdentifier(IASTName identifier) { assertNotFrozen(); if (identifier != null) { @@ -87,11 +94,13 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture { fIdentifier= identifier; } + @Override public void setIsByReference(boolean value) { assertNotFrozen(); fByReference= value; } + @Override public void setIsPackExpansion(boolean val) { assertNotFrozen(); fPackExpansion= val; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java index dd1aa171540..f4decd6ba3c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java @@ -31,10 +31,12 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I setExpression(expression); } + @Override public CPPASTCaseStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTCaseStatement copy(CopyStyle style) { CPPASTCaseStatement copy = new CPPASTCaseStatement(expression == null ? null : expression.copy(style)); @@ -45,11 +47,13 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I return copy; } + @Override public IASTExpression getExpression() { return expression; } - public void setExpression(IASTExpression expression) { + @Override + public void setExpression(IASTExpression expression) { assertNotFrozen(); this.expression = expression; if (expression != null) { @@ -79,7 +83,8 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == expression ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java index 4eb7e05307f..2f833ac037c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java @@ -49,13 +49,13 @@ public class CPPASTCompoundStatement extends ASTNode public IASTStatement[] getStatements() { if (statements == null) return IASTStatement.EMPTY_STATEMENT_ARRAY; - return (IASTStatement[]) ArrayUtil.trim(IASTStatement.class, statements); + return ArrayUtil.trim(IASTStatement.class, statements); } @Override public void addStatement(IASTStatement statement) { assertNotFrozen(); - statements = (IASTStatement[]) ArrayUtil.append(IASTStatement.class, statements, statement); + statements = ArrayUtil.append(IASTStatement.class, statements, statement); if (statement != null) { statement.setParent(this); statement.setPropertyInParent(NESTED_STATEMENT); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java index 18d9622561b..ed34988f7ae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java @@ -39,10 +39,12 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS setCompoundStatement(statement); } + @Override public CPPASTCompoundStatementExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTCompoundStatementExpression copy(CopyStyle style) { CPPASTCompoundStatementExpression copy = new CPPASTCompoundStatementExpression(); copy.setCompoundStatement(statement == null ? null : statement.copy(style)); @@ -53,11 +55,13 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS return copy; } + @Override public IASTCompoundStatement getCompoundStatement() { return statement; } - public void setCompoundStatement(IASTCompoundStatement statement) { + @Override + public void setCompoundStatement(IASTCompoundStatement statement) { assertNotFrozen(); this.statement = statement; if (statement != null) { @@ -88,7 +92,8 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS return true; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IASTCompoundStatement compound = getCompoundStatement(); IASTStatement[] statements = compound.getStatements(); if (statements.length > 0) { @@ -99,10 +104,12 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java index fd23c12c611..4a04e12b956 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java @@ -63,10 +63,12 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio setNegativeResultExpression(negative); } + @Override public CPPASTConditionalExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTConditionalExpression copy(CopyStyle style) { CPPASTConditionalExpression copy = new CPPASTConditionalExpression(); copy.setLogicalConditionExpression(fCondition == null ? null : fCondition.copy(style)); @@ -79,11 +81,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio return copy; } + @Override public IASTExpression getLogicalConditionExpression() { return fCondition; } - public void setLogicalConditionExpression(IASTExpression expression) { + @Override + public void setLogicalConditionExpression(IASTExpression expression) { assertNotFrozen(); fCondition = expression; if (expression != null) { @@ -92,11 +96,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio } } - public IASTExpression getPositiveResultExpression() { + @Override + public IASTExpression getPositiveResultExpression() { return fPositive; } - public void setPositiveResultExpression(IASTExpression expression) { + @Override + public void setPositiveResultExpression(IASTExpression expression) { assertNotFrozen(); this.fPositive = expression; if (expression != null) { @@ -105,11 +111,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio } } - public IASTExpression getNegativeResultExpression() { + @Override + public IASTExpression getNegativeResultExpression() { return fNegative; } - public void setNegativeResultExpression(IASTExpression expression) { + @Override + public void setNegativeResultExpression(IASTExpression expression) { assertNotFrozen(); this.fNegative = expression; if (expression != null) { @@ -141,6 +149,7 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == fCondition) { other.setPropertyInParent(child.getPropertyInParent()); @@ -159,16 +168,19 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { evaluate(); return fType; } - public ValueCategory getValueCategory() { + @Override + public ValueCategory getValueCategory() { evaluate(); return fValueCategory; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java index 1915f311ca1..a07965123db 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java @@ -59,10 +59,12 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements setInitializer(initializer); } + @Override public CPPASTConstructorChainInitializer copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTConstructorChainInitializer copy(CopyStyle style) { CPPASTConstructorChainInitializer copy = new CPPASTConstructorChainInitializer(); copy.setMemberInitializerId(name == null ? null : name.copy(style)); @@ -75,11 +77,13 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements return copy; } + @Override public IASTName getMemberInitializerId() { return name; } - public void setMemberInitializerId(IASTName name) { + @Override + public void setMemberInitializerId(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -88,11 +92,13 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements } } - public IASTInitializer getInitializer() { + @Override + public IASTInitializer getInitializer() { return initializer; } - public void setInitializer(IASTInitializer init) { + @Override + public void setInitializer(IASTInitializer init) { assertNotFrozen(); initializer = init; if (init != null) { @@ -130,12 +136,14 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements return true; } - public int getRoleForName(IASTName n) { + @Override + public int getRoleForName(IASTName n) { if (name == n) return r_reference; return r_unclear; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); @@ -155,7 +163,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements bindings[i] = null; } } - return (IBinding[]) ArrayUtil.removeNulls(IBinding.class, bindings); + return ArrayUtil.removeNulls(IBinding.class, bindings); } private CharArraySet getBaseClasses(IASTName name) { @@ -176,15 +184,18 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements return result; } + @Override public boolean isPackExpansion() { return fIsPackExpansion; } + @Override public void setIsPackExpansion(boolean val) { assertNotFrozen(); fIsPackExpansion= val; } + @Override @Deprecated public IASTExpression getInitializerValue() { if (initializer == null || initializer instanceof IASTExpression) { @@ -202,6 +213,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements return null; } + @Override @Deprecated public void setInitializerValue(IASTExpression expression) { assertNotFrozen(); @@ -223,6 +235,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements /** * @see IASTImplicitNameOwner#getImplicitNames() */ + @Override public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPConstructor ctor = CPPSemantics.findImplicitlyCalledConstructor(this); @@ -243,6 +256,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements return implicitNames; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java index 2328a97b62a..71592128bef 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java @@ -36,10 +36,12 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons setArguments(args); } + @Override public CPPASTConstructorInitializer copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTConstructorInitializer copy(CopyStyle style) { IASTInitializerClause[] args = null; if (fArguments != null) { @@ -56,11 +58,13 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons return copy; } + @Override public IASTInitializerClause[] getArguments() { return fArguments; } - public void setArguments(IASTInitializerClause[] arguments) { + @Override + public void setArguments(IASTInitializerClause[] arguments) { assertNotFrozen(); if (arguments == null) { fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY; @@ -94,6 +98,7 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons return true; } + @Override public void replace(IASTNode child, IASTNode other) { for (int i = 0; i < fArguments.length; ++i) { if (child == fArguments[i]) { @@ -104,7 +109,8 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons } } - @Deprecated + @Override + @Deprecated public IASTExpression getExpression() { if (fArguments.length == 0) return null; @@ -126,7 +132,8 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons return result; } - @Deprecated + @Override + @Deprecated public void setExpression(IASTExpression expression) { assertNotFrozen(); if (expression == null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java index 9b52fa5c27e..0d1915fbcbe 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java @@ -38,10 +38,12 @@ public class CPPASTContinueStatement extends ASTNode implements IASTContinueStat return true; } - public CPPASTContinueStatement copy() { + @Override + public CPPASTContinueStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTContinueStatement copy(CopyStyle style) { CPPASTContinueStatement copy = new CPPASTContinueStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java index a87f638d44e..06bbcb610f0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java @@ -36,10 +36,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve setTypeId(typeId); } + @Override public CPPASTConversionName copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTConversionName copy(CopyStyle style) { CPPASTConversionName copy = new CPPASTConversionName(); copy.setTypeId(typeId == null ? null : typeId.copy(style)); @@ -50,10 +52,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve return copy; } + @Override public IASTTypeId getTypeId() { return typeId; } + @Override public void setTypeId(IASTTypeId typeId) { assertNotFrozen(); this.typeId=typeId; @@ -96,6 +100,7 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve return CPPVisitor.createBinding(this); } + @Override public char[] toCharArray() { if (fName == null) { IType t= null; @@ -123,10 +128,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve return name; } + @Override public char[] getSimpleID() { return toCharArray(); } + @Override public char[] getLookupKey() { return Keywords.cOPERATOR; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java index b8c631fec0e..85298da6dd9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java @@ -31,10 +31,12 @@ public class CPPASTDeclarationStatement extends ASTNode setDeclaration(declaration); } + @Override public CPPASTDeclarationStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTDeclarationStatement copy(CopyStyle style) { CPPASTDeclarationStatement copy = new CPPASTDeclarationStatement(); copy.setDeclaration(declaration == null ? null : declaration.copy(style)); @@ -45,11 +47,13 @@ public class CPPASTDeclarationStatement extends ASTNode return copy; } + @Override public IASTDeclaration getDeclaration() { return declaration; } - public void setDeclaration(IASTDeclaration declaration) { + @Override + public void setDeclaration(IASTDeclaration declaration) { assertNotFrozen(); this.declaration = declaration; if (declaration != null) { @@ -78,7 +82,8 @@ public class CPPASTDeclarationStatement extends ASTNode return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (declaration == child) { other.setParent(child.getParent()); other.setPropertyInParent(child.getPropertyInParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java index 46f458c35de..ffc5ed762b2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java @@ -61,10 +61,12 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST setInitializer(initializer); } - public CPPASTDeclarator copy() { + @Override + public CPPASTDeclarator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTDeclarator copy(CopyStyle style) { CPPASTDeclarator copy = new CPPASTDeclarator(); copyBaseDeclarator(copy, style); @@ -84,29 +86,35 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST copy.setOffsetAndLength(this); } + @Override public boolean declaresParameterPack() { return isPackExpansion; } + @Override public IASTPointerOperator[] getPointerOperators() { if (pointerOps == null) return IASTPointerOperator.EMPTY_ARRAY; - pointerOps = (IASTPointerOperator[]) ArrayUtil.trim(IASTPointerOperator.class, pointerOps); + pointerOps = ArrayUtil.trim(IASTPointerOperator.class, pointerOps); return pointerOps; } - public IASTDeclarator getNestedDeclarator() { + @Override + public IASTDeclarator getNestedDeclarator() { return nested; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public IASTInitializer getInitializer() { + @Override + public IASTInitializer getInitializer() { return initializer; } - public void setInitializer(IASTInitializer initializer) { + @Override + public void setInitializer(IASTInitializer initializer) { assertNotFrozen(); this.initializer = initializer; if (initializer != null) { @@ -115,16 +123,18 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST } } - public void addPointerOperator(IASTPointerOperator operator) { + @Override + public void addPointerOperator(IASTPointerOperator operator) { assertNotFrozen(); if (operator != null) { operator.setParent(this); operator.setPropertyInParent(POINTER_OPERATOR); - pointerOps = (IASTPointerOperator[]) ArrayUtil.append(IASTPointerOperator.class, pointerOps, operator); + pointerOps = ArrayUtil.append(IASTPointerOperator.class, pointerOps, operator); } } - public void setNestedDeclarator(IASTDeclarator nested) { + @Override + public void setNestedDeclarator(IASTDeclarator nested) { assertNotFrozen(); this.nested = nested; if (nested != null) { @@ -133,7 +143,8 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST } } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -142,7 +153,8 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST } } - public void setDeclaresParameterPack(boolean val) { + @Override + public void setDeclaresParameterPack(boolean val) { assertNotFrozen(); isPackExpansion= val; } @@ -196,6 +208,7 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST return initializer == null || initializer.accept(action); } + @Override public int getRoleForName(IASTName n) { // 3.1.2 IASTNode parent = ASTQueries.findOutermostDeclarator(this).getParent(); @@ -257,6 +270,7 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST /** * @see IASTImplicitNameOwner#getImplicitNames() */ + @Override public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPConstructor ctor = CPPSemantics.findImplicitlyCalledConstructor(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java index a66f576b058..a9e33954eb1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java @@ -38,10 +38,12 @@ public class CPPASTDefaultStatement extends ASTNode implements IASTDefaultStatem return true; } - public CPPASTDefaultStatement copy() { + @Override + public CPPASTDefaultStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTDefaultStatement copy(CopyStyle style) { CPPASTDefaultStatement copy = new CPPASTDefaultStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java index d3919e89cd2..269a6587aac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java @@ -44,10 +44,12 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr setOperand(from.operand); } + @Override public CPPASTDeleteExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTDeleteExpression copy(CopyStyle style) { CPPASTDeleteExpression copy = new CPPASTDeleteExpression(operand == null ? null : operand.copy(style)); @@ -60,11 +62,13 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr return copy; } + @Override public IASTExpression getOperand() { return operand; } - public void setOperand(IASTExpression expression) { + @Override + public void setOperand(IASTExpression expression) { assertNotFrozen(); operand = expression; if (expression != null) { @@ -73,28 +77,33 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr } } - public void setIsGlobal(boolean global) { + @Override + public void setIsGlobal(boolean global) { assertNotFrozen(); isGlobal = global; } - public boolean isGlobal() { + @Override + public boolean isGlobal() { return isGlobal; } - public void setIsVectored(boolean vectored) { + @Override + public void setIsVectored(boolean vectored) { assertNotFrozen(); isVectored = vectored; } - public boolean isVectored() { + @Override + public boolean isVectored() { return isVectored; } /** * Try to resolve both the destructor and operator delete. */ - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { List names = new ArrayList(); @@ -158,14 +167,17 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr return true; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { return CPPSemantics.VOID_TYPE; } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java index fb39ce06645..b9942a34ce4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java @@ -35,10 +35,12 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA setCondition(condition); } + @Override public CPPASTDoStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTDoStatement copy(CopyStyle style) { CPPASTDoStatement copy = new CPPASTDoStatement(); copy.setBody(body == null ? null : body.copy(style)); @@ -50,11 +52,13 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA return copy; } + @Override public IASTStatement getBody() { return body; } - public void setBody(IASTStatement body) { + @Override + public void setBody(IASTStatement body) { assertNotFrozen(); this.body = body; if (body != null) { @@ -63,11 +67,13 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA } } - public IASTExpression getCondition() { + @Override + public IASTExpression getCondition() { return condition; } - public void setCondition(IASTExpression condition) { + @Override + public void setCondition(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -97,7 +103,8 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( body == child ) { other.setPropertyInParent( body.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java index c914b5cae9e..a849ef06555 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java @@ -39,10 +39,12 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier setName(name); } + @Override public CPPASTElaboratedTypeSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTElaboratedTypeSpecifier copy(CopyStyle style) { CPPASTElaboratedTypeSpecifier copy = new CPPASTElaboratedTypeSpecifier(kind, name == null ? null : name.copy(style)); @@ -53,20 +55,24 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier return copy; } + @Override public int getKind() { return kind; } - public void setKind(int value) { + @Override + public void setKind(int value) { assertNotFrozen(); this.kind = value; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -95,10 +101,12 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier return true; } + @Override public int getRoleForName(IASTName n) { return getRoleForName(n, true); } + @Override public int getRoleForName(IASTName n, boolean allowResolution) { if (n != name) return r_unclear; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java index feab85df793..9da28755ffa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java @@ -45,10 +45,12 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier setBaseType(baseType); } + @Override public CPPASTEnumerationSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTEnumerationSpecifier copy(CopyStyle style) { CPPASTEnumerationSpecifier copy = new CPPASTEnumerationSpecifier(fIsScoped, fName == null ? null : fName.copy(style), fBaseType == null ? null : fBaseType.copy(style)); @@ -62,6 +64,7 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier return copy; } + @Override public boolean startValueComputation() { if (fValuesComputed) return false; @@ -70,23 +73,26 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier return true; } + @Override public void addEnumerator(IASTEnumerator enumerator) { assertNotFrozen(); if (enumerator != null) { enumerator.setParent(this); enumerator.setPropertyInParent(ENUMERATOR); - fItems = (IASTEnumerator[]) ArrayUtil.append( IASTEnumerator.class, fItems, ++fItemPos, enumerator ); + fItems = ArrayUtil.appendAt( IASTEnumerator.class, fItems, ++fItemPos, enumerator ); } } + @Override public IASTEnumerator[] getEnumerators() { if (fItems == null) return IASTEnumerator.EMPTY_ENUMERATOR_ARRAY; - fItems = (IASTEnumerator[]) ArrayUtil.removeNullsAfter(IASTEnumerator.class, fItems, fItemPos); + fItems = ArrayUtil.trimAt(IASTEnumerator.class, fItems, fItemPos); return fItems; } + @Override public void setName(IASTName name) { assertNotFrozen(); fName = name; @@ -96,6 +102,7 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier } } + @Override public IASTName getName() { return fName; } @@ -130,21 +137,25 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier return true; } + @Override public int getRoleForName(IASTName n) { if (fName == n) return isOpaque() ? r_declaration : r_definition; return r_unclear; } + @Override public void setIsScoped(boolean isScoped) { assertNotFrozen(); fIsScoped= isScoped; } + @Override public boolean isScoped() { return fIsScoped; } + @Override public void setBaseType(ICPPASTDeclSpecifier baseType) { assertNotFrozen(); fBaseType= baseType; @@ -154,19 +165,23 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier } } + @Override public ICPPASTDeclSpecifier getBaseType() { return fBaseType; } + @Override public void setIsOpaque(boolean isOpaque) { assertNotFrozen(); fIsOpaque= isOpaque; } + @Override public boolean isOpaque() { return fIsOpaque; } + @Override public ICPPScope getScope() { if (isOpaque()) return null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java index 0a0cda93d37..fdd9fef35d6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java @@ -28,10 +28,12 @@ public class CPPASTEnumerator extends ASTEnumerator { super(name, value); } + @Override public CPPASTEnumerator copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTEnumerator copy(CopyStyle style) { CPPASTEnumerator copy = new CPPASTEnumerator(); copyAbstractEnumerator(copy, style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java index 7c14d0e8f7a..14009a09773 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java @@ -25,10 +25,12 @@ public class CPPASTEqualsInitializer extends ASTEqualsInitializer { super(arg); } + @Override public CPPASTEqualsInitializer copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTEqualsInitializer copy(CopyStyle style) { IASTInitializerClause arg = getInitializerClause(); CPPASTEqualsInitializer copy = new CPPASTEqualsInitializer(arg == null ? null diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java index 1042f1c79f4..4311194512b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java @@ -35,10 +35,12 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements setDeclaration(declaration); } + @Override public CPPASTExplicitTemplateInstantiation copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTExplicitTemplateInstantiation copy(CopyStyle style) { CPPASTExplicitTemplateInstantiation copy = new CPPASTExplicitTemplateInstantiation(); copy.setDeclaration(declaration == null ? null : declaration.copy(style)); @@ -50,11 +52,13 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements return copy; } + @Override public IASTDeclaration getDeclaration() { return declaration; } - public void setDeclaration(IASTDeclaration declaration) { + @Override + public void setDeclaration(IASTDeclaration declaration) { assertNotFrozen(); this.declaration = declaration; if (declaration != null) { @@ -64,10 +68,12 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements } - public int getModifier() { + @Override + public int getModifier() { return modifier; } + @Override public void setModifier(int mod) { assertNotFrozen(); modifier= mod; @@ -96,7 +102,8 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( declaration == child ) { other.setParent( child.getParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java index 07a6f167683..d9f20c075ef 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java @@ -52,10 +52,12 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi private IASTImplicitName[] implicitNames; private ICPPFunction[] overloads = null; + @Override public CPPASTExpressionList copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTExpressionList copy(CopyStyle style) { CPPASTExpressionList copy = new CPPASTExpressionList(); for(IASTExpression expr : getExpressions()) @@ -67,12 +69,14 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi return copy; } + @Override public IASTExpression[] getExpressions() { if (expressions == null) return IASTExpression.EMPTY_EXPRESSION_ARRAY; - return (IASTExpression[]) ArrayUtil.trim(IASTExpression.class, expressions); + return ArrayUtil.trim(IASTExpression.class, expressions); } - public void addExpression(IASTExpression expression) { + @Override + public void addExpression(IASTExpression expression) { assertNotFrozen(); expressions = ArrayUtil.append(expressions, expression); if (expression != null) { @@ -144,8 +148,9 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi return implicitNames; } - public IASTImplicitName[] getImplicitNames() { - return (IASTImplicitName[])ArrayUtil.removeNulls(IASTImplicitName.class, computeImplicitNames()); + @Override + public IASTImplicitName[] getImplicitNames() { + return ArrayUtil.removeNulls(IASTImplicitName.class, computeImplicitNames()); } private ICPPFunction[] getOverloads() { @@ -187,7 +192,8 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi return overloads; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (expressions == null) return; for (int i = 0; i < expressions.length; ++i) { if (child == expressions[i]) { @@ -198,6 +204,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi } } + @Override public IType getExpressionType() { ICPPFunction[] overloads = getOverloads(); if (overloads.length > 0) { @@ -216,6 +223,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public ValueCategory getValueCategory() { ICPPFunction[] overloads = getOverloads(); if (overloads.length > 0) { @@ -233,6 +241,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi return PRVALUE; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java index 33089f6f1cc..538a1070851 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java @@ -32,10 +32,12 @@ public class CPPASTExpressionStatement extends ASTNode implements setExpression(expression); } + @Override public CPPASTExpressionStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTExpressionStatement copy(CopyStyle style) { CPPASTExpressionStatement copy = new CPPASTExpressionStatement(); copy.setExpression(expression == null ? null : expression.copy(style)); @@ -46,11 +48,13 @@ public class CPPASTExpressionStatement extends ASTNode implements return copy; } + @Override public IASTExpression getExpression() { return expression; } - public void setExpression(IASTExpression expression) { + @Override + public void setExpression(IASTExpression expression) { assertNotFrozen(); this.expression = expression; if (expression != null) { @@ -79,7 +83,8 @@ public class CPPASTExpressionStatement extends ASTNode implements return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == expression) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java index f8735fea823..6c0da203f24 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java @@ -54,11 +54,13 @@ public class CPPASTFieldDeclarator extends CPPASTDeclarator implements return copy; } + @Override public IASTExpression getBitFieldSize() { return bitField; } - public void setBitFieldSize(IASTExpression size) { + @Override + public void setBitFieldSize(IASTExpression size) { assertNotFrozen(); this.bitField = size; if (size != null) { @@ -75,7 +77,8 @@ public class CPPASTFieldDeclarator extends CPPASTDeclarator implements return super.postAccept(action); } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == bitField ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java index 7ca5e3f97f6..c55a50dd697 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java @@ -71,10 +71,12 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen setFieldOwner(owner); } + @Override public CPPASTFieldReference copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTFieldReference copy(CopyStyle style) { CPPASTFieldReference copy = new CPPASTFieldReference(); copy.setFieldName(name == null ? null : name.copy(style)); @@ -88,20 +90,24 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen return copy; } + @Override public boolean isTemplate() { return isTemplate; } - public void setIsTemplate(boolean value) { + @Override + public void setIsTemplate(boolean value) { assertNotFrozen(); isTemplate = value; } - public IASTExpression getFieldOwner() { + @Override + public IASTExpression getFieldOwner() { return owner; } - public void setFieldOwner(IASTExpression expression) { + @Override + public void setFieldOwner(IASTExpression expression) { assertNotFrozen(); owner = expression; if (expression != null) { @@ -110,11 +116,13 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen } } - public IASTName getFieldName() { + @Override + public IASTName getFieldName() { return name; } - public void setFieldName(IASTName name) { + @Override + public void setFieldName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -123,16 +131,19 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen } } - public boolean isPointerDereference() { + @Override + public boolean isPointerDereference() { return isDeref; } - public void setIsPointerDereference(boolean value) { + @Override + public void setIsPointerDereference(boolean value) { assertNotFrozen(); isDeref = value; } - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { if (!isDeref) return implicitNames = IASTImplicitName.EMPTY_NAME_ARRAY; @@ -193,13 +204,15 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen return true; } + @Override public int getRoleForName(IASTName n) { if (n == name) return r_reference; return r_unclear; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == owner) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); @@ -207,7 +220,8 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IASTName name= getFieldName(); IBinding binding = name.resolvePreBinding(); try { @@ -268,6 +282,7 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen } + @Override public ValueCategory getValueCategory() { IASTName name= getFieldName(); IBinding binding = name.resolvePreBinding(); @@ -291,10 +306,12 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen return PRVALUE; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); List filtered = new ArrayList(); @@ -312,6 +329,7 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen return filtered.toArray(new IBinding[filtered.size()]); } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } @@ -320,7 +338,8 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen * For a pointer dereference expression e1->e2, return the type that e1 ultimately evaluates to * after chaining overloaded class member access operators operator->() calls. */ - public IType getFieldOwnerType() { + @Override + public IType getFieldOwnerType() { return getFieldOwnerType(null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java index 2a76cd25f59..ca4c3e7b2bf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java @@ -53,10 +53,12 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, setBody(body); } - public CPPASTForStatement copy() { + @Override + public CPPASTForStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTForStatement copy(CopyStyle style) { CPPASTForStatement copy = new CPPASTForStatement(); copy.setInitializerStatement(init == null ? null : init.copy(style)); @@ -72,11 +74,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, return copy; } + @Override public IASTExpression getConditionExpression() { return condition; } - public void setConditionExpression(IASTExpression condition) { + @Override + public void setConditionExpression(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -86,11 +90,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public IASTExpression getIterationExpression() { + @Override + public IASTExpression getIterationExpression() { return iterationExpression; } - public void setIterationExpression(IASTExpression iterator) { + @Override + public void setIterationExpression(IASTExpression iterator) { assertNotFrozen(); this.iterationExpression = iterator; if (iterator != null) { @@ -99,11 +105,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public IASTStatement getBody() { + @Override + public IASTStatement getBody() { return body; } - public void setBody(IASTStatement statement) { + @Override + public void setBody(IASTStatement statement) { assertNotFrozen(); body = statement; if (statement != null) { @@ -112,7 +120,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public IScope getScope() { + @Override + public IScope getScope() { if (scope == null) scope = new CPPBlockScope(this); return scope; @@ -143,6 +152,7 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (body == child) { other.setPropertyInParent(child.getPropertyInParent()); @@ -165,11 +175,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public IASTStatement getInitializerStatement() { + @Override + public IASTStatement getInitializerStatement() { return init; } - public void setInitializerStatement(IASTStatement statement) { + @Override + public void setInitializerStatement(IASTStatement statement) { assertNotFrozen(); init = statement; if (statement != null) { @@ -178,7 +190,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public void setConditionDeclaration(IASTDeclaration d) { + @Override + public void setConditionDeclaration(IASTDeclaration d) { assertNotFrozen(); condDeclaration = d; if (d != null) { @@ -188,7 +201,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement, } } - public IASTDeclaration getConditionDeclaration() { + @Override + public IASTDeclaration getConditionDeclaration() { return condDeclaration; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java index 89a49353461..1dc12637de6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java @@ -66,10 +66,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements setArguments(args); } + @Override public CPPASTFunctionCallExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTFunctionCallExpression copy(CopyStyle style) { IASTInitializerClause[] args = null; if (fArguments.length > 0) { @@ -88,10 +90,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return copy; } - public IASTExpression getFunctionNameExpression() { + @Override + public IASTExpression getFunctionNameExpression() { return functionName; } + @Override public void setFunctionNameExpression(IASTExpression expression) { assertNotFrozen(); this.functionName = expression; @@ -101,11 +105,13 @@ public class CPPASTFunctionCallExpression extends ASTNode implements } } + @Override public IASTInitializerClause[] getArguments() { return fArguments; } - public void setArguments(IASTInitializerClause[] arguments) { + @Override + public void setArguments(IASTInitializerClause[] arguments) { assertNotFrozen(); if (arguments == null) { fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY; @@ -118,7 +124,8 @@ public class CPPASTFunctionCallExpression extends ASTNode implements } } - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPFunction overload = getOperator(); if (overload == null) @@ -206,6 +213,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == functionName) { other.setPropertyInParent(child.getPropertyInParent()); @@ -247,7 +255,8 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return overload; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { // Handle explicit type conversion in functional notation. IType t= isExplicitTypeConversion(); if (t != null) { @@ -290,10 +299,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return null; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } + @Override public ValueCategory getValueCategory() { if (isExplicitTypeConversion() != null) return PRVALUE; @@ -317,6 +328,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return ValueCategory.PRVALUE; } + @Override @Deprecated public IASTExpression getParameterExpression() { if (fArguments.length == 0) @@ -339,6 +351,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements return result; } + @Override @Deprecated public void setParameterExpression(IASTExpression expression) { assertNotFrozen(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java index c555f9d0c4c..8fde74f3faf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java @@ -69,7 +69,7 @@ public class CPPASTFunctionWithTryBlock extends CPPASTFunctionDefinition impleme public void addCatchHandler(ICPPASTCatchHandler statement) { assertNotFrozen(); if (statement != null) { - catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.append(ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement); + catchHandlers = ArrayUtil.appendAt(ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement); statement.setParent(this); statement.setPropertyInParent(CATCH_HANDLER); } @@ -78,7 +78,7 @@ public class CPPASTFunctionWithTryBlock extends CPPASTFunctionDefinition impleme @Override public ICPPASTCatchHandler[] getCatchHandlers() { if (catchHandlers == null) return ICPPASTCatchHandler.EMPTY_CATCHHANDLER_ARRAY; - catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.removeNullsAfter(ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos); + catchHandlers = ArrayUtil.trimAt(ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos); return catchHandlers; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java index c94ba46e218..e5fdfdfb9b1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java @@ -30,10 +30,12 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement { setName(name); } + @Override public CPPASTGotoStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTGotoStatement copy(CopyStyle style) { CPPASTGotoStatement copy = new CPPASTGotoStatement(name == null ? null : name.copy(style)); copy.setOffsetAndLength(this); @@ -43,11 +45,13 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement { return copy; } + @Override public IASTName getName() { return this.name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -77,6 +81,7 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement { return true; } + @Override public int getRoleForName(IASTName n) { if( name == n ) return r_reference; return r_unclear; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java index 2bf8610b171..0508e3df4a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java @@ -62,10 +62,12 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP setName(name); } + @Override public CPPASTIdExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTIdExpression copy(CopyStyle style) { CPPASTIdExpression copy = new CPPASTIdExpression(name == null ? null : name.copy()); copy.setOffsetAndLength(this); @@ -75,11 +77,13 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP return copy; } + @Override public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -110,11 +114,13 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP return true; } + @Override public int getRoleForName(IASTName n) { if (name == n) return r_reference; return r_unclear; } + @Override public IType getExpressionType() { IBinding binding = name.resolvePreBinding(); if (binding instanceof CPPFunctionSet) @@ -208,10 +214,12 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP return fTransformedExpression != null; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } + @Override public ValueCategory getValueCategory() { IBinding binding = name.resolvePreBinding(); if (checkForTransformation(binding)) { @@ -226,6 +234,7 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP return ValueCategory.PRVALUE; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { return CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); } @@ -235,6 +244,7 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP return name != null ? name.toString() : ""; //$NON-NLS-1$ } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java index 8231405c7ef..0ccfbb1d42e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java @@ -47,10 +47,12 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA setElseClause(elseClause); } - public CPPASTIfStatement copy() { + @Override + public CPPASTIfStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTIfStatement copy(CopyStyle style) { CPPASTIfStatement copy = new CPPASTIfStatement(); copy.setConditionDeclaration(condDecl == null ? null : condDecl.copy(style)); @@ -64,11 +66,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA return copy; } + @Override public IASTExpression getConditionExpression() { return condition; } - public void setConditionExpression(IASTExpression condition) { + @Override + public void setConditionExpression(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -78,11 +82,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA } } - public IASTStatement getThenClause() { + @Override + public IASTStatement getThenClause() { return thenClause; } - public void setThenClause(IASTStatement thenClause) { + @Override + public void setThenClause(IASTStatement thenClause) { assertNotFrozen(); this.thenClause = thenClause; if (thenClause != null) { @@ -91,11 +97,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA } } - public IASTStatement getElseClause() { + @Override + public IASTStatement getElseClause() { return elseClause; } - public void setElseClause(IASTStatement elseClause) { + @Override + public void setElseClause(IASTStatement elseClause) { assertNotFrozen(); this.elseClause = elseClause; if (elseClause != null) { @@ -162,6 +170,7 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (thenClause == child) { other.setParent(child.getParent()); @@ -180,11 +189,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA } } - public IASTDeclaration getConditionDeclaration() { + @Override + public IASTDeclaration getConditionDeclaration() { return condDecl; } - public void setConditionDeclaration(IASTDeclaration d) { + @Override + public void setConditionDeclaration(IASTDeclaration d) { assertNotFrozen(); condDecl = d; if (d != null) { @@ -194,6 +205,7 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA } } + @Override public IScope getScope() { if( scope == null ) scope = new CPPBlockScope( this ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java index 691e88ba554..165ea9a8835 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java @@ -48,6 +48,7 @@ public class CPPASTImplicitName extends CPPASTName implements IASTImplicitName { throw new UnsupportedOperationException(); } + @Override public boolean isAlternate() { return alternate; } @@ -128,6 +129,7 @@ public class CPPASTImplicitName extends CPPASTName implements IASTImplicitName { this.isOperator = isOperator; } + @Override public boolean isOperator() { return isOperator; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java index 52b420d917d..c1da21d6927 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java @@ -32,10 +32,12 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer private int actualSize; private boolean fIsPackExpansion; + @Override public CPPASTInitializerList copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTInitializerList copy(CopyStyle style) { CPPASTInitializerList copy = new CPPASTInitializerList(); for (IASTInitializerClause initializer : getClauses()) @@ -49,10 +51,12 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer return copy; } + @Override public int getSize() { return actualSize; } + @Override public IASTInitializerClause[] getClauses() { if (initializers == null) return IASTExpression.EMPTY_EXPRESSION_ARRAY; @@ -60,6 +64,7 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer return initializers; } + @Override @Deprecated public IASTInitializer[] getInitializers() { IASTInitializerClause[] clauses= getClauses(); @@ -81,16 +86,18 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer return inits; } + @Override public void addClause(IASTInitializerClause d) { assertNotFrozen(); if (d != null) { - initializers = (IASTInitializerClause[]) ArrayUtil.append( IASTInitializerClause.class, initializers, ++initializersPos, d ); + initializers = ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d ); d.setParent(this); d.setPropertyInParent(NESTED_INITIALIZER); } actualSize++; } + @Override @Deprecated public void addInitializer(IASTInitializer d) { assertNotFrozen(); @@ -124,15 +131,18 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer return true; } + @Override public boolean isPackExpansion() { return fIsPackExpansion; } + @Override public void setIsPackExpansion(boolean val) { assertNotFrozen(); fIsPackExpansion= val; } + @Override public void replace(IASTNode child, IASTNode other) { if (initializers != null) { for (int i = 0; i < initializers.length; ++i) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java index 8a520b62496..9d4af23a843 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java @@ -36,10 +36,12 @@ public class CPPASTLabelStatement extends ASTNode implements setNestedStatement(nestedStatement); } + @Override public CPPASTLabelStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTLabelStatement copy(CopyStyle style) { CPPASTLabelStatement copy = new CPPASTLabelStatement(); copy.setName(name == null ? null : name.copy(style)); @@ -51,11 +53,13 @@ public class CPPASTLabelStatement extends ASTNode implements return copy; } + @Override public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -86,16 +90,19 @@ public class CPPASTLabelStatement extends ASTNode implements return true; } + @Override public int getRoleForName(IASTName n) { if( n == name ) return r_declaration; return r_unclear; } - public IASTStatement getNestedStatement() { + @Override + public IASTStatement getNestedStatement() { return nestedStatement; } - public void setNestedStatement(IASTStatement s) { + @Override + public void setNestedStatement(IASTStatement s) { assertNotFrozen(); nestedStatement = s; if (s != null) { @@ -104,7 +111,8 @@ public class CPPASTLabelStatement extends ASTNode implements } } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == nestedStatement ) { other.setParent( this ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java index 5da8b25b7b5..ff0d4456a7f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java @@ -43,10 +43,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTExpression#copy() */ + @Override public CPPASTLambdaExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTLambdaExpression copy(CopyStyle style) { CPPASTLambdaExpression result = new CPPASTLambdaExpression(); result.fCaptureDefault = fCaptureDefault; @@ -71,10 +73,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr return result; } - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { return new IASTImplicitName[] {getFunctionCallOperatorName()}; } + @Override public IASTImplicitName getClosureTypeName() { if (fClosureTypeName == null) { final CPPClosureType closureType = getExpressionType(); @@ -88,6 +92,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr return fClosureTypeName; } + @Override public IASTImplicitName getFunctionCallOperatorName() { if (fImplicitFunctionCallName == null) { final CPPClosureType closureType = getExpressionType(); @@ -140,24 +145,29 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr return true; } + @Override public IASTCompoundStatement getBody() { return fBody; } + @Override public CaptureDefault getCaptureDefault() { return fCaptureDefault; } + @Override public ICPPASTCapture[] getCaptures() { if (fCaptures == null) return NO_CAPTURES; return fCaptures= ArrayUtil.trim(fCaptures); } + @Override public ICPPASTFunctionDeclarator getDeclarator() { return fDeclarator; } + @Override public void addCapture(ICPPASTCapture capture) { assertNotFrozen(); capture.setParent(this); @@ -169,6 +179,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr } } + @Override public void setBody(IASTCompoundStatement body) { assertNotFrozen(); body.setParent(this); @@ -176,10 +187,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr fBody= body; } + @Override public void setCaptureDefault(CaptureDefault value) { fCaptureDefault= value; } + @Override public void setDeclarator(ICPPASTFunctionDeclarator dtor) { assertNotFrozen(); dtor.setParent(this); @@ -187,6 +200,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr fDeclarator= dtor; } + @Override public CPPClosureType getExpressionType() { if (fClosureType == null) fClosureType= new CPPClosureType(this); @@ -194,10 +208,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr return fClosureType; } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java index 6ec8a895c92..7a5b2a3c690 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java @@ -37,10 +37,12 @@ public class CPPASTLinkageSpecification extends ASTNode implements this.fLiteral = literal; } + @Override public CPPASTLinkageSpecification copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTLinkageSpecification copy(CopyStyle style) { CPPASTLinkageSpecification copy = new CPPASTLinkageSpecification(fLiteral); for (IASTDeclaration declaration : getDeclarations()) @@ -52,24 +54,28 @@ public class CPPASTLinkageSpecification extends ASTNode implements return copy; } + @Override public String getLiteral() { return fLiteral; } - public void setLiteral(String value) { + @Override + public void setLiteral(String value) { assertNotFrozen(); this.fLiteral = value; } + @Override public final void addDeclaration(IASTDeclaration decl) { if (decl != null) { decl.setParent(this); decl.setPropertyInParent(OWNED_DECLARATION); - fAllDeclarations = (IASTDeclaration[]) ArrayUtil.append( IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl); + fAllDeclarations = ArrayUtil.appendAt( IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl); fActiveDeclarations= null; } } + @Override public final IASTDeclaration[] getDeclarations() { IASTDeclaration[] active= fActiveDeclarations; if (active == null) { @@ -79,9 +85,10 @@ public class CPPASTLinkageSpecification extends ASTNode implements return active; } + @Override public final IASTDeclaration[] getDeclarations(boolean includeInactive) { if (includeInactive) { - fAllDeclarations= (IASTDeclaration[]) ArrayUtil.removeNullsAfter(IASTDeclaration.class, fAllDeclarations, fLastDeclaration); + fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration); return fAllDeclarations; } return getDeclarations(); @@ -109,7 +116,8 @@ public class CPPASTLinkageSpecification extends ASTNode implements return true; } - public final void replace(IASTNode child, IASTNode other) { + @Override + public final void replace(IASTNode child, IASTNode other) { assert child.isActive() == other.isActive(); for (int i = 0; i <= fLastDeclaration; ++i) { if (fAllDeclarations[i] == child) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java index 54dd18bef60..2456a54e4fc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java @@ -111,7 +111,7 @@ public class CPPASTName extends CPPASTNameBase implements ICPPASTCompletionConte } } } - return (IBinding[])ArrayUtil.removeNulls(IBinding.class, bindings); + return ArrayUtil.removeNulls(IBinding.class, bindings); } return null; } @@ -142,7 +142,7 @@ public class CPPASTName extends CPPASTNameBase implements ICPPASTCompletionConte bindings[i]= null; } } - return (IBinding[])ArrayUtil.removeNulls(IBinding.class, bindings); + return ArrayUtil.removeNulls(IBinding.class, bindings); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java index deeaa049047..e95210e6519 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java @@ -40,10 +40,12 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements setName(name); } + @Override public CPPASTNamedTypeSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTNamedTypeSpecifier copy(CopyStyle style) { CPPASTNamedTypeSpecifier copy = new CPPASTNamedTypeSpecifier(name == null ? null : name.copy(style)); @@ -55,21 +57,25 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements return copy; } + @Override public boolean isTypename() { return typename; } - public void setIsTypename(boolean value) { + @Override + public void setIsTypename(boolean value) { assertNotFrozen(); typename = value; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -106,12 +112,14 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements return true; } + @Override public int getRoleForName(IASTName n) { if (n == name) return r_reference; return r_unclear; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); List filtered = new ArrayList(); @@ -129,6 +137,7 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements return filtered.toArray(new IBinding[filtered.size()]); } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java index ab4e44113a3..524fdf37ea8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java @@ -27,10 +27,12 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli setMappingName(qualifiedName); } + @Override public CPPASTNamespaceAlias copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTNamespaceAlias copy(CopyStyle style) { CPPASTNamespaceAlias copy = new CPPASTNamespaceAlias( alias == null ? null : alias.copy(style), @@ -42,11 +44,13 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli return copy; } + @Override public IASTName getAlias() { return alias; } - public void setAlias(IASTName name) { + @Override + public void setAlias(IASTName name) { assertNotFrozen(); this.alias = name; if (name != null) { @@ -55,11 +59,13 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli } } - public IASTName getMappingName() { + @Override + public IASTName getMappingName() { return qualifiedName; } - public void setMappingName(IASTName qualifiedName) { + @Override + public void setMappingName(IASTName qualifiedName) { assertNotFrozen(); this.qualifiedName = qualifiedName; if (qualifiedName != null) { @@ -91,6 +97,7 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli return true; } + @Override public int getRoleForName(IASTName n) { if (alias == n) return r_definition; if (qualifiedName == n) return r_reference; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java index e807f62daa3..718073ea8d8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java @@ -41,10 +41,12 @@ public class CPPASTNamespaceDefinition extends ASTNode setName(name); } + @Override public CPPASTNamespaceDefinition copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTNamespaceDefinition copy(CopyStyle style) { CPPASTNamespaceDefinition copy = new CPPASTNamespaceDefinition(fName == null ? null : fName.copy(style)); @@ -59,11 +61,13 @@ public class CPPASTNamespaceDefinition extends ASTNode return copy; } + @Override public IASTName getName() { return fName; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.fName = name; if (name != null) { @@ -72,24 +76,28 @@ public class CPPASTNamespaceDefinition extends ASTNode } } + @Override public void setIsInline(boolean isInline) { assertNotFrozen(); fIsInline= isInline; } + @Override public boolean isInline() { return fIsInline; } + @Override public final void addDeclaration(IASTDeclaration decl) { if (decl != null) { decl.setParent(this); decl.setPropertyInParent(OWNED_DECLARATION); - fAllDeclarations = (IASTDeclaration[]) ArrayUtil.append(IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl); + fAllDeclarations = ArrayUtil.appendAt(IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl); fActiveDeclarations= null; } } + @Override public final IASTDeclaration[] getDeclarations() { IASTDeclaration[] active= fActiveDeclarations; if (active == null) { @@ -99,15 +107,17 @@ public class CPPASTNamespaceDefinition extends ASTNode return active; } + @Override public final IASTDeclaration[] getDeclarations(boolean includeInactive) { if (includeInactive) { - fAllDeclarations= (IASTDeclaration[]) ArrayUtil.removeNullsAfter(IASTDeclaration.class, fAllDeclarations, fLastDeclaration); + fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration); return fAllDeclarations; } return getDeclarations(); } - public IScope getScope() { + @Override + public IScope getScope() { return ((ICPPNamespace) fName.resolveBinding()).getNamespaceScope(); } @@ -136,13 +146,15 @@ public class CPPASTNamespaceDefinition extends ASTNode return true; } + @Override public int getRoleForName(IASTName n) { if (fName == n) return r_definition; return r_unclear; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { assert child.isActive() == other.isActive(); for (int i = 0; i <= fLastDeclaration; ++i) { if (fAllDeclarations[i] == child) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java index 2e143721520..ef247f13265 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java @@ -59,10 +59,12 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression setInitializer(initializer); } + @Override public CPPASTNewExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTNewExpression copy(CopyStyle style) { CPPASTNewExpression copy = new CPPASTNewExpression(); copy.setIsGlobal(isGlobal); @@ -83,20 +85,24 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return copy; } + @Override public boolean isGlobal() { return isGlobal; } - public void setIsGlobal(boolean value) { + @Override + public void setIsGlobal(boolean value) { assertNotFrozen(); isGlobal = value; } - public IASTInitializerClause[] getPlacementArguments() { + @Override + public IASTInitializerClause[] getPlacementArguments() { return placement; } - public void setPlacementArguments(IASTInitializerClause[] args) { + @Override + public void setPlacementArguments(IASTInitializerClause[] args) { assertNotFrozen(); placement = args; if (args != null) { @@ -107,11 +113,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression } } - public IASTInitializer getInitializer() { + @Override + public IASTInitializer getInitializer() { return initializer; } - public void setInitializer(IASTInitializer expression) { + @Override + public void setInitializer(IASTInitializer expression) { assertNotFrozen(); initializer = expression; if (expression != null) { @@ -120,11 +128,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression } } - public IASTTypeId getTypeId() { + @Override + public IASTTypeId getTypeId() { return typeId; } - public void setTypeId(IASTTypeId typeId) { + @Override + public void setTypeId(IASTTypeId typeId) { assertNotFrozen(); this.typeId = typeId; if (typeId != null) { @@ -133,11 +143,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression } } - public boolean isNewTypeId() { + @Override + public boolean isNewTypeId() { return isNewTypeId; } - public void setIsNewTypeId(boolean value) { + @Override + public void setIsNewTypeId(boolean value) { assertNotFrozen(); isNewTypeId = value; } @@ -145,7 +157,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression /** * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames() */ - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPFunction operatorFunction = CPPSemantics.findOverloadedOperator(this); if (operatorFunction == null || operatorFunction instanceof CPPImplicitFunction) { @@ -166,6 +179,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression * Returns true if this expression is allocating an array. * @since 5.1 */ + @Override public boolean isArrayAllocation() { IASTTypeId typeId= getTypeId(); if (typeId != null) { @@ -216,6 +230,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (placement != null) { for (int i = 0; i < placement.length; ++i) { @@ -228,7 +243,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { IType t= CPPVisitor.createType(getTypeId()); if (t instanceof IArrayType) { t= ((IArrayType) t).getType(); @@ -236,14 +252,17 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return new CPPPointerType(t); } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return PRVALUE; } + @Override @Deprecated public IASTExpression[] getNewTypeIdArrayExpressions() { if (cachedArraySizes == null) { @@ -265,7 +284,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return cachedArraySizes; } - @Deprecated + @Override + @Deprecated public void addNewTypeIdArrayExpression(IASTExpression expression) { assertNotFrozen(); Assert.isNotNull(typeId); @@ -286,6 +306,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression ((IASTArrayDeclarator) dtor).addArrayModifier(mod); } + @Override @Deprecated public IASTExpression getNewPlacement() { if (placement == null || placement.length == 0) @@ -307,6 +328,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return result; } + @Override @Deprecated public void setNewPlacement(IASTExpression expression) { assertNotFrozen(); @@ -319,6 +341,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression } } + @Override @Deprecated public IASTExpression getNewInitializer() { if (initializer == null || initializer instanceof IASTExpression) { @@ -338,6 +361,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression return null; } + @Override @Deprecated public void setNewInitializer(IASTExpression expression) { assertNotFrozen(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java index 73458712b0c..c0799c22eae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java @@ -38,10 +38,12 @@ public class CPPASTNullStatement extends ASTNode implements IASTNullStatement { return true; } - public CPPASTNullStatement copy() { + @Override + public CPPASTNullStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTNullStatement copy(CopyStyle style) { CPPASTNullStatement copy = new CPPASTNullStatement(); copy.setOffsetAndLength(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java index 3907dd7ccd4..825d7631fa7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java @@ -31,6 +31,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac setPattern(pattern); } + @Override public void setPattern(IASTExpression pattern) { assertNotFrozen(); @@ -41,14 +42,17 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac } } + @Override public IASTExpression getPattern() { return fPattern; } + @Override public CPPASTPackExpansionExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTPackExpansionExpression copy(CopyStyle style) { CPPASTPackExpansionExpression copy = new CPPASTPackExpansionExpression(fPattern.copy(style)); copy.setOffsetAndLength(this); @@ -58,6 +62,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac return copy; } + @Override public IType getExpressionType() { final IType type = fPattern.getExpressionType(); if (type == null) @@ -66,10 +71,12 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac return new CPPParameterPackType(type); } + @Override public boolean isLValue() { return fPattern.isLValue(); } + @Override public ValueCategory getValueCategory() { return fPattern.getValueCategory(); } @@ -92,6 +99,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == fPattern) { other.setPropertyInParent(child.getPropertyInParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java index adbd9bc2d7e..f29967bd741 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java @@ -44,6 +44,7 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint return copy; } + @Override public void setName(IASTName name) { assertNotFrozen(); n = name; @@ -54,7 +55,8 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint } - public IASTName getName() { + @Override + public IASTName getName() { return n; } @@ -74,6 +76,7 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint return true; } + @Override public int getRoleForName(IASTName name ) { if( name == this.n ) return r_reference; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java index 827d0254a6f..8464ac526e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java @@ -28,10 +28,12 @@ public class CPPASTProblemDeclaration extends CPPASTProblemOwner implements IAST super(problem); } + @Override public CPPASTProblemDeclaration copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTProblemDeclaration copy(CopyStyle style) { CPPASTProblemDeclaration copy = new CPPASTProblemDeclaration(); copyBaseProblem(copy, style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java index ed15e0d26aa..556aeb2ea24 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java @@ -28,10 +28,12 @@ public class CPPASTProblemExpression extends CPPASTProblemOwner implements IASTP super(problem); } + @Override public CPPASTProblemExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTProblemExpression copy(CopyStyle style) { CPPASTProblemExpression copy = new CPPASTProblemExpression(); copyBaseProblem(copy, style); @@ -61,14 +63,17 @@ public class CPPASTProblemExpression extends CPPASTProblemOwner implements IASTP return true; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION); } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return ValueCategory.PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java index 40ceefd5ee1..34faea7268c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java @@ -36,11 +36,13 @@ abstract class CPPASTProblemOwner extends ASTNode implements IASTProblemHolder { copy.setOffsetAndLength(this); } + @Override public IASTProblem getProblem() { return problem; } - public void setProblem(IASTProblem p) { + @Override + public void setProblem(IASTProblem p) { assertNotFrozen(); problem = p; if (p != null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java index aa3f432a038..5e763e00830 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java @@ -28,10 +28,12 @@ public class CPPASTProblemStatement extends CPPASTProblemOwner implements IASTPr super(problem); } + @Override public CPPASTProblemStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTProblemStatement copy(CopyStyle style) { CPPASTProblemStatement copy = new CPPASTProblemStatement(); copyBaseProblem(copy, style); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java index 1d4f2dd61b3..ce13cbcab98 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java @@ -28,10 +28,12 @@ public class CPPASTProblemTypeId extends CPPASTProblemOwner implements IASTProbl super(problem); } + @Override public CPPASTProblemTypeId copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTProblemTypeId copy(CopyStyle style) { CPPASTProblemTypeId copy = new CPPASTProblemTypeId(); copyBaseProblem(copy, style); @@ -60,17 +62,21 @@ public class CPPASTProblemTypeId extends CPPASTProblemOwner implements IASTProbl return true; } + @Override public IASTDeclSpecifier getDeclSpecifier() { return null; } + @Override public void setDeclSpecifier(IASTDeclSpecifier declSpec) { } + @Override public IASTDeclarator getAbstractDeclarator() { return null; } + @Override public void setAbstractDeclarator(IASTDeclarator abstractDeclarator) { } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java index 40391f11ef0..68a6a9938aa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java @@ -63,10 +63,12 @@ public class CPPASTQualifiedName extends CPPASTNameBase public CPPASTQualifiedName() { } + @Override public CPPASTQualifiedName copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTQualifiedName copy(CopyStyle style) { CPPASTQualifiedName copy = new CPPASTQualifiedName(); for (IASTName name : getNames()) @@ -109,21 +111,23 @@ public class CPPASTQualifiedName extends CPPASTNameBase } + @Override public void addName(IASTName name) { assertNotFrozen(); assert !(name instanceof ICPPASTQualifiedName); if (name != null) { - names = (IASTName[]) ArrayUtil.append(IASTName.class, names, ++namesPos, name); + names = ArrayUtil.appendAt(IASTName.class, names, ++namesPos, name); name.setParent(this); name.setPropertyInParent(SEGMENT_NAME); } } + @Override public IASTName[] getNames() { if (namesPos < 0) return IASTName.EMPTY_NAME_ARRAY; - names = (IASTName[]) ArrayUtil.removeNullsAfter(IASTName.class, names, namesPos); + names = ArrayUtil.trimAt(IASTName.class, names, namesPos); return names; } @@ -135,14 +139,17 @@ public class CPPASTQualifiedName extends CPPASTNameBase return names[namesPos]; } + @Override public char[] getSimpleID() { return names[namesPos].getSimpleID(); } + @Override public char[] getLookupKey() { return names[namesPos].getLookupKey(); } + @Override public char[] toCharArray() { if (signature == null) { StringBuilder buf= new StringBuilder(); @@ -160,10 +167,12 @@ public class CPPASTQualifiedName extends CPPASTNameBase return signature; } + @Override public boolean isFullyQualified() { return isFullyQualified; } + @Override public void setFullyQualified(boolean isFullyQualified) { assertNotFrozen(); this.isFullyQualified = isFullyQualified; @@ -224,6 +233,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase return IASTNameOwner.r_unclear; } + @Override public int getRoleForName(IASTName n) { for (int i=0; i < namesPos; ++i) { if (names[i] == n) @@ -238,6 +248,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase return r_unclear; } + @Override public boolean isConversionOrOperator() { final IASTName lastName= getLastName(); if (lastName instanceof ICPPASTConversionName || lastName instanceof ICPPASTOperatorName) { @@ -255,6 +266,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase return false; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); @@ -348,6 +360,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase return null; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java index 2e959841e14..b4865d47f60 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java @@ -30,10 +30,12 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen setReturnArgument(retValue); } + @Override public CPPASTReturnStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTReturnStatement copy(CopyStyle style) { CPPASTReturnStatement copy = new CPPASTReturnStatement(retValue == null ? null : retValue.copy(style)); @@ -44,10 +46,12 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen return copy; } + @Override public IASTInitializerClause getReturnArgument() { return retValue; } + @Override public IASTExpression getReturnValue() { if (retValue instanceof IASTExpression) { return (IASTExpression) retValue; @@ -56,11 +60,13 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen } - public void setReturnValue(IASTExpression returnValue) { + @Override + public void setReturnValue(IASTExpression returnValue) { setReturnArgument(returnValue); } - public void setReturnArgument(IASTInitializerClause arg) { + @Override + public void setReturnArgument(IASTInitializerClause arg) { assertNotFrozen(); retValue = arg; if (arg != null) { @@ -94,7 +100,8 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == retValue) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java index 3ceeed83ac9..142990c2654 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java @@ -30,10 +30,12 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement private boolean isImaginary=false; private IASTExpression fDeclTypeExpression; - public CPPASTSimpleDeclSpecifier copy() { + @Override + public CPPASTSimpleDeclSpecifier copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTSimpleDeclSpecifier copy(CopyStyle style) { CPPASTSimpleDeclSpecifier copy = new CPPASTSimpleDeclSpecifier(); copySimpleDeclSpec(copy, style); @@ -61,16 +63,19 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement /** * @see org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier */ - public int getType() { + @Override + public int getType() { return type; } - public void setType(int type) { + @Override + public void setType(int type) { assertNotFrozen(); this.type = type; } - public void setType(Kind kind) { + @Override + public void setType(Kind kind) { setType(getType(kind)); } @@ -100,73 +105,89 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement return t_unspecified; } - public boolean isSigned() { + @Override + public boolean isSigned() { return isSigned; } - public boolean isUnsigned() { + @Override + public boolean isUnsigned() { return isUnsigned; } - public boolean isShort() { + @Override + public boolean isShort() { return isShort; } - public boolean isLong() { + @Override + public boolean isLong() { return isLong; } - public boolean isLongLong() { + @Override + public boolean isLongLong() { return isLonglong; } + @Override public boolean isComplex() { return isComplex; } + @Override public boolean isImaginary() { return isImaginary; } + @Override public IASTExpression getDeclTypeExpression() { return fDeclTypeExpression; } + @Override public void setSigned(boolean value) { assertNotFrozen(); isSigned = value; } - public void setUnsigned(boolean value) { + @Override + public void setUnsigned(boolean value) { assertNotFrozen(); isUnsigned = value; } - public void setLong(boolean value) { + @Override + public void setLong(boolean value) { assertNotFrozen(); isLong = value; } - public void setShort(boolean value) { + @Override + public void setShort(boolean value) { assertNotFrozen(); isShort = value; } - public void setLongLong(boolean value) { + @Override + public void setLongLong(boolean value) { assertNotFrozen(); isLonglong = value; } + @Override public void setComplex(boolean value) { assertNotFrozen(); isComplex = value; } + @Override public void setImaginary(boolean value) { assertNotFrozen(); isImaginary = value; } + @Override public void setDeclTypeExpression(IASTExpression expression) { assertNotFrozen(); fDeclTypeExpression = expression; @@ -199,6 +220,7 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (child == fDeclTypeExpression) { other.setPropertyInParent(child.getPropertyInParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java index e3ef9247c18..1a47bc44936 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java @@ -59,7 +59,7 @@ public class CPPASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclar public IASTDeclarator[] getDeclarators() { if (declarators == null) return IASTDeclarator.EMPTY_DECLARATOR_ARRAY; - declarators = (IASTDeclarator[]) ArrayUtil.removeNullsAfter(IASTDeclarator.class, declarators, declaratorsPos); + declarators = ArrayUtil.trimAt(IASTDeclarator.class, declarators, declaratorsPos); return declarators; } @@ -67,7 +67,7 @@ public class CPPASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclar public void addDeclarator(IASTDeclarator d) { assertNotFrozen(); if (d != null) { - declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, ++declaratorsPos, d); + declarators = ArrayUtil.appendAt(IASTDeclarator.class, declarators, ++declaratorsPos, d); d.setParent(this); d.setPropertyInParent(DECLARATOR); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java index 7b900ae9bea..3de4e3ef9c7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java @@ -40,10 +40,12 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements setInitializer(init); } + @Override public CPPASTSimpleTypeConstructorExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTSimpleTypeConstructorExpression copy(CopyStyle style) { CPPASTSimpleTypeConstructorExpression copy = new CPPASTSimpleTypeConstructorExpression(); copy.setDeclSpecifier(fDeclSpec == null ? null : fDeclSpec.copy(style)); @@ -55,14 +57,17 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements return copy; } + @Override public ICPPASTDeclSpecifier getDeclSpecifier() { return fDeclSpec; } + @Override public IASTInitializer getInitializer() { return fInitializer; } + @Override public void setDeclSpecifier(ICPPASTDeclSpecifier declSpec) { assertNotFrozen(); fDeclSpec = declSpec; @@ -72,6 +77,7 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements } } + @Override public void setInitializer(IASTInitializer initializer) { assertNotFrozen(); fInitializer = initializer; @@ -81,17 +87,20 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements } } - public IType getExpressionType() { + @Override + public IType getExpressionType() { if (fType == null) { fType= prvalueType(CPPVisitor.createType(fDeclSpec)); } return fType; } + @Override public boolean isLValue() { return false; } + @Override public ValueCategory getValueCategory() { return PRVALUE; } @@ -122,7 +131,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements return true; } - @Deprecated + @Override + @Deprecated public int getSimpleType() { IType type= getExpressionType(); if (type instanceof ICPPBasicType) { @@ -158,7 +168,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements return t_unspecified; } - @Deprecated + @Override + @Deprecated public void setSimpleType(int value) { CPPASTSimpleDeclSpecifier declspec = new CPPASTSimpleDeclSpecifier(); switch(value) { @@ -206,7 +217,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements setDeclSpecifier(declspec); } - @Deprecated + @Override + @Deprecated public IASTExpression getInitialValue() { if (fInitializer instanceof ICPPASTConstructorInitializer) { return ((ICPPASTConstructorInitializer) fInitializer).getExpression(); @@ -214,7 +226,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements return null; } - @Deprecated + @Override + @Deprecated public void setInitialValue(IASTExpression expression) { ICPPASTConstructorInitializer init= new CPPASTConstructorInitializer(); init.setExpression(expression); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java index f500530f862..9a49b0576c5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java @@ -36,10 +36,12 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS setDefaultType(typeId); } + @Override public CPPASTSimpleTypeTemplateParameter copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTSimpleTypeTemplateParameter copy(CopyStyle style) { CPPASTSimpleTypeTemplateParameter copy = new CPPASTSimpleTypeTemplateParameter(); copy.fUsesKeywordClass = fUsesKeywordClass; @@ -53,29 +55,35 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS return copy; } + @Override public boolean isParameterPack() { return fIsParameterPack; } + @Override public void setIsParameterPack(boolean val) { assertNotFrozen(); fIsParameterPack= val; } + @Override public int getParameterType() { return fUsesKeywordClass ? st_class : st_typename; } - public void setParameterType(int value) { + @Override + public void setParameterType(int value) { assertNotFrozen(); fUsesKeywordClass = value == st_class; } - public IASTName getName() { + @Override + public IASTName getName() { return fName; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.fName = name; if (name != null) { @@ -84,11 +92,13 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS } } - public IASTTypeId getDefaultType() { + @Override + public IASTTypeId getDefaultType() { return fTypeId; } - public void setDefaultType(IASTTypeId typeId) { + @Override + public void setDefaultType(IASTTypeId typeId) { assertNotFrozen(); this.fTypeId = typeId; if (typeId != null) { @@ -118,6 +128,7 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS return true; } + @Override public int getRoleForName(IASTName n) { if (n == fName) return r_declaration; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java index 6f2a8d8f461..fd3156c670f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java @@ -36,19 +36,23 @@ public class CPPASTStaticAssertionDeclaration extends ASTNode implements ICPPAST } } + @Override public IASTExpression getCondition() { return fCondition; } + @Override public ICPPASTLiteralExpression getMessage() { return fMessage; } + @Override public CPPASTStaticAssertionDeclaration copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTStaticAssertionDeclaration copy(CopyStyle style) { final IASTExpression condCopy = fCondition == null ? null : fCondition.copy(style); final ICPPASTLiteralExpression msgCopy = fMessage == null ? null : fMessage.copy(style); @@ -80,7 +84,8 @@ public class CPPASTStaticAssertionDeclaration extends ASTNode implements ICPPAST return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == fCondition) { fCondition= (IASTExpression) other; other.setParent(child.getParent()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java index 0b63cfc7854..85f983f029b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java @@ -44,10 +44,12 @@ public class CPPASTSwitchStatement extends ASTNode setBody(body); } - public CPPASTSwitchStatement copy() { + @Override + public CPPASTSwitchStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTSwitchStatement copy(CopyStyle style) { CPPASTSwitchStatement copy = new CPPASTSwitchStatement(); copy.setControllerDeclaration(controllerDeclaration == null ? @@ -62,11 +64,13 @@ public class CPPASTSwitchStatement extends ASTNode return copy; } + @Override public IASTExpression getControllerExpression() { return controllerExpression; } - public void setControllerExpression(IASTExpression controller) { + @Override + public void setControllerExpression(IASTExpression controller) { assertNotFrozen(); this.controllerExpression = controller; if (controller != null) { @@ -76,11 +80,13 @@ public class CPPASTSwitchStatement extends ASTNode } } - public IASTStatement getBody() { + @Override + public IASTStatement getBody() { return body; } - public void setBody(IASTStatement body) { + @Override + public void setBody(IASTStatement body) { assertNotFrozen(); this.body = body; if (body != null) { @@ -112,7 +118,8 @@ public class CPPASTSwitchStatement extends ASTNode return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (body == child) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); @@ -126,11 +133,13 @@ public class CPPASTSwitchStatement extends ASTNode } } - public IASTDeclaration getControllerDeclaration() { + @Override + public IASTDeclaration getControllerDeclaration() { return controllerDeclaration; } - public void setControllerDeclaration(IASTDeclaration d) { + @Override + public void setControllerDeclaration(IASTDeclaration d) { assertNotFrozen(); controllerDeclaration = d; if (d != null) { @@ -140,6 +149,7 @@ public class CPPASTSwitchStatement extends ASTNode } } + @Override public IScope getScope() { if (scope == null) scope = new CPPBlockScope(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java index 2d604599d65..4f31d51e060 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java @@ -89,7 +89,7 @@ public class CPPASTTemplateDeclaration extends ASTNode @Override public ICPPASTTemplateParameter[] getTemplateParameters() { if (parameters == null) return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY; - parameters = (ICPPASTTemplateParameter[]) ArrayUtil.removeNullsAfter(ICPPASTTemplateParameter.class, parameters, parametersPos); + parameters = ArrayUtil.trimAt(ICPPASTTemplateParameter.class, parameters, parametersPos); return parameters; } @@ -97,7 +97,7 @@ public class CPPASTTemplateDeclaration extends ASTNode public void addTemplateParameter(ICPPASTTemplateParameter parm) { assertNotFrozen(); if (parm != null) { - parameters = (ICPPASTTemplateParameter[]) ArrayUtil.append(ICPPASTTemplateParameter.class, parameters, ++parametersPos, parm); + parameters = ArrayUtil.appendAt(ICPPASTTemplateParameter.class, parameters, ++parametersPos, parm); parm.setParent(this); parm.setPropertyInParent(PARAMETER); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java index 44c7ab3c778..80941af6f40 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java @@ -48,10 +48,12 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI setTemplateName(templateName); } + @Override public CPPASTTemplateId copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTTemplateId copy(CopyStyle style) { CPPASTTemplateId copy = new CPPASTTemplateId(templateName == null ? null : templateName.copy(style)); @@ -64,19 +66,23 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI return copy; } + @Override public char[] getSimpleID() { return templateName.getSimpleID(); } + @Override public char[] getLookupKey() { return templateName.getLookupKey(); } + @Override public IASTName getTemplateName() { return templateName; } - public void setTemplateName(IASTName name) { + @Override + public void setTemplateName(IASTName name) { assertNotFrozen(); assert !(name instanceof ICPPASTQualifiedName) && !(name instanceof ICPPASTTemplateId); templateName = name; @@ -88,28 +94,32 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI private void internalAddTemplateArgument(IASTNode node) { assertNotFrozen(); - templateArguments = (IASTNode[]) ArrayUtil.append(IASTNode.class, templateArguments, node); + templateArguments = ArrayUtil.append(IASTNode.class, templateArguments, node); if (node != null) { node.setParent(this); node.setPropertyInParent(TEMPLATE_ID_ARGUMENT); } } - public void addTemplateArgument(IASTTypeId typeId) { + @Override + public void addTemplateArgument(IASTTypeId typeId) { internalAddTemplateArgument(typeId); } - public void addTemplateArgument(IASTExpression expression) { + @Override + public void addTemplateArgument(IASTExpression expression) { internalAddTemplateArgument(expression); } - public void addTemplateArgument(ICPPASTAmbiguousTemplateArgument ata) { + @Override + public void addTemplateArgument(ICPPASTAmbiguousTemplateArgument ata) { internalAddTemplateArgument(ata); } - public IASTNode[] getTemplateArguments() { + @Override + public IASTNode[] getTemplateArguments() { if (templateArguments == null) return ICPPASTTemplateId.EMPTY_ARG_ARRAY; - return (IASTNode[]) ArrayUtil.trim(IASTNode.class, templateArguments); + return ArrayUtil.trim(IASTNode.class, templateArguments); } @Override @@ -117,7 +127,8 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI return CPPTemplates.createBinding(this); } - public char[] toCharArray() { + @Override + public char[] toCharArray() { assert sAllowNameComputation; StringBuilder buf= new StringBuilder(); @@ -195,13 +206,15 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI return true; //for now this seems to be true } + @Override public int getRoleForName(IASTName n) { if (n == templateName) return r_reference; return r_unclear; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (templateArguments == null) return; for (int i = 0; i < templateArguments.length; ++i) { if (child == templateArguments[i]) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java index 84501177ac4..ceeca60f8a8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java @@ -40,10 +40,12 @@ public class CPPASTTemplateSpecialization extends ASTNode implements setDeclaration(declaration); } + @Override public CPPASTTemplateSpecialization copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTTemplateSpecialization copy(CopyStyle style) { CPPASTTemplateSpecialization copy = new CPPASTTemplateSpecialization(); copy.setDeclaration(declaration == null ? null : declaration.copy(style)); @@ -54,11 +56,13 @@ public class CPPASTTemplateSpecialization extends ASTNode implements return copy; } + @Override public IASTDeclaration getDeclaration() { return declaration; } - public void setDeclaration(IASTDeclaration declaration) { + @Override + public void setDeclaration(IASTDeclaration declaration) { assertNotFrozen(); this.declaration = declaration; if (declaration != null) { @@ -89,34 +93,41 @@ public class CPPASTTemplateSpecialization extends ASTNode implements return true; } + @Override public boolean isExported() { return false; } + @Override public void setExported(boolean value) { assertNotFrozen(); } + @Override public ICPPASTTemplateParameter[] getTemplateParameters() { return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY; } + @Override public void addTemplateParameter(ICPPASTTemplateParameter param) { assertNotFrozen(); } + @Override @Deprecated public void addTemplateParamter(ICPPASTTemplateParameter param) { addTemplateParameter(param); } + @Override public ICPPTemplateScope getScope() { if (templateScope == null) templateScope = new CPPTemplateScope(this); return templateScope; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (declaration == child) { other.setParent(child.getParent()); other.setPropertyInParent(child.getPropertyInParent()); @@ -124,6 +135,7 @@ public class CPPASTTemplateSpecialization extends ASTNode implements } } + @Override public short getNestingLevel() { if (nestingLevel == -1) { CPPTemplates.associateTemplateDeclarations(this); @@ -132,6 +144,7 @@ public class CPPASTTemplateSpecialization extends ASTNode implements return nestingLevel; } + @Override public boolean isAssociatedWithLastName() { if (isAssociatedWithLastName == -1) CPPTemplates.associateTemplateDeclarations(this); @@ -140,10 +153,12 @@ public class CPPASTTemplateSpecialization extends ASTNode implements return isAssociatedWithLastName != 0; } + @Override public void setAssociatedWithLastName(boolean value) { isAssociatedWithLastName= value ? (byte) 1 : (byte) 0; } + @Override public void setNestingLevel(short level) { assert level >= 0; nestingLevel= level; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java index dab0e9d2ee1..15c83b747e5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java @@ -42,10 +42,12 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements setDefaultValue(defaultValue); } + @Override public CPPASTTemplatedTypeTemplateParameter copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTTemplatedTypeTemplateParameter copy(CopyStyle style) { CPPASTTemplatedTypeTemplateParameter copy = new CPPASTTemplatedTypeTemplateParameter(); copy.setName(fName == null ? null : fName.copy(style)); @@ -60,22 +62,25 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements return copy; } + @Override public ICPPASTTemplateParameter[] getTemplateParameters() { if (fNestedParameters == null) return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY; - fNestedParameters = (ICPPASTTemplateParameter[]) ArrayUtil.trim(ICPPASTTemplateParameter.class, fNestedParameters); + fNestedParameters = ArrayUtil.trim(ICPPASTTemplateParameter.class, fNestedParameters); return fNestedParameters; } + @Override @Deprecated public void addTemplateParamter(ICPPASTTemplateParameter param) { addTemplateParameter(param); } + @Override public void addTemplateParameter(ICPPASTTemplateParameter param) { assertNotFrozen(); if (param != null) { - fNestedParameters = (ICPPASTTemplateParameter[]) ArrayUtil.append(ICPPASTTemplateParameter.class, + fNestedParameters = ArrayUtil.append(ICPPASTTemplateParameter.class, fNestedParameters, param); param.setParent(this); param.setPropertyInParent(PARAMETER); @@ -83,20 +88,24 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements } - public void setIsParameterPack(boolean val) { + @Override + public void setIsParameterPack(boolean val) { assertNotFrozen(); fIsParameterPack= val; } + @Override public boolean isParameterPack() { return fIsParameterPack; } + @Override public IASTName getName() { return fName; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.fName =name; if (name != null) { @@ -105,11 +114,13 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements } } - public IASTExpression getDefaultValue() { + @Override + public IASTExpression getDefaultValue() { return fDefaultValue; } - public void setDefaultValue(IASTExpression expression) { + @Override + public void setDefaultValue(IASTExpression expression) { assertNotFrozen(); this.fDefaultValue = expression; if (expression != null) { @@ -144,13 +155,15 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements return true; } + @Override public int getRoleForName(IASTName n) { if( n == fName ) return r_declaration; return r_unclear; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( child == fDefaultValue ) { other.setPropertyInParent( child.getPropertyInParent() ); @@ -159,6 +172,7 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements } } + @Override public ICPPScope asScope() { if (fScope == null) { fScope= new CPPTemplateTemplateParameterScope(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java index 35f0d416135..047dc89a429 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java @@ -128,7 +128,7 @@ public class CPPASTTranslationUnit extends ASTTranslationUnit implements ICPPAST names[i] = null; } // nulls can be anywhere, don't use trim() - return (IASTName[]) ArrayUtil.removeNulls(IASTName.class, names); + return ArrayUtil.removeNulls(IASTName.class, names); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java index b51237f549c..f41cb4312c5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java @@ -33,10 +33,12 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS setTryBody(tryBody); } + @Override public CPPASTTryBlockStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTTryBlockStatement copy(CopyStyle style) { CPPASTTryBlockStatement copy = new CPPASTTryBlockStatement(tryBody == null ? null : tryBody.copy(style)); @@ -49,19 +51,21 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS return copy; } + @Override public void addCatchHandler(ICPPASTCatchHandler statement) { assertNotFrozen(); if (statement != null) { - catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.append( ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement ); + catchHandlers = ArrayUtil.appendAt( ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement ); statement.setParent(this); statement.setPropertyInParent(CATCH_HANDLER); } } - public ICPPASTCatchHandler[] getCatchHandlers() { + @Override + public ICPPASTCatchHandler[] getCatchHandlers() { if( catchHandlers == null ) return ICPPASTCatchHandler.EMPTY_CATCHHANDLER_ARRAY; - catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.removeNullsAfter( ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos ); + catchHandlers = ArrayUtil.trimAt( ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos ); return catchHandlers; } @@ -70,7 +74,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS private int catchHandlersPos=-1; private IASTStatement tryBody; - public void setTryBody(IASTStatement tryBlock) { + @Override + public void setTryBody(IASTStatement tryBlock) { assertNotFrozen(); tryBody = tryBlock; if (tryBlock != null) { @@ -80,7 +85,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS } - public IASTStatement getTryBody() { + @Override + public IASTStatement getTryBody() { return tryBody; } @@ -110,7 +116,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if( tryBody == child ) { other.setPropertyInParent( child.getPropertyInParent() ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java index e21f50f95ff..94e2f84d37f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java @@ -33,10 +33,12 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr setTypeId(typeId); } + @Override public CPPASTTypeIdExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTTypeIdExpression copy(CopyStyle style) { CPPASTTypeIdExpression copy = new CPPASTTypeIdExpression(op, typeId == null ? null : typeId.copy(style)); @@ -47,16 +49,19 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr return copy; } + @Override public int getOperator() { return op; } - public void setOperator(int value) { + @Override + public void setOperator(int value) { assertNotFrozen(); this.op = value; } - public void setTypeId(IASTTypeId typeId) { + @Override + public void setTypeId(IASTTypeId typeId) { assertNotFrozen(); this.typeId = typeId; if (typeId != null) { @@ -65,7 +70,8 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr } } - public IASTTypeId getTypeId() { + @Override + public IASTTypeId getTypeId() { return typeId; } @@ -91,6 +97,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr return true; } + @Override public IType getExpressionType() { switch (getOperator()) { case op_sizeof: @@ -117,6 +124,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr return CPPVisitor.createType(getTypeId()); } + @Override public boolean isLValue() { switch (getOperator()) { case op_typeid: @@ -125,6 +133,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr return false; } + @Override public ValueCategory getValueCategory() { return isLValue() ? LVALUE : PRVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java index e54ddbc4b10..17edd3c2d88 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java @@ -31,16 +31,19 @@ public class CPPASTTypeIdInitializerExpression extends ASTTypeIdInitializerExpre super(typeId, initializer); } + @Override public IASTTypeIdInitializerExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public IASTTypeIdInitializerExpression copy(CopyStyle style) { CPPASTTypeIdInitializerExpression expr = new CPPASTTypeIdInitializerExpression(); initializeCopy(expr, style); return expr; } + @Override public IType getExpressionType() { final IASTTypeId typeId = getTypeId(); return prvalueType(CPPVisitor.createType(typeId.getAbstractDeclarator())); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java index 4046ed7eb19..ff1ade59140 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java @@ -50,13 +50,15 @@ public class CPPASTTypenameExpression extends CPPASTSimpleTypeConstructorExpress return copy; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { CPPASTNamedTypeSpecifier spec= new CPPASTNamedTypeSpecifier(name); spec.setOffsetAndLength(this); setDeclSpecifier(spec); } - public IASTName getName() { + @Override + public IASTName getName() { IASTDeclSpecifier spec= getDeclSpecifier(); if (spec instanceof ICPPASTNamedTypeSpecifier) { return ((ICPPASTNamedTypeSpecifier) spec).getName(); @@ -64,16 +66,19 @@ public class CPPASTTypenameExpression extends CPPASTSimpleTypeConstructorExpress return null; } + @Override public int getRoleForName(IASTName n) { if (n == getName()) return r_reference; return r_unclear; } + @Override @Deprecated public void setIsTemplate(boolean val) { } + @Override @Deprecated public boolean isTemplate() { return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java index 1905933da34..b8b983c5b38 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java @@ -62,10 +62,12 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres setOperand(operand); } + @Override public CPPASTUnaryExpression copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTUnaryExpression copy(CopyStyle style) { CPPASTUnaryExpression copy = new CPPASTUnaryExpression(op, operand == null ? null : operand.copy(style)); @@ -76,20 +78,24 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres return copy; } + @Override public int getOperator() { return op; } - public void setOperator(int operator) { + @Override + public void setOperator(int operator) { assertNotFrozen(); op = operator; } - public IASTExpression getOperand() { + @Override + public IASTExpression getOperand() { return operand; } - public void setOperand(IASTExpression expression) { + @Override + public void setOperand(IASTExpression expression) { assertNotFrozen(); operand = expression; if (expression != null) { @@ -105,7 +111,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres /** * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames() */ - public IASTImplicitName[] getImplicitNames() { + @Override + public IASTImplicitName[] getImplicitNames() { if (implicitNames == null) { ICPPFunction overload = getOverload(); if (overload == null || overload instanceof CPPImplicitFunction) { @@ -161,7 +168,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres return true; } - public void replace(IASTNode child, IASTNode other) { + @Override + public void replace(IASTNode child, IASTNode other) { if (child == operand) { other.setPropertyInParent(child.getPropertyInParent()); other.setParent(child.getParent()); @@ -211,7 +219,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres return null; } - public IType getExpressionType() { + @Override + public IType getExpressionType() { final int op= getOperator(); switch (op) { case op_sizeof: @@ -286,7 +295,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres return typeOfOperand; } - public ValueCategory getValueCategory() { + @Override + public ValueCategory getValueCategory() { final int op= getOperator(); switch (op) { case op_typeid: @@ -315,6 +325,7 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres return PRVALUE; } + @Override public boolean isLValue() { return getValueCategory() == LVALUE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java index 42da29c2247..f90cf8b82c2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java @@ -38,10 +38,12 @@ public class CPPASTUsingDeclaration extends ASTNode setName(name); } + @Override public CPPASTUsingDeclaration copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTUsingDeclaration copy(CopyStyle style) { CPPASTUsingDeclaration copy = new CPPASTUsingDeclaration(name == null ? null : name.copy(style)); @@ -53,20 +55,24 @@ public class CPPASTUsingDeclaration extends ASTNode return copy; } + @Override public void setIsTypename(boolean value) { assertNotFrozen(); this.typeName = value; } - public boolean isTypename() { + @Override + public boolean isTypename() { return typeName; } - public IASTName getName() { + @Override + public IASTName getName() { return name; } - public void setName(IASTName name) { + @Override + public void setName(IASTName name) { assertNotFrozen(); this.name = name; if (name != null) { @@ -97,12 +103,14 @@ public class CPPASTUsingDeclaration extends ASTNode return true; } + @Override public int getRoleForName(IASTName n) { if (n == name) return r_declaration; return r_unclear; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); List filtered = new ArrayList(); @@ -121,6 +129,7 @@ public class CPPASTUsingDeclaration extends ASTNode return name.toString(); } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java index 0ef0d20e50d..cc6cbb3f92e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java @@ -36,10 +36,12 @@ public class CPPASTUsingDirective extends ASTNode implements setQualifiedName(name); } + @Override public CPPASTUsingDirective copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTUsingDirective copy(CopyStyle style) { CPPASTUsingDirective copy = new CPPASTUsingDirective(name == null ? null : name.copy(style)); copy.setOffsetAndLength(this); @@ -49,11 +51,13 @@ public class CPPASTUsingDirective extends ASTNode implements return copy; } + @Override public IASTName getQualifiedName() { return name; } - public void setQualifiedName(IASTName qualifiedName) { + @Override + public void setQualifiedName(IASTName qualifiedName) { assertNotFrozen(); this.name = qualifiedName; if (qualifiedName != null) { @@ -86,12 +90,14 @@ public class CPPASTUsingDirective extends ASTNode implements } + @Override public int getRoleForName(IASTName n) { if( n == name ) return r_reference; return r_unclear; } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) { IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces); List filtered = new ArrayList(); @@ -105,6 +111,7 @@ public class CPPASTUsingDirective extends ASTNode implements return filtered.toArray(new IBinding[filtered.size()]); } + @Override public IBinding[] findBindings(IASTName n, boolean isPrefix) { return findBindings(n, isPrefix, null); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java index de7af9f7dbe..d9847a9dfaa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java @@ -29,10 +29,12 @@ public class CPPASTVisibilityLabel extends ASTNode implements ICPPASTVisibilityL this.visibility = visibility; } + @Override public CPPASTVisibilityLabel copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTVisibilityLabel copy(CopyStyle style) { CPPASTVisibilityLabel copy = new CPPASTVisibilityLabel(visibility); copy.setOffsetAndLength(this); @@ -42,11 +44,13 @@ public class CPPASTVisibilityLabel extends ASTNode implements ICPPASTVisibilityL return copy; } + @Override public int getVisibility() { return visibility; } - public void setVisibility(int visibility) { + @Override + public void setVisibility(int visibility) { assertNotFrozen(); this.visibility = visibility; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java index b28b6fc5169..96fb06b9267 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java @@ -44,10 +44,12 @@ public class CPPASTWhileStatement extends ASTNode setBody(body); } - public CPPASTWhileStatement copy() { + @Override + public CPPASTWhileStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTWhileStatement copy(CopyStyle style) { CPPASTWhileStatement copy = new CPPASTWhileStatement(); copy.setConditionDeclaration(condition2 == null ? null : condition2.copy(style)); @@ -60,11 +62,13 @@ public class CPPASTWhileStatement extends ASTNode return copy; } + @Override public IASTExpression getCondition() { return condition; } - public void setCondition(IASTExpression condition) { + @Override + public void setCondition(IASTExpression condition) { assertNotFrozen(); this.condition = condition; if (condition != null) { @@ -74,11 +78,13 @@ public class CPPASTWhileStatement extends ASTNode } } - public IASTStatement getBody() { + @Override + public IASTStatement getBody() { return body; } - public void setBody(IASTStatement body) { + @Override + public void setBody(IASTStatement body) { assertNotFrozen(); this.body = body; if (body != null) { @@ -87,10 +93,12 @@ public class CPPASTWhileStatement extends ASTNode } } + @Override public IASTDeclaration getConditionDeclaration() { return condition2; } + @Override public void setConditionDeclaration(IASTDeclaration declaration) { assertNotFrozen(); condition2 = declaration; @@ -124,6 +132,7 @@ public class CPPASTWhileStatement extends ASTNode return true; } + @Override public void replace(IASTNode child, IASTNode other) { if (body == child) { other.setPropertyInParent(child.getPropertyInParent()); @@ -139,6 +148,7 @@ public class CPPASTWhileStatement extends ASTNode } } + @Override public IScope getScope() { if (scope == null) scope = new CPPBlockScope(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java index 91f033144aa..52d9d8e6892 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java @@ -39,16 +39,19 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy setType(type); } - public IType getType() { + @Override + public IType getType() { return type; } - public void setType(IType t) { + @Override + public void setType(IType t) { assert t != null; this.type = t; } - public boolean isSameType(IType obj) { + @Override + public boolean isSameType(IType obj) { if (obj == this) return true; if (obj instanceof ITypedef) @@ -72,7 +75,8 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy return false; } - public IValue getSize() { + @Override + public IValue getSize() { if (value != Value.NOT_INITIALIZED) return value; @@ -82,7 +86,8 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy return value= Value.create(sizeExpression, Value.MAX_RECURSION_DEPTH); } - @Deprecated + @Override + @Deprecated public IASTExpression getArraySizeExpression() { return sizeExpression; } @@ -103,6 +108,7 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { final byte firstByte = ITypeMarshalBuffer.ARRAY; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java index 5304995672b..7963c9d8979 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java @@ -37,7 +37,8 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#getBaseClass() */ - public IBinding getBaseClass() { + @Override + public IBinding getBaseClass() { if (baseClass == null) { IBinding b = base.getName().resolveBinding(); if (b instanceof IProblemBinding) { @@ -60,7 +61,8 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#getVisibility() */ - public int getVisibility() { + @Override + public int getVisibility() { int vis = base.getVisibility(); if (vis == 0) { @@ -77,14 +79,17 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#isVirtual() */ - public boolean isVirtual() { + @Override + public boolean isVirtual() { return base.isVirtual(); } + @Override public void setBaseClass(IBinding cls) { baseClass = cls; } + @Override public IName getBaseClassSpecifierName() { return base.getName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java index 3e993262cad..1a96060d666 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java @@ -97,6 +97,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { } } + @Override public boolean isSameType(IType object) { if (object == this) return true; @@ -118,34 +119,42 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { return fModifiers == t.getModifiers(); } + @Override public Kind getKind() { return fKind; } + @Override public boolean isSigned() { return (fModifiers & IS_SIGNED) != 0; } + @Override public boolean isUnsigned() { return (fModifiers & IS_UNSIGNED) != 0; } + @Override public boolean isShort() { return (fModifiers & IS_SHORT) != 0; } + @Override public boolean isLong() { return (fModifiers & IS_LONG) != 0; } + @Override public boolean isLongLong() { return (fModifiers & IS_LONG_LONG) != 0; } + @Override public boolean isComplex() { return (fModifiers & IS_COMPLEX) != 0; } + @Override public boolean isImaginary() { return (fModifiers & IS_IMAGINARY) != 0; } @@ -172,6 +181,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { return fExpression; } + @Override public int getModifiers() { return fModifiers; } @@ -181,6 +191,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { final int kind= getKind().ordinal(); final int shiftedKind= kind * ITypeMarshalBuffer.FLAG1; @@ -207,11 +218,13 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { return new CPPBasicType(Kind.values()[kind], modifiers); } + @Override @Deprecated public int getQualifierBits() { return getModifiers(); } + @Override @Deprecated public int getType() { switch (fKind) { @@ -240,6 +253,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { /** * @deprecated types don't have values */ + @Override @Deprecated public IASTExpression getValue() { return fExpression; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java index 985117457bc..f1f9c2e2c9c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java @@ -40,74 +40,92 @@ public class CPPBuiltinParameter extends PlatformObject implements ICPPParameter this.type = type; } - public IType getType() { + @Override + public IType getType() { return type; } - public boolean isStatic() { + @Override + public boolean isStatic() { return false; } - public boolean isExtern() { + @Override + public boolean isExtern() { return false; } + @Override public boolean isExternC() { return false; } - public boolean isAuto() { + @Override + public boolean isAuto() { return false; } - public boolean isRegister() { + @Override + public boolean isRegister() { return false; } - public String getName() { + @Override + public String getName() { return ""; //$NON-NLS-1$ } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return CharArrayUtils.EMPTY; } - public IScope getScope() { + @Override + public IScope getScope() { return null; } - public boolean hasDefaultValue() { + @Override + public boolean hasDefaultValue() { return false; } - public boolean isMutable() { + @Override + public boolean isMutable() { return false; } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return new String[0]; } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return new char[0][]; } - public boolean isGloballyQualified() { + @Override + public boolean isGloballyQualified() { return false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding getOwner() { return null; } + @Override public IValue getInitialValue() { return null; } + @Override public boolean isParameterPack() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java index 9385af855e6..06b679f4c7b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java @@ -38,10 +38,12 @@ public class CPPClassInstance extends CPPClassSpecialization implements ICPPTemp this.arguments= args; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return (ICPPTemplateDefinition) getSpecializedBinding(); } + @Override public ICPPTemplateArgument[] getTemplateArguments() { return arguments; } @@ -57,10 +59,12 @@ public class CPPClassInstance extends CPPClassSpecialization implements ICPPTemp return super.getSpecializationScope(); } + @Override public boolean isExplicitSpecialization() { return !(getCompositeScope() instanceof ICPPClassSpecializationScope); } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java index 6d9718665e8..b325b1a406a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java @@ -249,16 +249,16 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope { if ((!prefixLookup && CharArrayUtils.equals(c, compName.getLookupKey())) || (prefixLookup && ContentAssistMatcherFactory.getInstance().match(c, compName.getLookupKey()))) { if (shallReturnConstructors(name, prefixLookup)) { - result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, getConstructors(name, resolve)); + result = ArrayUtil.addAll(IBinding.class, result, getConstructors(name, resolve)); } //9.2 ... The class-name is also inserted into the scope of the class itself - result = (IBinding[]) ArrayUtil.append(IBinding.class, result, compName.resolveBinding()); + result = ArrayUtil.append(IBinding.class, result, compName.resolveBinding()); if (!prefixLookup) - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } - result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, + result = ArrayUtil.addAll(IBinding.class, result, super.getBindings(name, resolve, prefixLookup, fileSet, checkPointOfDecl)); - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } static protected boolean shouldResolve(boolean force, IASTName candidate, IASTName forName) { @@ -295,7 +295,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope { IASTName n = (IASTName) obj; binding = shouldResolve(forceResolve, n, forName) ? n.resolveBinding() : n.getBinding(); if (binding instanceof ICPPConstructor) { - bs = (IBinding[]) ArrayUtil.append(ICPPConstructor.class, bs, binding); + bs = ArrayUtil.append(ICPPConstructor.class, bs, binding); } } else if (obj instanceof ICPPConstructor) { bs = (IBinding[]) ArrayUtil.append(ICPPConstructor.class, bs, obj); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java index 53a3453f8be..38fd986516f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java @@ -54,6 +54,7 @@ public class CPPClassSpecialization extends CPPSpecialization return (ICPPClassType) super.getSpecializedBinding(); } + @Override public IBinding specializeMember(IBinding original) { synchronized(this) { IBinding result= (IBinding) specializationMap.get(original); @@ -73,10 +74,12 @@ public class CPPClassSpecialization extends CPPSpecialization } } + @Override public void checkForDefinition() { // Ambiguity resolution ensures that declarations and definitions are resolved. } + @Override public ICPPASTCompositeTypeSpecifier getCompositeTypeSpecifier() { IASTNode definition= getDefinition(); if (definition != null) { @@ -89,6 +92,7 @@ public class CPPClassSpecialization extends CPPSpecialization return null; } + @Override public ICPPBase[] getBases() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -97,6 +101,7 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getBases(); } + @Override public ICPPField[] getDeclaredFields() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -105,6 +110,7 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getDeclaredFields(); } + @Override public ICPPMethod[] getDeclaredMethods() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -113,6 +119,7 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getDeclaredMethods(); } + @Override public ICPPConstructor[] getConstructors() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -121,6 +128,7 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getConstructors(); } + @Override public IBinding[] getFriends() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -129,6 +137,7 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getFriends(); } + @Override public ICPPClassType[] getNestedClasses() { ICPPClassSpecializationScope scope= getSpecializationScope(); if (scope == null) @@ -137,18 +146,22 @@ public class CPPClassSpecialization extends CPPSpecialization return scope.getNestedClasses(); } + @Override public IField[] getFields() { return ClassTypeHelper.getFields(this); } + @Override public IField findField(String name) { return ClassTypeHelper.findField(this, name); } + @Override public ICPPMethod[] getMethods() { return ClassTypeHelper.getMethods(this); } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ClassTypeHelper.getAllDeclaredMethods(this); } @@ -156,6 +169,7 @@ public class CPPClassSpecialization extends CPPSpecialization /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getKey() */ + @Override public int getKey() { if (getDefinition() != null) return getCompositeTypeSpecifier().getKey(); @@ -166,6 +180,7 @@ public class CPPClassSpecialization extends CPPSpecialization /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getCompositeScope() */ + @Override public ICPPClassScope getCompositeScope() { final ICPPClassScope specScope= getSpecializationScope(); if (specScope != null) @@ -193,6 +208,7 @@ public class CPPClassSpecialization extends CPPSpecialization /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) */ + @Override public boolean isSameType(IType type) { if (type == this) return true; @@ -211,6 +227,7 @@ public class CPPClassSpecialization extends CPPSpecialization return this; } + @Override public boolean isAnonymous() { if (getNameCharArray().length > 0) return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java index dbf7c43a78b..03a10702570 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java @@ -61,7 +61,7 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements ICPPClass @Override public void addPartialSpecialization(ICPPClassTemplatePartialSpecialization spec) { - partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.append( + partialSpecializations = ArrayUtil.append( ICPPClassTemplatePartialSpecialization.class, partialSpecializations, spec); } @@ -139,7 +139,7 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements ICPPClass } } } - partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.trim(ICPPClassTemplatePartialSpecialization.class, partialSpecializations); + partialSpecializations = ArrayUtil.trim(ICPPClassTemplatePartialSpecialization.class, partialSpecializations); return partialSpecializations; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java index fb2ff50d687..600d625863b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java @@ -39,6 +39,7 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate super(name); } + @Override public ICPPTemplateArgument[] getTemplateArguments() throws DOMException { if (arguments == null) { arguments= CPPTemplates.createTemplateArgumentArray((ICPPASTTemplateId) getTemplateName()); @@ -49,15 +50,18 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization#getPrimaryClassTemplate() */ + @Override public ICPPClassTemplate getPrimaryClassTemplate() { ICPPASTTemplateId id = (ICPPASTTemplateId) getTemplateName(); return (ICPPClassTemplate) id.getTemplateName().resolveBinding(); } + @Override public IBinding getSpecializedBinding() { return getPrimaryClassTemplate(); } + @Override public ICPPTemplateParameterMap getTemplateParameterMap() { try { return CPPTemplates.createParameterMap(getPrimaryClassTemplate(), getTemplateArguments()); @@ -80,11 +84,13 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate } } + @Override @Deprecated public ObjectMap getArgumentMap() { return CPPTemplates.getArgumentMap(getPrimaryClassTemplate(), getTemplateParameterMap()); } + @Override @Deprecated public IType[] getArguments() throws DOMException { return CPPTemplates.getArguments(getTemplateArguments()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java index 3cdf86e5091..08dfc43baae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java @@ -57,39 +57,51 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp public CPPClassTypeProblem(IASTNode node, int id, char[] arg) { super(node, id, arg); } + @Override public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } + @Override public IField[] getFields() { return IField.EMPTY_FIELD_ARRAY; } + @Override public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } + @Override public ICPPMethod[] getMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } + @Override public int getKey() { return k_class; } + @Override public IField findField(String name) { return null; } + @Override public IScope getCompositeScope() { return this; } + @Override public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } @@ -119,14 +131,17 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp } } + @Override public IASTNode[] getDeclarations() { return declarations; } + @Override public IASTNode getDefinition() { return definition; } + @Override public void checkForDefinition() { // Ambiguity resolution ensures that definitions are resolved. if (!checked) { @@ -140,6 +155,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp } } + @Override public ICPPASTCompositeTypeSpecifier getCompositeTypeSpecifier() { if (definition != null) { IASTNode node = definition; @@ -162,14 +178,17 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return null; } + @Override public final String getName() { return new String(getNameCharArray()); } + @Override public char[] getNameCharArray() { return (definition != null) ? definition.getSimpleID() : declarations[0].getSimpleID(); } + @Override public IScope getScope() { IASTName name = definition != null ? definition : declarations[0]; @@ -191,6 +210,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return scope; } + @Override public ICPPClassScope getCompositeScope() { checkForDefinition(); if (definition != null) { @@ -209,6 +229,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return definition != null ? (IASTNode) definition : declarations[0]; } + @Override public int getKey() { if (definition != null) return getCompositeTypeSpecifier().getKey(); @@ -216,6 +237,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return getElaboratedTypeSpecifier().getKind(); } + @Override public void addDefinition(IASTNode node) { if (node instanceof ICPPASTCompositeTypeSpecifier) { definition = ((ICPPASTCompositeTypeSpecifier)node).getName(); @@ -224,6 +246,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp } } + @Override public void addDeclaration(IASTNode node) { if (node instanceof ICPPASTElaboratedTypeSpecifier) { IASTName name = ((ICPPASTElaboratedTypeSpecifier) node).getName(); @@ -235,23 +258,26 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp // Keep the lowest offset declaration in [0] if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode) declarations[0]).getOffset()) { - declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name); + declarations = ArrayUtil.prepend(IASTName.class, declarations, name); } else { - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name); + declarations = ArrayUtil.append(IASTName.class, declarations, name); } } else { assert false; } } + @Override public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } + @Override public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } + @Override public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while (scope != null) { @@ -262,10 +288,12 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return true; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public boolean isSameType(IType type) { if (type == this) return true; @@ -274,42 +302,52 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return false; } + @Override public ICPPBase[] getBases() { return ClassTypeHelper.getBases(this); } + @Override public IField[] getFields() { return ClassTypeHelper.getFields(this); } + @Override public ICPPField[] getDeclaredFields() { return ClassTypeHelper.getDeclaredFields(this); } + @Override public ICPPMethod[] getMethods() { return ClassTypeHelper.getMethods(this); } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ClassTypeHelper.getAllDeclaredMethods(this); } + @Override public ICPPMethod[] getDeclaredMethods() { return ClassTypeHelper.getDeclaredMethods(this); } + @Override public ICPPConstructor[] getConstructors() { return ClassTypeHelper.getConstructors(this); } + @Override public IBinding[] getFriends() { return ClassTypeHelper.getFriends(this); } + @Override public ICPPClassType[] getNestedClasses() { return ClassTypeHelper.getNestedClasses(this); } + @Override public IField findField(String name) { return ClassTypeHelper.findField(this, name); } @@ -331,6 +369,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return getName(); } + @Override public IBinding getOwner() { if (definition != null) { return CPPVisitor.findNameOwner(definition, true); @@ -338,6 +377,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp return CPPVisitor.findDeclarationOwner(declarations[0], true); } + @Override public boolean isAnonymous() { if (getNameCharArray().length > 0) return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java index 7a702e36aa8..5b544f74265 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java @@ -171,18 +171,22 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return IType.EMPTY_TYPE_ARRAY; } + @Override public final String getName() { return ""; //$NON-NLS-1$ } + @Override public char[] getNameCharArray() { return CharArrayUtils.EMPTY; } + @Override public IScope getScope() { return CPPVisitor.getContainingScope(fLambdaExpression); } + @Override public ICPPClassScope getCompositeScope() { if (fScope == null) { fScope= new ClassScope(); @@ -190,26 +194,32 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return fScope; } + @Override public int getKey() { return k_class; } + @Override public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } + @Override public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } + @Override public boolean isGloballyQualified() { return getOwner() == null; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public boolean isSameType(IType type) { if (type == this) return true; @@ -218,18 +228,22 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return false; } + @Override public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } + @Override public ICPPField[] getFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } + @Override public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } + @Override public ICPPMethod[] getMethods() { if (fMethods == null) { fMethods= createMethods(); @@ -237,14 +251,17 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return fMethods; } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPConstructor[] getConstructors() { ICPPMethod[] methods= getMethods(); int i= 0; @@ -258,14 +275,17 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return result; } + @Override public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } + @Override public IField findField(String name) { return null; } @@ -290,38 +310,47 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return null; } + @Override public IBinding getOwner() { return CPPVisitor.findDeclarationOwner(fLambdaExpression, true); } + @Override public boolean isAnonymous() { return false; } + @Override public IASTNode getDefinition() { return fLambdaExpression; } + @Override public IASTNode[] getDeclarations() { return IASTNode.EMPTY_NODE_ARRAY; } + @Override public void addDefinition(IASTNode node) { } + @Override public void addDeclaration(IASTNode node) { } private final class ClassScope implements ICPPClassScope { + @Override public EScopeKind getKind() { return EScopeKind.eClassType; } + @Override public IName getScopeName() { return null; } + @Override public IScope getParent() { return getScope(); } @@ -356,20 +385,24 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return result.toArray(new IBinding[result.size()]); } + @Override public IBinding[] find(String name) { return getBindings(name.toCharArray()); } + @Override public IBinding getBinding(IASTName name, boolean resolve) { if (name instanceof ICPPASTTemplateId) return null; return getBinding(name.getSimpleID()); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet acceptLocalBindings) { return getBinding(name, resolve); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) { if (name instanceof ICPPASTTemplateId) return IBinding.EMPTY_BINDING_ARRAY; @@ -379,19 +412,23 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP return getBindings(name.getSimpleID()); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet acceptLocalBindings) { return getBindings(name, resolve, prefixLookup); } + @Override public ICPPClassType getClassType() { return CPPClosureType.this; } + @Override public ICPPMethod[] getImplicitMethods() { return getMethods(); } + @Override public ICPPConstructor[] getConstructors() { return CPPClosureType.this.getConstructors(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPCompositeBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPCompositeBinding.java index c0b20a6eca3..dfa4381fac4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPCompositeBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPCompositeBinding.java @@ -21,54 +21,42 @@ import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; public class CPPCompositeBinding extends PlatformObject implements IBinding { + IBinding[] bindings; - IBinding [] bindings = null; - - public CPPCompositeBinding( IBinding[] bindingList ){ - bindings = (IBinding[]) ArrayUtil.trim( IBinding.class, bindingList, true ); + public CPPCompositeBinding(IBinding[] bindingList) { + bindings = ArrayUtil.trim(bindingList, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() - */ + @Override public String getName() { return bindings[0].getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() - */ + @Override public char[] getNameCharArray() { return bindings[0].getNameCharArray(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() - */ + @Override public IScope getScope() throws DOMException { return bindings[0].getScope(); } + @Override public IBinding getOwner() { return bindings[0].getOwner(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getPhysicalNode() - */ public IASTNode getPhysicalNode() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPCompositeBinding#getBindings() - */ public IBinding[] getBindings() { return bindings; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } - } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java index dfc6f059114..5fa4b795365 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java @@ -53,10 +53,12 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef return fClassTemplate.getOwner(); } + @Override public ICPPClassTemplate getClassTemplate() { return (ICPPClassTemplate) getSpecializedBinding(); } + @Override public boolean isExplicitSpecialization() { return false; } @@ -92,23 +94,28 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef return getClassTemplate().getKey(); } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); } + @Override public ICPPTemplateArgument[] getTemplateArguments() { return fArguments; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return fClassTemplate; } + @Override public ObjectMap getArgumentMap() { return ObjectMap.EMPTY_MAP; } + @Override public CPPTemplateParameterMap getTemplateParameterMap() { ICPPTemplateParameter[] params = fClassTemplate.getTemplateParameters(); int size = Math.min(fArguments.length, params.length); @@ -119,6 +126,7 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef return map; } + @Override public IBinding getSpecializedBinding() { return getTemplateDefinition(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java index db69723d23a..c176ea88493 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java @@ -22,6 +22,7 @@ public class CPPEnumScope extends CPPScope { super(specifier); } + @Override public EScopeKind getKind() { return EScopeKind.eNamespace; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java index 04882ba9792..1ea5e20d6de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java @@ -73,7 +73,8 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I name.setBinding(this); } - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { fDeclarations= ArrayUtil.trim(fDeclarations); return fDeclarations; } @@ -120,17 +121,20 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I } } - public IASTName getDefinition() { + @Override + public IASTName getDefinition() { if (fDefinition == NOT_INITIALIZED) return null; return fDefinition; } - public String getName() { + @Override + public String getName() { return new String(getNameCharArray()); } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return getADeclaration().getSimpleID(); } @@ -140,6 +144,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return fDeclarations[0]; } + @Override public IScope getScope() { return CPPVisitor.getContainingScope(getADeclaration()); } @@ -149,15 +154,18 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I throw new IllegalArgumentException("Enums must not be cloned"); //$NON-NLS-1$ } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } - public boolean isGloballyQualified() throws DOMException { + @Override + public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while (scope != null) { if (scope instanceof ICPPBlockScope) @@ -167,11 +175,13 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return true; } + @Override public void addDefinition(IASTNode node) { assert fDefinition == null || fDefinition == NOT_INITIALIZED; fDefinition= (IASTName) node; } + @Override public void addDeclaration(IASTNode node) { assert node instanceof IASTName; if (fDeclarations == null) { @@ -181,7 +191,8 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I } } - public boolean isSameType(IType type) { + @Override + public boolean isSameType(IType type) { if (type == this) return true; if (type instanceof ITypedef || type instanceof IIndexBinding) @@ -189,10 +200,12 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding getOwner() { return CPPVisitor.findDeclarationOwner(getADeclaration(), true); } @@ -202,6 +215,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return getName(); } + @Override public long getMinValue() { if (fMinValue != null) return fMinValue.longValue(); @@ -224,6 +238,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return minValue; } + @Override public long getMaxValue() { if (fMaxValue != null) return fMaxValue.longValue(); @@ -246,15 +261,18 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return maxValue; } + @Override public boolean isScoped() { return fIsScoped; } + @Override public IType getFixedType() { return fFixedType; } - public IEnumerator[] getEnumerators() { + @Override + public IEnumerator[] getEnumerators() { findDefinition(); final IASTName definition = getDefinition(); if (definition == null) { @@ -287,6 +305,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I return fIndexBinding; } + @Override public ICPPScope asScope() { findDefinition(); IASTName def = getDefinition(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java index 1a89f15b764..eab149b455c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java @@ -46,35 +46,40 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations() */ - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return null; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition() */ - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { return enumName; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ - public String getName() { + @Override + public String getName() { return new String(getNameCharArray()); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return enumName.getSimpleID(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return CPPVisitor.getContainingScope(enumName); } @@ -88,6 +93,7 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType() */ + @Override public IType getType() { IASTEnumerator etor = (IASTEnumerator) enumName.getParent(); IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent(); @@ -97,21 +103,24 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedName() */ - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedNameCharArray() */ - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ - public boolean isGloballyQualified() throws DOMException { + @Override + public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while (scope != null) { if (scope instanceof ICPPBlockScope) @@ -121,20 +130,25 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn return true; } + @Override public void addDefinition(IASTNode node) { } + @Override public void addDeclaration(IASTNode node) { } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding getOwner() { return CPPVisitor.findDeclarationOwner(enumName, true); } + @Override public IValue getValue() { final IASTNode parent= enumName.getParent(); if (parent instanceof ASTEnumerator) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java index 15876035efb..f622e0987b5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java @@ -40,12 +40,15 @@ public class CPPField extends CPPVariable implements ICPPField { super( node, id, arg ); fOwner= owner; } - public int getVisibility() { + @Override + public int getVisibility() { return v_private; } - public ICPPClassType getClassOwner() { + @Override + public ICPPClassType getClassOwner() { return fOwner; } + @Override public ICompositeType getCompositeTypeOwner() { return getClassOwner(); } @@ -101,6 +104,7 @@ public class CPPField extends CPPVariable implements ICPPField { return null; } + @Override public int getVisibility() { ICPPASTVisibilityLabel vis = null; IASTDeclaration decl = getPrimaryDeclaration(); @@ -124,6 +128,7 @@ public class CPPField extends CPPVariable implements ICPPField { return ICPPASTVisibilityLabel.v_public; } + @Override public ICPPClassType getClassOwner() { ICPPClassScope scope = (ICPPClassScope) getScope(); return scope.getClassType(); @@ -153,6 +158,7 @@ public class CPPField extends CPPVariable implements ICPPField { return false; } + @Override public ICompositeType getCompositeTypeOwner() { return getClassOwner(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java index 26b7772c313..cdc92a2ed4e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java @@ -36,14 +36,17 @@ public class CPPFieldSpecialization extends CPPSpecialization implements ICPPFie return (ICPPField) getSpecializedBinding(); } + @Override public int getVisibility() { return getField().getVisibility(); } + @Override public ICPPClassType getClassOwner() { return getField().getClassOwner(); } + @Override public IType getType() { if (type == null) { type= specializeType(getField().getType()); @@ -51,38 +54,47 @@ public class CPPFieldSpecialization extends CPPSpecialization implements ICPPFie return type; } + @Override public boolean isStatic() { return getField().isStatic(); } - public boolean isExtern() { + @Override + public boolean isExtern() { return getField().isExtern(); } - public boolean isAuto() { + @Override + public boolean isAuto() { return getField().isAuto(); } - public boolean isRegister() { + @Override + public boolean isRegister() { return getField().isRegister(); } - public boolean isMutable() { + @Override + public boolean isMutable() { return getField().isMutable(); } - public boolean isExternC() { + @Override + public boolean isExternC() { return false; } + @Override public ICompositeType getCompositeTypeOwner() { return getClassOwner(); } + @Override public IValue getInitialValue() { return getInitialValue(Value.MAX_RECURSION_DEPTH); } + @Override public IValue getInitialValue(int maxRecursionDepth) { if (value == null) { ICPPField field= getField(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java index 37ab8fe19f8..88ff224c1b9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java @@ -101,20 +101,23 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt if (tu != null) { CPPVisitor.getDeclarations(tu, this); } - declarations = (IASTDeclarator[]) ArrayUtil.trim(IASTDeclarator.class, declarations); + declarations = ArrayUtil.trim(IASTDeclarator.class, declarations); bits |= FULLY_RESOLVED; bits &= ~RESOLUTION_IN_PROGRESS; } } - public IASTDeclarator[] getDeclarations() { + @Override + public IASTDeclarator[] getDeclarations() { return declarations; } - public ICPPASTFunctionDeclarator getDefinition() { + @Override + public ICPPASTFunctionDeclarator getDefinition() { return definition; } + @Override public final void addDefinition(IASTNode node) { IASTDeclarator dtor = extractRelevantDtor(node); if (dtor instanceof ICPPASTFunctionDeclarator) { @@ -124,6 +127,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt } } + @Override public final void addDeclaration(IASTNode node) { IASTDeclarator dtor = extractRelevantDtor(node); if (dtor == null) { @@ -155,6 +159,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return ASTQueries.findTypeRelevantDeclarator((IASTDeclarator) node); } + @Override public ICPPParameter[] getParameters() { IASTStandardFunctionDeclarator dtor = getPreferredDtor(); if (dtor == null) { @@ -179,6 +184,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return result; } + @Override public IScope getFunctionScope() { resolveAllDeclarations(); if (definition != null) { @@ -195,10 +201,12 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return null; } + @Override public String getName() { return getASTName().toString(); } + @Override public char[] getNameCharArray() { return getASTName().getSimpleID(); } @@ -214,6 +222,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return name; } + @Override public IScope getScope() { IASTName n = getASTName(); IScope scope = CPPVisitor.getContainingScope(n); @@ -240,7 +249,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return scope; } - public ICPPFunctionType getType() { + @Override + public ICPPFunctionType getType() { if (type == null) { final IType t = getNestedType(CPPVisitor.createType((definition != null) ? definition : declarations[0]), TDEF); if (t instanceof ICPPFunctionType) { @@ -255,7 +265,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return type; } - public IBinding resolveParameter(CPPParameter param) { + @Override + public IBinding resolveParameter(CPPParameter param) { int pos= param.getParameterPosition(); int tdeclLen= declarations == null ? 0 : declarations.length; @@ -323,11 +334,13 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt } } - public final boolean isStatic() { + @Override + public final boolean isStatic() { return isStatic(true); } - public boolean isStatic(boolean resolveAll) { + @Override + public boolean isStatic(boolean resolveAll) { if (resolveAll && (bits & FULLY_RESOLVED) == 0) { resolveAllDeclarations(); } @@ -365,15 +378,18 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt // return false; // } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } - public boolean isGloballyQualified() throws DOMException { + @Override + public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while (scope != null) { if (scope instanceof ICPPBlockScope) @@ -413,6 +429,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return false; } + @Override public boolean isDeleted() { return isDeletedDefinition(getDefinition()); } @@ -427,11 +444,13 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return false; } + @Override public boolean isMutable() { return false; } - public boolean isInline() { + @Override + public boolean isInline() { IASTDeclarator dtor = getDefinition(); IASTDeclarator[] ds = getDeclarations(); int i = -1; @@ -458,7 +477,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return false; } - public boolean isExternC() { + @Override + public boolean isExternC() { if (CPPVisitor.isExternC(getDefinition())) { return true; } @@ -473,23 +493,28 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return false; } - public boolean isExtern() { + @Override + public boolean isExtern() { return hasStorageClass(this, IASTDeclSpecifier.sc_extern); } - public boolean isAuto() { + @Override + public boolean isAuto() { return hasStorageClass(this, IASTDeclSpecifier.sc_auto); } - public boolean isRegister() { + @Override + public boolean isRegister() { return hasStorageClass(this, IASTDeclSpecifier.sc_register); } - public boolean takesVarArgs() { + @Override + public boolean takesVarArgs() { ICPPASTFunctionDeclarator dtor= getPreferredDtor(); return dtor != null ? dtor.takesVarArgs() : false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } @@ -503,10 +528,12 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return result.toString(); } + @Override public IBinding getOwner() { return CPPVisitor.findNameOwner(getASTName(), false); } + @Override public IType[] getExceptionSpecification() { ICPPASTFunctionDeclarator declarator = getPreferredDtor(); if (declarator != null) { @@ -541,6 +568,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return null; } + @Override public int getRequiredArgumentCount() { return getRequiredArgumentCount(getParameters()); } @@ -561,6 +589,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt return 0; } + @Override public boolean hasParameterPack() { ICPPParameter[] pars= getParameters(); return pars.length > 0 && pars[pars.length-1].isParameterPack(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java index 8550489357f..734cb5fc85a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java @@ -33,19 +33,23 @@ public class CPPFunctionInstance extends CPPFunctionSpecialization implements IC fArguments = args; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return (ICPPTemplateDefinition) getSpecializedBinding(); } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(fArguments); } + @Override public ICPPTemplateArgument[] getTemplateArguments() { return fArguments; } + @Override public boolean isExplicitSpecialization() { if (getDefinition() != null) return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java index 120aaf011e9..a32e0a8c9e7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java @@ -51,6 +51,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return (ICPPFunction) getSpecializedBinding(); } + @Override public ICPPParameter[] getParameters() { if (fParams == null) { ICPPFunction function = getFunction(); @@ -75,18 +76,22 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return fParams; } + @Override public int getRequiredArgumentCount() { return ((ICPPFunction) getSpecializedBinding()).getRequiredArgumentCount(); } + @Override public boolean hasParameterPack() { return ((ICPPFunction) getSpecializedBinding()).hasParameterPack(); } + @Override public IScope getFunctionScope() { return null; } + @Override public ICPPFunctionType getType() { if (type == null) { ICPPFunction function = (ICPPFunction) getSpecializedBinding(); @@ -96,10 +101,12 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return type; } + @Override public boolean isMutable() { return false; } + @Override public boolean isDeleted() { IASTNode def = getDefinition(); if (def != null) @@ -112,6 +119,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return false; } + @Override public boolean isInline() { if (getDefinition() != null) { IASTNode def = getDefinition(); @@ -122,6 +130,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return getFunction().isInline(); } + @Override public boolean isExternC() { if (CPPVisitor.isExternC(getDefinition())) { return true; @@ -129,9 +138,11 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return getFunction().isExternC(); } + @Override public boolean isStatic() { return isStatic(true); } + @Override public boolean isStatic(boolean resolveAll) { //TODO resolveAll IBinding f = getSpecializedBinding(); @@ -143,6 +154,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_static); } + @Override public boolean isExtern() { ICPPFunction f = (ICPPFunction) getSpecializedBinding(); if (f != null) @@ -150,6 +162,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_extern); } + @Override public boolean isAuto() { ICPPFunction f = (ICPPFunction) getSpecializedBinding(); if (f != null) @@ -157,6 +170,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_auto); } + @Override public boolean isRegister() { ICPPFunction f = (ICPPFunction) getSpecializedBinding(); if (f != null) @@ -164,6 +178,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_register); } + @Override public boolean takesVarArgs() { ICPPFunction f = (ICPPFunction) getSpecializedBinding(); if (f != null) @@ -180,7 +195,8 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return false; } - public IBinding resolveParameter(CPPParameter param) { + @Override + public IBinding resolveParameter(CPPParameter param) { int pos= param.getParameterPosition(); final IASTNode[] decls= getDeclarations(); @@ -288,6 +304,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP return result.toString(); } + @Override public IType[] getExceptionSpecification() { if (specializedExceptionSpec == null) { ICPPFunction function = (ICPPFunction) getSpecializedBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java index 2d45901cd2e..e42728ea17f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java @@ -93,6 +93,7 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return null; } + @Override public ICPPParameter[] getParameters() { ICPPASTFunctionDeclarator fdecl= getFirstFunctionDtor(); if (fdecl != null) { @@ -118,19 +119,23 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return CPPBuiltinParameter.createParameterList(getType()); } + @Override public int getRequiredArgumentCount() { return CPPFunction.getRequiredArgumentCount(getParameters()); } + @Override public boolean hasParameterPack() { ICPPParameter[] pars= getParameters(); return pars.length > 0 && pars[pars.length-1].isParameterPack(); } + @Override public IScope getFunctionScope() { return null; } + @Override public ICPPFunctionType getType() { if (type == null) { IASTName name = getTemplateName(); @@ -184,7 +189,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return null; } - public IBinding resolveParameter(CPPParameter param) { + @Override + public IBinding resolveParameter(CPPParameter param) { int pos= param.getParameterPosition(); final IASTNode[] decls= getDeclarations(); @@ -252,15 +258,18 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return ASTQueries.findInnermostDeclarator(paramDecl.getDeclarator()).getName(); } + @Override public final boolean isStatic() { return isStatic(true); } - public boolean isMutable() { + @Override + public boolean isMutable() { return hasStorageClass(IASTDeclSpecifier.sc_mutable); } - public boolean isInline() { + @Override + public boolean isInline() { IASTName name = (IASTName) getDefinition(); IASTNode[] ns = getDeclarations(); int i = -1; @@ -283,7 +292,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return false; } - public boolean isExternC() { + @Override + public boolean isExternC() { if (CPPVisitor.isExternC(getDefinition())) { return true; } @@ -298,23 +308,28 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return false; } - public boolean isExtern() { + @Override + public boolean isExtern() { return hasStorageClass(IASTDeclSpecifier.sc_extern); } + @Override public boolean isDeleted() { return CPPFunction.isDeletedDefinition(getDefinition()); } - public boolean isAuto() { + @Override + public boolean isAuto() { return hasStorageClass(IASTDeclSpecifier.sc_auto); } - public boolean isRegister() { + @Override + public boolean isRegister() { return hasStorageClass(IASTDeclSpecifier.sc_register); } - public boolean takesVarArgs() { + @Override + public boolean takesVarArgs() { ICPPASTFunctionDeclarator fdecl= getFirstFunctionDtor(); if (fdecl != null) { return fdecl.takesVarArgs(); @@ -333,7 +348,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return null; } - public boolean isStatic(boolean resolveAll) { + @Override + public boolean isStatic(boolean resolveAll) { return hasStorageClass(IASTDeclSpecifier.sc_static); } @@ -346,6 +362,7 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition return result.toString(); } + @Override public IType[] getExceptionSpecification() { ICPPASTFunctionDeclarator declarator = getFirstFunctionDtor(); if (declarator != null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java index d0e6535f8e7..01120115dd3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java @@ -34,11 +34,13 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization super(original, owner, argumentMap); } + @Override public ICPPTemplateParameter[] getTemplateParameters() { ICPPFunctionTemplate template = (ICPPFunctionTemplate) getSpecializedBinding(); return template.getTemplateParameters(); } + @Override public synchronized final void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) { if (instances == null) instances = new ObjectMap(2); @@ -46,6 +48,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization instances.put(key, instance); } + @Override public synchronized final ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) { if (instances != null) { String key= ASTTypeUtil.getArgumentListString(arguments, true); @@ -54,6 +57,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization return null; } + @Override public synchronized ICPPTemplateInstance[] getAllInstances() { if (instances != null) { ICPPTemplateInstance[] result= new ICPPTemplateInstance[instances.size()]; @@ -65,6 +69,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization return ICPPTemplateInstance.EMPTY_TEMPLATE_INSTANCE_ARRAY; } + @Override public IBinding resolveTemplateParameter(ICPPTemplateParameter param) { return param; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java index f46908ecffb..7c07c5c8b0e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java @@ -45,7 +45,8 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { this.takesVarargs= takesVarargs; } - public boolean isSameType(IType o) { + @Override + public boolean isSameType(IType o) { if (o instanceof ITypedef) return o.isSameType(this); if (o instanceof ICPPFunctionType) { @@ -82,14 +83,16 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getReturnType() */ - public IType getReturnType() { + @Override + public IType getReturnType() { return returnType; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getParameterTypes() */ - public IType[] getParameterTypes() { + @Override + public IType[] getParameterTypes() { return parameters; } @@ -104,19 +107,23 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { return t; } - @Deprecated + @Override + @Deprecated public IPointerType getThisType() { return null; } + @Override public final boolean isConst() { return isConst; } + @Override public final boolean isVolatile() { return isVolatile; } + @Override public boolean takesVarArgs() { return takesVarargs; } @@ -126,6 +133,7 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType { return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE; if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java index 4747a21ef10..229f129609a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java @@ -45,6 +45,7 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod super(name, scope, type, params, false); } + @Override public int getVisibility() { IASTDeclaration decl= getPrimaryDeclaration(); if (decl == null) { @@ -76,6 +77,7 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod return ICPPASTVisibilityLabel.v_public; } + @Override public ICPPClassType getClassOwner() { ICPPClassScope scope = (ICPPClassScope)getScope(); return scope.getClassType(); @@ -157,10 +159,12 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod return null; } - public boolean isVirtual() { + @Override + public boolean isVirtual() { return false; } + @Override public boolean isDestructor() { char [] n = getNameCharArray(); if( n != null && n.length > 0 ) @@ -168,14 +172,17 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod return false; } + @Override public boolean isImplicit() { return getPrimaryDeclaration() == null; } - public boolean isExplicit() { + @Override + public boolean isExplicit() { return false; } + @Override public boolean isPureVirtual() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java index 0a51c7342c1..db11a37fe21 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java @@ -38,22 +38,27 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP fDeclaration = name; } - public boolean isParameterPack() { + @Override + public boolean isParameterPack() { return getType() instanceof ICPPParameterPackType; } + @Override public String getName() { return new String(getNameCharArray()); } + @Override public char[] getNameCharArray() { return fDeclaration.getSimpleID(); } + @Override public IScope getScope() { return CPPVisitor.getContainingScope(fDeclaration); } + @Override public IType getType() { if (fType == null) { IASTNode parent= fDeclaration.getParent(); @@ -68,34 +73,42 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP return fType; } - public boolean isStatic() { + @Override + public boolean isStatic() { return false; } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return new String[] { getName() }; } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return new char[][] { getNameCharArray() }; } - public boolean isGloballyQualified() { + @Override + public boolean isGloballyQualified() { return false; } - public boolean isExtern() { + @Override + public boolean isExtern() { //7.1.1-5 extern can not be used in the declaration of a parameter return false; } - public boolean isMutable() { + @Override + public boolean isMutable() { //7.1.1-8 mutable can only apply to class members return false; } - public boolean isAuto() { + @Override + public boolean isAuto() { return hasStorageClass(IASTDeclSpecifier.sc_auto); } - public boolean isRegister() { + @Override + public boolean isRegister() { return hasStorageClass(IASTDeclSpecifier.sc_register); } @@ -111,14 +124,17 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP return false; } + @Override public boolean hasDefaultValue() { return false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public boolean isExternC() { return false; } @@ -129,6 +145,7 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP return name.length() != 0 ? name : ""; //$NON-NLS-1$ } + @Override public IBinding getOwner() { IASTNode node= fDeclaration; while (node != null && !(node instanceof ICPPASTLambdaExpression)) @@ -143,6 +160,7 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP return null; } + @Override public IValue getInitialValue() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java index 7067ca1b3e6..3ebf67a4377 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java @@ -89,6 +89,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMember#getVisibility() */ + @Override public int getVisibility() { IASTDeclaration decl = getPrimaryDeclaration(); if (decl == null) { @@ -119,6 +120,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { return ICPPASTVisibilityLabel.v_public; } + @Override public ICPPClassType getClassOwner() { ICPPClassScope scope = (ICPPClassScope)getScope(); return scope.getClassType(); @@ -144,7 +146,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isVirtual() */ - public boolean isVirtual() { + @Override + public boolean isVirtual() { IASTDeclaration decl = getPrimaryDeclaration(); if (decl != null) { ICPPASTDeclSpecifier declSpec = getDeclSpec(decl); @@ -203,6 +206,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isDestructor() */ + @Override public boolean isDestructor() { char[] name = getNameCharArray(); if (name.length > 1 && name[0] == '~') @@ -211,6 +215,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { return false; } + @Override public boolean isImplicit() { return false; } @@ -218,7 +223,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isPureVirtual() */ - public boolean isPureVirtual() { + @Override + public boolean isPureVirtual() { if (declarations != null) { for (IASTDeclarator dtor : declarations) { if (dtor == null) @@ -237,7 +243,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod { return false; } - public boolean isExplicit() { + @Override + public boolean isExplicit() { IASTDeclaration decl= getPrimaryDeclaration(); if (decl != null) { ICPPASTDeclSpecifier declspec= getDeclSpec(decl); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java index 7fd74322ca2..286b131d745 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java @@ -27,10 +27,12 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMember#getVisibility() */ + @Override public int getVisibility() { return ((ICPPMethod)getTemplateDefinition()).getVisibility(); } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } @@ -38,17 +40,20 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isVirtual() */ - public boolean isVirtual() { + @Override + public boolean isVirtual() { return ((ICPPMethod)getTemplateDefinition()).isVirtual(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isPureVirtual() */ + @Override public boolean isPureVirtual() { return ((ICPPMethod)getTemplateDefinition()).isPureVirtual(); } + @Override public boolean isExplicit() { return ((ICPPMethod) getTemplateDefinition()).isExplicit(); } @@ -56,6 +61,7 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isDestructor() */ + @Override public boolean isDestructor() { char[] name = getNameCharArray(); if (name.length > 1 && name[0] == '~') @@ -64,6 +70,7 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod return false; } + @Override public boolean isImplicit() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java index dc6ba8e3d42..962e2fd4e01 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java @@ -31,6 +31,7 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization super(orig, owner, argMap ); } + @Override public boolean isVirtual() { ICPPMethod f = (ICPPMethod) getSpecializedBinding(); if( f != null ) @@ -54,6 +55,7 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization return false; } + @Override public int getVisibility() { ICPPMethod f = (ICPPMethod) getSpecializedBinding(); if( f != null ) @@ -61,10 +63,12 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization return 0; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public boolean isDestructor() { char[] name = getNameCharArray(); if (name.length > 1 && name[0] == '~') @@ -73,14 +77,17 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization return false; } + @Override public boolean isExplicit() { return ((ICPPMethod)getSpecializedBinding()).isExplicit(); } + @Override public boolean isImplicit() { return ((ICPPMethod) getSpecializedBinding()).isImplicit(); } + @Override public boolean isPureVirtual() { ICPPMethod f = (ICPPMethod) getSpecializedBinding(); if (f != null) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java index 43c111e8317..e2b57e00cfa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java @@ -100,6 +100,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return null; } + @Override public int getVisibility() { IASTDeclaration decl = getPrimaryDeclaration(); if( decl == null ){ @@ -126,6 +127,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return ICPPASTVisibilityLabel.v_public; } + @Override public ICPPClassType getClassOwner() { IScope scope= getScope(); if (scope instanceof ICPPTemplateScope) { @@ -141,7 +143,8 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return null; } - public boolean isVirtual() { + @Override + public boolean isVirtual() { IASTDeclaration decl = getPrimaryDeclaration(); if (decl instanceof ICPPASTTemplateDeclaration) { ICPPASTDeclSpecifier declSpec= getDeclSpecifier(((ICPPASTTemplateDeclaration) decl).getDeclaration()); @@ -174,6 +177,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return super.isInline(); } + @Override public boolean isDestructor() { char[] name = getNameCharArray(); if (name.length > 1 && name[0] == '~') @@ -182,10 +186,12 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return false; } + @Override public boolean isImplicit() { return false; } + @Override public boolean isExplicit() { IASTDeclaration decl = getPrimaryDeclaration(); if (decl instanceof ICPPASTTemplateDeclaration) { @@ -197,6 +203,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod return false; } + @Override public boolean isPureVirtual() { if (declarations != null && declarations.length > 0) { IASTName decl= declarations[0]; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java index 7ea5aff8d97..e65a789c68e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java @@ -27,6 +27,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali super(specialized, owner, ctmap); } + @Override public boolean isVirtual() { IBinding m = getSpecializedBinding(); if (m instanceof ICPPMethod) @@ -34,6 +35,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali return false; } + @Override public int getVisibility() { IBinding m = getSpecializedBinding(); if (m instanceof ICPPMethod) @@ -41,10 +43,12 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali return 0; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public boolean isDestructor() { char[] name = getNameCharArray(); if (name.length > 1 && name[0] == '~') @@ -53,6 +57,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali return false; } + @Override public boolean isImplicit() { IBinding m = getSpecializedBinding(); if (m instanceof ICPPMethod) @@ -60,6 +65,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali return false; } + @Override public boolean isExplicit() { IBinding m = getSpecializedBinding(); if (m instanceof ICPPMethod) @@ -67,6 +73,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali return false; } + @Override public boolean isPureVirtual() { IBinding m = getSpecializedBinding(); if (m instanceof ICPPMethod) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java index 9bf75fe1f2a..9e800ac6d99 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java @@ -48,17 +48,22 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI public CPPNamespaceProblem(IASTNode node, int id, char[] arg) { super(node, id, arg); } + @Override public ICPPNamespaceScope getNamespaceScope() { return this; } + @Override public IBinding[] getMemberBindings() { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public void addUsingDirective(ICPPUsingDirective usingDirective) { } + @Override public ICPPUsingDirective[] getUsingDirectives() { return ICPPUsingDirective.EMPTY_ARRAY; } + @Override public ICPPNamespaceScope[] getInlineNamespaces() { return ICPPNamespaceScope.EMPTY_NAMESPACE_SCOPE_ARRAY; } @@ -80,14 +85,16 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations() */ - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return namespaceDefinitions; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition() */ - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { return (tu != null) ? tu : (IASTNode) namespaceDefinitions[0]; } @@ -119,7 +126,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI } } - namespaces = (IASTName[]) ArrayUtil.append(IASTName.class, namespaces, namespace.getName()); + namespaces = ArrayUtil.append(IASTName.class, namespaces, namespace.getName()); return PROCESS_SKIP; } @@ -131,7 +138,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI } public IASTName[] getNamespaces() { - return (IASTName[]) ArrayUtil.trim(IASTName.class, namespaces); + return ArrayUtil.trim(IASTName.class, namespaces); } } @@ -220,6 +227,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace#getNamespaceScope() */ + @Override public ICPPNamespaceScope getNamespaceScope() { if (scope == null) { if (tu != null) @@ -233,6 +241,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public String getName() { return new String(getNameCharArray()); } @@ -240,6 +249,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ + @Override public char[] getNameCharArray() { return tu != null ? EMPTY_CHAR_ARRAY : namespaceDefinitions[0].getSimpleID(); } @@ -247,6 +257,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { return tu != null ? null : CPPVisitor.getContainingScope(namespaceDefinitions[0]); } @@ -275,27 +286,31 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName() */ - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray() */ - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ - public boolean isGloballyQualified() { + @Override + public boolean isGloballyQualified() { return true; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public void addDefinition(IASTNode node) { if (!(node instanceof IASTName)) return; @@ -307,19 +322,21 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI } if (namespaceDefinitions.length > 0 && ((ASTNode)name).getOffset() < ((ASTNode)namespaceDefinitions[0]).getOffset()) { - namespaceDefinitions = (IASTName[]) ArrayUtil.prepend(IASTName.class, namespaceDefinitions, name); + namespaceDefinitions = ArrayUtil.prepend(IASTName.class, namespaceDefinitions, name); } else { - namespaceDefinitions = (IASTName[]) ArrayUtil.append(IASTName.class, namespaceDefinitions, name); + namespaceDefinitions = ArrayUtil.append(IASTName.class, namespaceDefinitions, name); } } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDeclaration(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public void addDeclaration(IASTNode node) { addDefinition(node); } + @Override public IBinding[] getMemberBindings() { if (namespaceDefinitions != null) { NamespaceMemberCollector collector = new NamespaceMemberCollector(); @@ -337,6 +354,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI return IBinding.EMPTY_BINDING_ARRAY; } + @Override public boolean isInline() { final ICPPNamespaceScope nsScope = getNamespaceScope(); if (nsScope instanceof CPPNamespaceScope) { @@ -345,6 +363,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI return false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } @@ -358,6 +377,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON)); } + @Override public IBinding getOwner() { if (namespaceDefinitions != null && namespaceDefinitions.length > 0) { return CPPVisitor.findDeclarationOwner(namespaceDefinitions[0], false); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java index 4bec0e288bd..34f05022d68 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java @@ -36,35 +36,43 @@ public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAl this.alias = aliasName; } - public ICPPNamespaceScope getNamespaceScope() { + @Override + public ICPPNamespaceScope getNamespaceScope() { return namespace.getNamespaceScope(); } - public IBinding getBinding() { + @Override + public IBinding getBinding() { return namespace; } - public String getName() { + @Override + public String getName() { return new String(getNameCharArray()); } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return alias.getSimpleID(); } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName( this ); } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray( this ); } - public IScope getScope() { + @Override + public IScope getScope() { return CPPVisitor.getContainingScope( alias ); } - public boolean isGloballyQualified() throws DOMException { + @Override + public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while( scope != null ){ if( scope instanceof ICPPBlockScope ) @@ -74,32 +82,40 @@ public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAl return true; } - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return null; } - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { return alias; } + @Override public void addDefinition(IASTNode node) { } + @Override public void addDeclaration(IASTNode node) { } + @Override public IBinding[] getMemberBindings() { return namespace.getMemberBindings(); } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding getOwner() { return CPPVisitor.findDeclarationOwner(alias, false); } + @Override public boolean isInline() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java index f82d20c5b84..c06b8d06f17 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java @@ -56,6 +56,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace super(physicalNode); } + @Override public EScopeKind getKind() { if (getPhysicalNode() instanceof IASTTranslationUnit) return EScopeKind.eGlobal; @@ -66,6 +67,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope#getUsingDirectives() */ + @Override public ICPPUsingDirective[] getUsingDirectives() { initUsingDirectives(); populateCache(); @@ -87,6 +89,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope#addUsingDirective(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective) */ + @Override public void addUsingDirective(ICPPUsingDirective directive) { initUsingDirectives(); fUsingDirectives.add(directive); @@ -145,6 +148,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace return result[0]; } + @Override public boolean isInlineNamepace() { if (!fIsInlineInitialized) { fIsInline= computeIsInline(); @@ -186,6 +190,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace return false; } + @Override public ICPPNamespaceScope[] getEnclosingNamespaceSet() { if (fEnclosingNamespaceSet == null) { return fEnclosingNamespaceSet= computeEnclosingNamespaceSet(this); @@ -193,6 +198,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace return fEnclosingNamespaceSet; } + @Override public ICPPInternalNamespaceScope[] getInlineNamespaces() { if (getKind() == EScopeKind.eLocal) return NO_NAMESPACE_SCOPES; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java index 905650daf31..5e987c39a55 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java @@ -125,75 +125,93 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return DEFAULT_INSTANCE; } + @Override public ICPPASTArrayDeclarator newArrayDeclarator(IASTName name) { return new CPPASTArrayDeclarator(name); } + @Override public IASTArrayModifier newArrayModifier(IASTExpression expr) { return new CPPASTArrayModifier(expr); } + @Override public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript) { return new CPPASTArraySubscriptExpression(arrayExpr, subscript); } + @Override public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTInitializerClause subscript) { return new CPPASTArraySubscriptExpression(arrayExpr, subscript); } + @Override public IASTASMDeclaration newASMDeclaration(String assembly) { return new CPPASTASMDeclaration(assembly); } + @Override public ICPPASTBaseSpecifier newBaseSpecifier(IASTName name, int visibility, boolean isVirtual) { return new CPPASTBaseSpecifier(name, visibility, isVirtual); } + @Override public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2) { return new CPPASTBinaryExpression(op, expr1, expr2); } + @Override public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTInitializerClause expr2) { return new CPPASTBinaryExpression(op, expr1, expr2); } + @Override public IASTExpression newBinaryTypeIdExpression(Operator op, IASTTypeId type1, IASTTypeId type2) { return new CPPASTBinaryTypeIdExpression(op, type1, type2); } + @Override public IASTBreakStatement newBreakStatement() { return new CPPASTBreakStatement(); } + @Override public ICPPASTCapture newCapture() { return new CPPASTCapture(); } + @Override public IASTCaseStatement newCaseStatement(IASTExpression expr) { return new CPPASTCaseStatement(expr); } + @Override public ICPPASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) { return new CPPASTCastExpression(operator, typeId, operand); } + @Override public ICPPASTCatchHandler newCatchHandler(IASTDeclaration decl, IASTStatement body) { return new CPPASTCatchHandler(decl, body); } + @Override public ICPPASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name) { return new CPPASTCompositeTypeSpecifier(key, name); } + @Override public IASTCompoundStatement newCompoundStatement() { return new CPPASTCompoundStatement(); } + @Override public IASTConditionalExpression newConditionalExpession(IASTExpression condition, IASTExpression positive, IASTExpression negative) { return new CPPASTConditionalExpression(condition, positive, negative); } + @Override @Deprecated public ICPPASTConstructorChainInitializer newConstructorChainInitializer(IASTName id, IASTExpression expression) { ICPPASTConstructorChainInitializer result= new CPPASTConstructorChainInitializer(id, null); @@ -201,10 +219,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return result; } + @Override public ICPPASTConstructorChainInitializer newConstructorChainInitializer(IASTName id, IASTInitializer init) { return new CPPASTConstructorChainInitializer(id, init); } + @Override @Deprecated public ICPPASTConstructorInitializer newConstructorInitializer(IASTExpression exp) { ICPPASTConstructorInitializer result= new CPPASTConstructorInitializer(null); @@ -212,98 +232,121 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return result; } + @Override public ICPPASTConstructorInitializer newConstructorInitializer(IASTInitializerClause[] args) { return new CPPASTConstructorInitializer(args); } + @Override public IASTContinueStatement newContinueStatement() { return new CPPASTContinueStatement(); } + @Override public ICPPASTConversionName newConversionName(IASTTypeId typeId) { return new CPPASTConversionName(typeId); } + @Override public IASTDeclarationStatement newDeclarationStatement(IASTDeclaration declaration) { return new CPPASTDeclarationStatement(declaration); } + @Override public ICPPASTDeclarator newDeclarator(IASTName name) { return new CPPASTDeclarator(name); } + @Override public IASTDefaultStatement newDefaultStatement() { return new CPPASTDefaultStatement(); } + @Override public ICPPASTDeleteExpression newDeleteExpression(IASTExpression operand) { return new CPPASTDeleteExpression(operand); } + @Override public IASTDoStatement newDoStatement(IASTStatement body, IASTExpression condition) { return new CPPASTDoStatement(body, condition); } + @Override public ICPPASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name) { return new CPPASTElaboratedTypeSpecifier(kind, name); } + @Override public ICPPASTEnumerationSpecifier newEnumerationSpecifier(boolean isScoped, IASTName name, ICPPASTDeclSpecifier baseType) { return new CPPASTEnumerationSpecifier(isScoped, name, baseType); } + @Override public ICPPASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) { return new CPPASTEnumerationSpecifier(false, name, null); } + @Override public IASTEnumerator newEnumerator(IASTName name, IASTExpression value) { return new CPPASTEnumerator(name, value); } + @Override public IASTEqualsInitializer newEqualsInitializer(IASTInitializerClause initClause) { return new CPPASTEqualsInitializer(initClause); } + @Override public ICPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiation(IASTDeclaration declaration) { return new CPPASTExplicitTemplateInstantiation(declaration); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiationGPP(IASTDeclaration declaration) { return new GPPASTExplicitTemplateInstantiation(declaration); } + @Override public ICPPASTExpressionList newExpressionList() { return new CPPASTExpressionList(); } + @Override public IASTExpressionStatement newExpressionStatement(IASTExpression expression) { return new CPPASTExpressionStatement(expression); } + @Override public ICPPASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize) { return new CPPASTFieldDeclarator(name, bitFieldSize); } + @Override public ICPPASTFieldReference newFieldReference(IASTName name, IASTExpression owner) { return new CPPASTFieldReference(name, owner); } + @Override public ICPPASTForStatement newForStatement() { return new CPPASTForStatement(); } + @Override public ICPPASTForStatement newForStatement(IASTStatement init, IASTDeclaration condition, IASTExpression iterationExpression, IASTStatement body) { return new CPPASTForStatement(init, condition, iterationExpression, body); } + @Override public ICPPASTForStatement newForStatement(IASTStatement init, IASTExpression condition, IASTExpression iterationExpr, IASTStatement body) { return new CPPASTForStatement(init, condition, iterationExpr, body); } + @Override @Deprecated public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) { CPPASTFunctionCallExpression result = new CPPASTFunctionCallExpression(idExpr, null); @@ -311,89 +354,110 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return result; } + @Override public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments) { return new CPPASTFunctionCallExpression(idExpr, arguments); } + @Override public ICPPASTFunctionDeclarator newFunctionDeclarator(IASTName name) { return new CPPASTFunctionDeclarator(name); } + @Override public ICPPASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator, IASTStatement bodyStatement) { return new CPPASTFunctionDefinition(declSpecifier, declarator, bodyStatement); } + @Override public ICPPASTFunctionWithTryBlock newFunctionTryBlock(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator, IASTStatement bodyStatement) { return new CPPASTFunctionWithTryBlock(declSpecifier, declarator, bodyStatement); } + @Override public IGNUASTCompoundStatementExpression newGNUCompoundStatementExpression(IASTCompoundStatement compoundStatement) { return new CPPASTCompoundStatementExpression(compoundStatement); } + @Override public IASTGotoStatement newGotoStatement(IASTName name) { return new CPPASTGotoStatement(name); } + @Override public IASTIdExpression newIdExpression(IASTName name) { return new CPPASTIdExpression(name); } + @Override public ICPPASTIfStatement newIfStatement() { return new CPPASTIfStatement(); } + @Override public ICPPASTIfStatement newIfStatement(IASTDeclaration condition, IASTStatement then, IASTStatement elseClause) { return new CPPASTIfStatement(condition, then, elseClause); } + @Override public ICPPASTIfStatement newIfStatement(IASTExpression condition, IASTStatement then, IASTStatement elseClause) { return new CPPASTIfStatement(condition, then, elseClause); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.IASTInitializerExpression newInitializerExpression(IASTExpression expression) { return new CPPASTInitializerExpression(expression); } + @Override public ICPPASTInitializerList newInitializerList() { return new CPPASTInitializerList(); } + @Override public IASTLabelStatement newLabelStatement(IASTName name, IASTStatement nestedStatement) { return new CPPASTLabelStatement(name, nestedStatement); } + @Override public ICPPASTLambdaExpression newLambdaExpression() { return new CPPASTLambdaExpression(); } + @Override public ICPPASTLinkageSpecification newLinkageSpecification(String literal) { return new CPPASTLinkageSpecification(literal); } + @Override public ICPPASTLiteralExpression newLiteralExpression(int kind, String rep) { return new CPPASTLiteralExpression(kind, rep.toCharArray()); } + @Override public IASTName newName() { return new CPPASTName(); } + @Override public IASTName newName(char[] name) { return new CPPASTName(name); } + @Override public ICPPASTNamespaceAlias newNamespaceAlias(IASTName alias, IASTName qualifiedName) { return new CPPASTNamespaceAlias(alias, qualifiedName); } + @Override public ICPPASTNamespaceDefinition newNamespaceDefinition(IASTName name) { return new CPPASTNamespaceDefinition(name); } + @Override @Deprecated public ICPPASTNewExpression newNewExpression(IASTExpression placement, IASTExpression initializer, IASTTypeId typeId) { final ICPPASTNewExpression result = new CPPASTNewExpression(null, null, typeId); @@ -402,106 +466,131 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return result; } + @Override public ICPPASTNewExpression newNewExpression(IASTInitializerClause[] placement, IASTInitializer initializer, IASTTypeId typeId) { return new CPPASTNewExpression(placement, initializer, typeId); } + @Override public IASTNullStatement newNullStatement() { return new CPPASTNullStatement(); } + @Override public ICPPASTOperatorName newOperatorName(char[] name) { return new CPPASTOperatorName(name); } + @Override public ICPPASTPackExpansionExpression newPackExpansionExpression(IASTExpression pattern) { return new CPPASTPackExpansionExpression(pattern); } + @Override public ICPPASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator) { return new CPPASTParameterDeclaration(declSpec, declarator); } + @Override public IASTPointer newPointer() { return new CPPASTPointer(); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointer newPointerGPP() { return new GPPASTPointer(); } + @Override public ICPPASTPointerToMember newPointerToMember(IASTName name) { return new CPPASTPointerToMember(name); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointerToMember newPointerToMemberGPP(IASTName name) { return new GPPASTPointerToMember(name); } + @Override public IASTProblem newProblem(int id, char[] arg, boolean error) { return new CPPASTProblem(id, arg, error); } + @Override public IASTProblemDeclaration newProblemDeclaration(IASTProblem problem) { return new CPPASTProblemDeclaration(problem); } + @Override public IASTProblemExpression newProblemExpression(IASTProblem problem) { return new CPPASTProblemExpression(problem); } + @Override public IASTProblemStatement newProblemStatement(IASTProblem problem) { return new CPPASTProblemStatement(problem); } + @Override public IASTProblemTypeId newProblemTypeId(IASTProblem problem) { return new CPPASTProblemTypeId(problem); } + @Override public ICPPASTQualifiedName newQualifiedName() { return new CPPASTQualifiedName(); } + @Override public ICPPASTRangeBasedForStatement newRangeBasedForStatement() { return new CPPASTRangeBasedForStatement(); } + @Override public ICPPASTReferenceOperator newReferenceOperator() { return new CPPASTReferenceOperator(false); } + @Override public ICPPASTReferenceOperator newReferenceOperator(boolean isRValueReference) { return new CPPASTReferenceOperator(isRValueReference); } + @Override public IASTReturnStatement newReturnStatement(IASTExpression retValue) { return new CPPASTReturnStatement(retValue); } + @Override public IASTReturnStatement newReturnStatement(IASTInitializerClause retValue) { return new CPPASTReturnStatement(retValue); } + @Override public IASTSimpleDeclaration newSimpleDeclaration(IASTDeclSpecifier declSpecifier) { return new CPPASTSimpleDeclaration(declSpecifier); } + @Override public ICPPASTSimpleDeclSpecifier newSimpleDeclSpecifier() { return new CPPASTSimpleDeclSpecifier(); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTSimpleDeclSpecifier newSimpleDeclSpecifierGPP() { return new GPPASTSimpleDeclSpecifier(); } + @Override public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression( ICPPASTDeclSpecifier declSpec, IASTInitializer initializer) { return new CPPASTSimpleTypeConstructorExpression(declSpec, initializer); } + @Override @Deprecated public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(int type, IASTExpression expression) { CPPASTSimpleTypeConstructorExpression result = new CPPASTSimpleTypeConstructorExpression(); @@ -510,47 +599,58 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return result; } + @Override public ICPPASTSimpleTypeTemplateParameter newSimpleTypeTemplateParameter(int type, IASTName name, IASTTypeId typeId) { return new CPPASTSimpleTypeTemplateParameter(type, name, typeId); } + @Override public ICPPASTStaticAssertDeclaration newStaticAssertion(IASTExpression condition, ICPPASTLiteralExpression message) { return new CPPASTStaticAssertionDeclaration(condition, message); } + @Override public ICPPASTSwitchStatement newSwitchStatement() { return new CPPASTSwitchStatement(); } + @Override public ICPPASTSwitchStatement newSwitchStatement(IASTDeclaration controller, IASTStatement body) { return new CPPASTSwitchStatement(controller, body); } + @Override public ICPPASTSwitchStatement newSwitchStatement(IASTExpression controller, IASTStatement body) { return new CPPASTSwitchStatement(controller, body); } + @Override public ICPPASTTemplateDeclaration newTemplateDeclaration(IASTDeclaration declaration) { return new CPPASTTemplateDeclaration(declaration); } + @Override public ICPPASTTemplatedTypeTemplateParameter newTemplatedTypeTemplateParameter(IASTName name, IASTExpression defaultValue) { return new CPPASTTemplatedTypeTemplateParameter(name, defaultValue); } + @Override public ICPPASTTemplateId newTemplateId(IASTName templateName) { return new CPPASTTemplateId(templateName); } + @Override public ICPPASTTemplateSpecialization newTemplateSpecialization(IASTDeclaration declaration) { return new CPPASTTemplateSpecialization(declaration); } + @Override public ICPPASTTranslationUnit newTranslationUnit() { return newTranslationUnit(null); } + @Override public ICPPASTTranslationUnit newTranslationUnit(IScanner scanner) { CPPASTTranslationUnit tu = new CPPASTTranslationUnit(); @@ -564,55 +664,68 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory { return tu; } + @Override public ICPPASTTryBlockStatement newTryBlockStatement(IASTStatement body) { return new CPPASTTryBlockStatement(body); } + @Override public ICPPASTNamedTypeSpecifier newTypedefNameSpecifier(IASTName name) { return new CPPASTNamedTypeSpecifier(name); } + @Override public ICPPASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator) { return new CPPASTTypeId(declSpecifier, declarator); } + @Override public ICPPASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId) { return new CPPASTTypeIdExpression(operator, typeId); } + @Override public IASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer) { return new CPPASTTypeIdInitializerExpression(typeId, initializer); } + @Override @Deprecated public org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypenameExpression newTypenameExpression(IASTName qualifiedName, IASTExpression expr, boolean isTemplate) { return new CPPASTTypenameExpression(qualifiedName, expr); } + @Override public ICPPASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand) { return new CPPASTUnaryExpression(operator, operand); } + @Override public ICPPASTUsingDeclaration newUsingDeclaration(IASTName name) { return new CPPASTUsingDeclaration(name); } + @Override public ICPPASTUsingDirective newUsingDirective(IASTName name) { return new CPPASTUsingDirective(name); } + @Override public ICPPASTVisibilityLabel newVisibilityLabel(int visibility) { return new CPPASTVisibilityLabel(visibility); } + @Override public ICPPASTWhileStatement newWhileStatement() { return new CPPASTWhileStatement(); } + @Override public ICPPASTWhileStatement newWhileStatement(IASTDeclaration condition, IASTStatement body) { return new CPPASTWhileStatement(condition, body); } + @Override public ICPPASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body) { return new CPPASTWhileStatement(condition, body); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java index 99c33bfb6e0..50032369a36 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java @@ -62,24 +62,28 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI fPosition= pos; } - public boolean isParameterPack() { + @Override + public boolean isParameterPack() { return getType() instanceof ICPPParameterPackType; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations() */ - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return fDeclarations; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition() */ - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { return null; } + @Override public void addDeclaration(IASTNode node) { if (!(node instanceof IASTName)) return; @@ -88,9 +92,9 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI fDeclarations = new IASTName[] { name }; } else { if (isDeclaredBefore((ASTNode)node, (ASTNode)fDeclarations[0])) { - fDeclarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, fDeclarations, name); + fDeclarations = ArrayUtil.prepend(IASTName.class, fDeclarations, name); } else { - fDeclarations = (IASTName[]) ArrayUtil.append(IASTName.class, fDeclarations, name); + fDeclarations = ArrayUtil.append(IASTName.class, fDeclarations, name); } } } @@ -120,6 +124,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public String getName() { return new String(getNameCharArray()); } @@ -127,6 +132,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ + @Override public char[] getNameCharArray() { IASTName name = getPrimaryDeclaration(); if (name != null) @@ -137,6 +143,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { return CPPVisitor.getContainingScope(getPrimaryDeclaration()); } @@ -153,6 +160,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#getType() */ + @Override public IType getType() { if (fType == null && fDeclarations != null) { IASTNode parent= fDeclarations[0].getParent(); @@ -170,34 +178,39 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic() */ - public boolean isStatic() { + @Override + public boolean isStatic() { return false; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedName() */ - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return new String[] { getName() }; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedNameCharArray() */ - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return new char[][] { getNameCharArray() }; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ - public boolean isGloballyQualified() { + @Override + public boolean isGloballyQualified() { return false; } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public void addDefinition(IASTNode node) { addDeclaration(node); } @@ -205,7 +218,8 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern() */ - public boolean isExtern() { + @Override + public boolean isExtern() { //7.1.1-5 extern can not be used in the declaration of a parameter return false; } @@ -213,7 +227,8 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable#isMutable() */ - public boolean isMutable() { + @Override + public boolean isMutable() { //7.1.1-8 mutable can only apply to class members return false; } @@ -221,14 +236,16 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto() */ - public boolean isAuto() { + @Override + public boolean isAuto() { return hasStorageClass(IASTDeclSpecifier.sc_auto); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister() */ - public boolean isRegister() { + @Override + public boolean isRegister() { return hasStorageClass(IASTDeclSpecifier.sc_register); } @@ -264,14 +281,17 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI return null; } + @Override public boolean hasDefaultValue() { return getDefaultValue() != null; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public boolean isExternC() { return false; } @@ -282,14 +302,17 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI return name.length() != 0 ? name : ""; //$NON-NLS-1$ } + @Override public IBinding getOwner() { return CPPVisitor.findEnclosingFunction(fDeclarations[0]); } + @Override public IValue getInitialValue() { return null; } + @Override public IBinding resolveFinalBinding(CPPASTNameBase name) { // check if the binding has been updated. IBinding current= name.getPreBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java index c5dc6cd4457..7369fe71858 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java @@ -28,16 +28,19 @@ public class CPPParameterPackType implements ICPPParameterPackType, ITypeContain setType(type); } - public IType getType() { + @Override + public IType getType() { return fType; } - public void setType(IType t) { + @Override + public void setType(IType t) { assert t != null; fType= t; } - public boolean isSameType(IType obj) { + @Override + public boolean isSameType(IType obj) { if (obj == this) return true; if (obj instanceof ITypedef) @@ -67,6 +70,7 @@ public class CPPParameterPackType implements ICPPParameterPackType, ITypeContain return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.PACK_EXPANSION; buffer.putByte((byte) firstByte); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java index 24d857d9776..93628b1d04d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java @@ -36,10 +36,12 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#getType() */ + @Override public IType getType() { return fType; } + @Override public boolean isParameterPack() { return fType instanceof ICPPParameterPackType; } @@ -53,6 +55,7 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic() */ + @Override public boolean isStatic() { return false; } @@ -60,39 +63,46 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern() */ - public boolean isExtern() { + @Override + public boolean isExtern() { return false; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto() */ - public boolean isAuto() { + @Override + public boolean isAuto() { return getParameter().isAuto(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister() */ - public boolean isRegister() { + @Override + public boolean isRegister() { return getParameter().isRegister(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable#isMutable() */ - public boolean isMutable() { + @Override + public boolean isMutable() { return false; } + @Override public boolean hasDefaultValue() { return getParameter().hasDefaultValue(); } + @Override public boolean isExternC() { return false; } + @Override public IValue getInitialValue() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java index a89e4b4c3d5..e0ae6bca75f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java @@ -67,6 +67,7 @@ public class CPPPointerToMemberType extends CPPPointerType implements ICPPPointe /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPPointerToMemberType#getMemberOfClass() */ + @Override public IType getMemberOfClass() { if (classType == null) { IASTName name; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java index f034402d957..7687f116c24 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java @@ -31,7 +31,8 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial setType(type); } - public boolean isSameType(IType o) { + @Override + public boolean isSameType(IType o) { if (o instanceof ITypedef) return o.isSameType(this); if (!(o instanceof IQualifierType)) @@ -46,25 +47,29 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isConst() */ - public boolean isConst() { + @Override + public boolean isConst() { return isConst; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isVolatile() */ - public boolean isVolatile() { + @Override + public boolean isVolatile() { return isVolatile; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IQualifierType#getType() */ - public IType getType() { + @Override + public IType getType() { return type; } - public void setType(IType t) { + @Override + public void setType(IType t) { assert t != null; type = t; } @@ -85,6 +90,7 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.CVQUALIFIER; if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java index b825ccbbd82..d25aff00651 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java @@ -29,15 +29,18 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer setType(type); } - public IType getType() { + @Override + public IType getType() { return fType; } + @Override public boolean isRValueReference() { return fIsRValue; } - public void setType(IType t) { + @Override + public void setType(IType t) { if (t instanceof ICPPReferenceType) { final ICPPReferenceType rt = (ICPPReferenceType) t; fIsRValue = fIsRValue && rt.isRValueReference(); @@ -47,7 +50,8 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer fType= t; } - public boolean isSameType(IType obj) { + @Override + public boolean isSameType(IType obj) { if (obj == this) return true; if (obj instanceof ITypedef) @@ -103,6 +107,7 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer return ASTTypeUtil.getType(this); } + @Override public void marshal(ITypeMarshalBuffer buffer) throws CoreException { int firstByte= ITypeMarshalBuffer.REFERENCE; if (isRValueReference()) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java index 15707e5fcdb..d2ebbe45255 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java @@ -225,7 +225,7 @@ abstract public class CPPScope implements ICPPASTInternalScope { if (fileSet != null) { bindings= fileSet.filterFileLocalBindings(bindings); } - result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, bindings); + result = ArrayUtil.addAll(IBinding.class, result, bindings); } catch (CoreException e) { CCorePlugin.log(e); } @@ -239,7 +239,7 @@ abstract public class CPPScope implements ICPPASTInternalScope { if (fileSet != null) { bindings= fileSet.filterFileLocalBindings(bindings); } - result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, bindings); + result = ArrayUtil.addAll(IBinding.class, result, bindings); } } catch (CoreException e) { CCorePlugin.log(e); @@ -248,7 +248,7 @@ abstract public class CPPScope implements ICPPASTInternalScope { } } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } @@ -289,7 +289,7 @@ abstract public class CPPScope implements ICPPASTInternalScope { result = addCandidate(obj, name, forceResolve, checkPointOfDecl, result); } } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } private IBinding[] addCandidate(Object candidate, IASTName name, boolean forceResolve, @@ -319,7 +319,7 @@ abstract public class CPPScope implements ICPPASTInternalScope { binding= (IBinding) candidate; } - return (IBinding[]) ArrayUtil.append(IBinding.class, result, binding); + return ArrayUtil.append(IBinding.class, result, binding); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java index 7fe24052b59..cf8bb539ebf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java @@ -60,12 +60,15 @@ public class CPPScopeMapper { fContainer= container; fNominated= inline; } + @Override public IScope getContainingScope() { return fContainer; } + @Override public ICPPNamespaceScope getNominatedScope() throws DOMException { return fNominated; } + @Override public int getPointOfDeclaration() { return 0; } @@ -84,25 +87,32 @@ public class CPPScopeMapper { assert fScope instanceof IIndexScope; } + @Override public EScopeKind getKind() { return fScope.getKind(); } + @Override public IBinding[] find(String name) { return fScope.find(name); } + @Override public IBinding getBinding(IASTName name, boolean resolve) { return fScope.getBinding(name, resolve); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet acceptLocalBindings) { return fScope.getBinding(name, resolve, acceptLocalBindings); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) { return fScope.getBindings(name, resolve, prefixLookup); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet acceptLocalBindings) { return fScope.getBindings(name, resolve, prefixLookup, acceptLocalBindings); } + @Override public IScope getParent() throws DOMException { IScope parent= fScope.getParent(); if (parent instanceof IIndexScope) { @@ -111,10 +121,12 @@ public class CPPScopeMapper { return fTu.getScope(); } + @Override public IName getScopeName() { return fScope.getScopeName(); } + @Override public void addUsingDirective(ICPPUsingDirective usingDirective) { initUsingDirectives(); fUsingDirectives.add(usingDirective); @@ -130,11 +142,13 @@ public class CPPScopeMapper { } } + @Override public ICPPUsingDirective[] getUsingDirectives() { initUsingDirectives(); return fUsingDirectives.toArray(new ICPPUsingDirective[fUsingDirectives.size()]); } + @Override public ICPPNamespaceScope[] getEnclosingNamespaceSet() { if (fEnclosingNamespaceSet == null) return fEnclosingNamespaceSet= CPPNamespaceScope.computeEnclosingNamespaceSet(this); @@ -142,6 +156,7 @@ public class CPPScopeMapper { return fEnclosingNamespaceSet; } + @Override public boolean isInlineNamepace() { IIndexBinding binding = ((IIndexScope) fScope).getScopeBinding(); if (binding instanceof ICPPNamespace && ((ICPPNamespace) binding).isInline()) @@ -150,6 +165,7 @@ public class CPPScopeMapper { return false; } + @Override public ICPPInternalNamespaceScope[] getInlineNamespaces() { // Obtain the inline namespaces from the index and map them to the ast ICPPNamespaceScope[] pre = fScope.getInlineNamespaces(); @@ -173,6 +189,7 @@ public class CPPScopeMapper { fDirective= ud; } + @Override public IScope getContainingScope() { final IScope scope= fDirective.getContainingScope(); if (scope == null) { @@ -181,10 +198,12 @@ public class CPPScopeMapper { return scope; } + @Override public ICPPNamespaceScope getNominatedScope() throws DOMException { return fDirective.getNominatedScope(); } + @Override public int getPointOfDeclaration() { return fOffset; } @@ -208,7 +227,7 @@ public class CPPScopeMapper { final char[] nameChars = name.getLookupKey(); if (nameChars.length > 0) { IASTName[] names= fClasses.get(nameChars); - names= (IASTName[]) ArrayUtil.append(IASTName.class, names, name); + names= ArrayUtil.append(IASTName.class, names, name); fClasses.put(nameChars, names); } return PROCESS_CONTINUE; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java index 953ef4203ce..87c4757dda6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java @@ -92,22 +92,27 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp } } + @Override public IBinding getSpecializedBinding() { return specialized; } + @Override public IASTNode[] getDeclarations() { return declarations; } + @Override public IASTNode getDefinition() { return definition; } + @Override public void addDefinition(IASTNode node) { definition = node; } + @Override public void addDeclaration(IASTNode node) { if (declarations == null) { declarations = new IASTNode[] { node }; @@ -115,25 +120,29 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp // keep the lowest offset declaration in [0] if (declarations.length > 0 && ((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) { - declarations = (IASTNode[]) ArrayUtil.prepend(IASTNode.class, declarations, node); + declarations = ArrayUtil.prepend(IASTNode.class, declarations, node); } else { - declarations = (IASTNode[]) ArrayUtil.append(IASTNode.class, declarations, node); + declarations = ArrayUtil.append(IASTNode.class, declarations, node); } } } + @Override public String getName() { return specialized.getName(); } + @Override public char[] getNameCharArray() { return specialized.getNameCharArray(); } + @Override public IBinding getOwner() { return owner; } + @Override public IScope getScope() throws DOMException { if (owner instanceof ICPPClassType) { return ((ICPPClassType) owner).getCompositeScope(); @@ -150,29 +159,35 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp return specialized.getScope(); } + @Override public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } + @Override public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } + @Override public boolean isGloballyQualified() throws DOMException { if (specialized instanceof ICPPBinding) return ((ICPPBinding) specialized).isGloballyQualified(); return false; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override @Deprecated public ObjectMap getArgumentMap() { return CPPTemplates.getArgumentMap(this, getTemplateParameterMap()); } + @Override public ICPPTemplateParameterMap getTemplateParameterMap() { return argumentMap; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java index e9b268a29c7..77956c14b9f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java @@ -35,30 +35,37 @@ public class CPPTemplateArgument implements ICPPTemplateArgument { fValue= null; } + @Override public boolean isTypeValue() { return fValue == null; } + @Override public boolean isNonTypeValue() { return fValue != null; } + @Override public IType getTypeValue() { return isTypeValue() ? fType : null; } + @Override public IValue getNonTypeValue() { return fValue; } + @Override public IType getTypeOfNonTypeValue() { return isNonTypeValue() ? fType : null; } + @Override public boolean isPackExpansion() { return fType instanceof ICPPParameterPackType; } + @Override public ICPPTemplateArgument getExpansionPattern() { if (fType instanceof ICPPParameterPackType) { IType t= ((ICPPParameterPackType) fType).getType(); @@ -72,6 +79,7 @@ public class CPPTemplateArgument implements ICPPTemplateArgument { return null; } + @Override public boolean isSameValue(ICPPTemplateArgument arg) { if (fValue != null) { return fValue.equals(arg.getNonTypeValue()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java index c914bbe3eb2..a9e1c000d37 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java @@ -227,7 +227,7 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC result = (ICPPTemplateParameter[]) ArrayUtil.append(ICPPTemplateParameter.class, result, p); } } - templateParameters = (ICPPTemplateParameter[]) ArrayUtil.trim(ICPPTemplateParameter.class, result); + templateParameters = ArrayUtil.trim(ICPPTemplateParameter.class, result); } return templateParameters; } @@ -271,9 +271,9 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC } else { // keep the lowest offset declaration in[0] if (declarations.length > 0 && ((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) { - declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, declName); + declarations = ArrayUtil.prepend(IASTName.class, declarations, declName); } else { - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, declName); + declarations = ArrayUtil.append(IASTName.class, declarations, declName); } } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java index 4a751d5a1e6..444d85a0316 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java @@ -92,6 +92,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ + @Override public final String getName() { return new String(getNameCharArray()); } @@ -99,6 +100,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ + @Override public final char[] getNameCharArray() { // Search for the first declaration that has a name. for (IASTName decl : declarations) { @@ -112,14 +114,17 @@ public abstract class CPPTemplateParameter extends PlatformObject return CharArrayUtils.EMPTY; } + @Override public int getParameterID() { return fParameterID; } + @Override public short getParameterPosition() { return (short) fParameterID; } + @Override public short getTemplateNestingLevel() { return (short) (fParameterID >> 16); } @@ -139,6 +144,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ + @Override public IScope getScope() { return CPPVisitor.getContainingScope(getPrimaryDeclaration()); } @@ -146,6 +152,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName() */ + @Override public String[] getQualifiedName() { return new String[] { getName() }; } @@ -153,6 +160,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray() */ + @Override public char[][] getQualifiedNameCharArray() { return new char[][] {getNameCharArray() }; } @@ -160,6 +168,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified() */ + @Override public boolean isGloballyQualified() { return false; } @@ -167,6 +176,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#getDeclarations() */ + @Override public IASTName[] getDeclarations() { return declarations; } @@ -174,6 +184,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#getDefinition() */ + @Override public IASTNode getDefinition() { if (declarations != null && declarations.length > 0) return declarations[0]; @@ -183,6 +194,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public void addDefinition(IASTNode node) { addDeclaration(node); } @@ -190,6 +202,7 @@ public abstract class CPPTemplateParameter extends PlatformObject /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDeclaration(org.eclipse.cdt.core.dom.ast.IASTNode) */ + @Override public void addDeclaration(IASTNode node) { if (!(node instanceof IASTName)) return; @@ -201,13 +214,14 @@ public abstract class CPPTemplateParameter extends PlatformObject return; // keep the lowest offset declaration in [0] if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode)declarations[0]).getOffset()) { - declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name); + declarations = ArrayUtil.prepend(IASTName.class, declarations, name); } else { - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name); + declarations = ArrayUtil.append(IASTName.class, declarations, name); } } } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } @@ -217,6 +231,7 @@ public abstract class CPPTemplateParameter extends PlatformObject return getName(); } + @Override public IBinding getOwner() { if (declarations == null || declarations.length == 0) return null; @@ -232,6 +247,7 @@ public abstract class CPPTemplateParameter extends PlatformObject return CPPTemplates.getContainingTemplate((ICPPASTTemplateParameter) node); } + @Override public IBinding resolveFinalBinding(CPPASTNameBase name) { // check if the binding has been updated. IBinding current= name.getPreBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java index 3d5bc411e5b..bb7d051db56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java @@ -73,6 +73,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { /** * Returns the value for the given parameter. */ + @Override public ICPPTemplateArgument getArgument(ICPPTemplateParameter param) { if (param == null) return null; @@ -83,6 +84,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { * Returns the value for the template parameter with the given id. * @see ICPPTemplateParameter#getParameterID() */ + @Override public ICPPTemplateArgument getArgument(int paramID) { final Object object = fMap.get(paramID); if (object instanceof ICPPTemplateArgument) { @@ -94,6 +96,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { /** * Returns the values for the given template parameter pack. */ + @Override public ICPPTemplateArgument[] getPackExpansion(ICPPTemplateParameter tpar) { return getPackExpansion(tpar.getParameterID()); } @@ -102,6 +105,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { * Returns the values for the template parameter pack with the given id. * @see ICPPTemplateParameter#getParameterID() */ + @Override public ICPPTemplateArgument[] getPackExpansion(int paramID) { final Object object = fMap.get(paramID); if (object instanceof ICPPTemplateArgument[]) { @@ -197,6 +201,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap { /** * Returns the array of template parameter positions, for which a mapping exists. */ + @Override public Integer[] getAllParameterPositions() { return fMap.keyArray(Integer.class); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java index 6057105f843..310ec0cfbeb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java @@ -27,14 +27,17 @@ public class CPPTemplateScope extends CPPScope implements ICPPTemplateScope { super(physicalNode); } + @Override public EScopeKind getKind() { return EScopeKind.eTemplateDeclaration; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return null; } + @Override public ICPPASTTemplateDeclaration getTemplateDeclaration() { return (ICPPASTTemplateDeclaration) getPhysicalNode(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java index 38afe6913f3..27a1f197756 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java @@ -86,7 +86,7 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement result = (ICPPTemplateParameter[]) ArrayUtil.append(ICPPTemplateParameter.class, result, binding); } } - templateParameters = (ICPPTemplateParameter[]) ArrayUtil.trim(ICPPTemplateParameter.class, result); + templateParameters = ArrayUtil.trim(ICPPTemplateParameter.class, result); } return templateParameters; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java index cf1e2ad30c4..64a1905dfef 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java @@ -24,6 +24,7 @@ public class CPPTemplateTemplateParameterScope extends CPPScope { super(parameter); } + @Override public EScopeKind getKind() { return EScopeKind.eLocal; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java index 1d1cef89537..ec47f888fbd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java @@ -36,10 +36,12 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements fIsParameterPack= isPack; } + @Override public final boolean isParameterPack() { return fIsParameterPack; } + @Override public ICPPScope asScope() { if (unknownScope == null) { IASTName n = null; @@ -51,6 +53,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements return unknownScope; } + @Override public IType getDefault() { IASTName[] nds = getDeclarations(); if (nds == null || nds.length == 0) @@ -69,6 +72,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements return null; } + @Override public ICPPTemplateArgument getDefaultValue() { IType t= getDefault(); if (t == null) @@ -77,7 +81,8 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements return new CPPTemplateArgument(t); } - public boolean isSameType(IType type) { + @Override + public boolean isSameType(IType type) { if (type == this) return true; if (type instanceof ITypedef) @@ -88,6 +93,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements return getParameterID() == ((ICPPTemplateParameter) type).getParameterID(); } + @Override public IASTName getUnknownName() { return new CPPASTName(getNameCharArray()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java index 1374189dd2d..6974a726823 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java @@ -154,9 +154,9 @@ public class CPPTypedef extends PlatformObject implements ITypedef, ITypeContain // Keep the lowest offset declaration in [0] if (declarations.length > 0 && ((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) { - declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name); + declarations = ArrayUtil.prepend(IASTName.class, declarations, name); } else { - declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name); + declarations = ArrayUtil.append(IASTName.class, declarations, name); } } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java index 54ca87d2101..52f6968bc62 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java @@ -52,7 +52,8 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ITypedef#getType() */ - public IType getType() { + @Override + public IType getType() { return getType(MAX_TYPE_NESTING); } @@ -114,7 +115,8 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) */ - public boolean isSameType(IType o) { + @Override + public boolean isSameType(IType o) { if (o == this) return true; if (o instanceof ITypedef) { @@ -130,6 +132,7 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType return false; } + @Override public void setType(IType type) { this.type = type; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java index 406f9392e78..b99f7bead64 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java @@ -43,41 +43,51 @@ public class CPPUnknownBinding extends PlatformObject fOwner= owner; } - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return null; } - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { return null; } - public void addDefinition(IASTNode node) { + @Override + public void addDefinition(IASTNode node) { } - public void addDeclaration(IASTNode node) { + @Override + public void addDeclaration(IASTNode node) { } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } - public boolean isGloballyQualified() { + @Override + public boolean isGloballyQualified() { return false; } - public String getName() { + @Override + public String getName() { return name.toString(); } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name.getSimpleID(); } - public IScope getScope() throws DOMException { + @Override + public IScope getScope() throws DOMException { // Use getOwner(), it is overridden by derived classes. final IBinding owner = getOwner(); if (owner instanceof ICPPUnknownBinding) { @@ -92,13 +102,15 @@ public class CPPUnknownBinding extends PlatformObject return null; } - public ICPPScope asScope() { + @Override + public ICPPScope asScope() { if (unknownScope == null) { unknownScope = new CPPUnknownScope(this, name); } return unknownScope; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } @@ -117,10 +129,12 @@ public class CPPUnknownBinding extends PlatformObject return getName(); } + @Override public IASTName getUnknownName() { return name; } + @Override public IBinding getOwner() { return fOwner; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java index 47d12562692..ad24ae0b606 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java @@ -37,51 +37,63 @@ public class CPPUnknownClass extends CPPUnknownBinding implements ICPPUnknownCla super(binding, name); } - public ICPPBase[] getBases() { + @Override + public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } - public IField[] getFields() { + @Override + public IField[] getFields() { return IField.EMPTY_FIELD_ARRAY; } - public IField findField(String name) { + @Override + public IField findField(String name) { return null; } - public ICPPField[] getDeclaredFields() { + @Override + public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } - public ICPPMethod[] getMethods() { + @Override + public ICPPMethod[] getMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPMethod[] getAllDeclaredMethods() { + @Override + public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPMethod[] getDeclaredMethods() { + @Override + public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPConstructor[] getConstructors() { + @Override + public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } - public IBinding[] getFriends() { + @Override + public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } - public int getKey(){ + @Override + public int getKey(){ return 0; } - public final IScope getCompositeScope() { + @Override + public final IScope getCompositeScope() { return asScope(); } - public boolean isSameType(IType type) { + @Override + public boolean isSameType(IType type) { if (this == type) return true; @@ -103,10 +115,12 @@ public class CPPUnknownClass extends CPPUnknownBinding implements ICPPUnknownCla return false; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } + @Override public boolean isAnonymous() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java index 0f3c3af4587..d83258844ef 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java @@ -31,6 +31,7 @@ public class CPPUnknownClassInstance extends CPPUnknownClass implements ICPPUnkn this.arguments = arguments; } + @Override public ICPPTemplateArgument[] getArguments() { return arguments; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java index 85bf91bb0c9..2c0e8bcf8cc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java @@ -23,30 +23,37 @@ public class CPPUnknownConstructor extends CPPUnknownFunction implements ICPPCon super(owner, owner.getNameCharArray()); } + @Override public boolean isExplicit() { return false; } + @Override public boolean isDestructor() { return false; } + @Override public boolean isImplicit() { return false; } + @Override public boolean isPureVirtual() { return false; } + @Override public boolean isVirtual() { return false; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return v_public; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java index 7958038e3c9..88663d1e776 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java @@ -39,34 +39,42 @@ public class CPPUnknownFunction extends CPPUnknownBinding implements ICPPFunctio super(owner, name); } + @Override public IType[] getExceptionSpecification() { return null; } + @Override public boolean isDeleted() { return false; } + @Override public boolean isExternC() { return false; } + @Override public boolean isInline() { return false; } + @Override public boolean isMutable() { return false; } + @Override public IScope getFunctionScope() { return asScope(); } + @Override public ICPPParameter[] getParameters() { return ICPPParameter.EMPTY_CPPPARAMETER_ARRAY; } + @Override public ICPPFunctionType getType() { if (fType == null) { fType= new CPPUnknownFunctionType(); @@ -74,30 +82,37 @@ public class CPPUnknownFunction extends CPPUnknownBinding implements ICPPFunctio return fType; } + @Override public boolean isAuto() { return false; } + @Override public boolean isExtern() { return false; } + @Override public boolean isRegister() { return false; } + @Override public boolean isStatic() { return false; } + @Override public boolean takesVarArgs() { return false; } + @Override public int getRequiredArgumentCount() { return 0; } + @Override public boolean hasParameterPack() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java index d4807ecdfdf..79b68c06656 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java @@ -38,19 +38,23 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl this.delegates= bindings; } - public IBinding[] getDelegates() { + @Override + public IBinding[] getDelegates() { return delegates; } - public String[] getQualifiedName() { + @Override + public String[] getQualifiedName() { return CPPVisitor.getQualifiedName(this); } - public char[][] getQualifiedNameCharArray() { + @Override + public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } - public boolean isGloballyQualified() throws DOMException { + @Override + public boolean isGloballyQualified() throws DOMException { IScope scope = getScope(); while (scope != null) { if(scope instanceof ICPPBlockScope) @@ -60,23 +64,28 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl return true; } - public String getName() { + @Override + public String getName() { return new String(getNameCharArray()); } - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name.getSimpleID(); } - public IScope getScope() { + @Override + public IScope getScope() { return CPPVisitor.getContainingScope(name.getParent()); } - public IASTNode[] getDeclarations() { + @Override + public IASTNode[] getDeclarations() { return null; } - public IASTNode getDefinition() { + @Override + public IASTNode getDefinition() { IASTNode n = name.getParent(); if (n instanceof ICPPASTTemplateId) n = n.getParent(); @@ -84,16 +93,20 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl return n; } - public void addDefinition(IASTNode node) { + @Override + public void addDefinition(IASTNode node) { } - public void addDeclaration(IASTNode node) { + @Override + public void addDeclaration(IASTNode node) { } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding getOwner() { return CPPVisitor.findDeclarationOwner(name, true); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java index 3e8ebd91cea..2ac509e168b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java @@ -32,6 +32,7 @@ public class CPPUsingDeclarationSpecialization extends CPPSpecialization impleme super(specialized, owner, tpmap); } + @Override public IBinding[] getDelegates() { if (fDelegates == null) { fDelegates= specializeDelegates(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java index 195de6660bf..119ce9cdcf0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java @@ -46,6 +46,7 @@ public class CPPUsingDirective implements ICPPUsingDirective { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getNamespaceScope() */ + @Override public ICPPNamespaceScope getNominatedScope() throws DOMException { IBinding binding= fNamespaceName.resolveBinding(); if (binding instanceof ICPPNamespace) { @@ -57,6 +58,7 @@ public class CPPUsingDirective implements ICPPUsingDirective { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getPointOfDeclaration() */ + @Override public int getPointOfDeclaration() { final ASTNode astNode = (ASTNode) fNamespaceName; return astNode.getOffset() + astNode.getLength(); @@ -65,6 +67,7 @@ public class CPPUsingDirective implements ICPPUsingDirective { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getContainingScope() */ + @Override public IScope getContainingScope() { return CPPVisitor.getContainingScope(fNamespaceName); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java index 4410727af14..bfa9f6b0498 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java @@ -100,9 +100,9 @@ public class CPPVariable extends PlatformObject implements ICPPVariable, ICPPInt // keep the lowest offset declaration at the first position if (fDeclarations.length > 0 && ((ASTNode) node).getOffset() < ((ASTNode) fDeclarations[0]).getOffset()) { - fDeclarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, fDeclarations, name); + fDeclarations = ArrayUtil.prepend(IASTName.class, fDeclarations, name); } else { - fDeclarations = (IASTName[]) ArrayUtil.append(IASTName.class, fDeclarations, name); + fDeclarations = ArrayUtil.append(IASTName.class, fDeclarations, name); } } // array types may be incomplete diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java index 4dd50a7d918..84394d52ea8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java @@ -237,7 +237,7 @@ public class ClassTypeHelper { } } } - return (ICPPField[]) ArrayUtil.trim(ICPPField.class, result); + return ArrayUtil.trim(ICPPField.class, result); } /** @@ -291,9 +291,9 @@ public class ClassTypeHelper { ICPPMethod[] methods= ct.getDeclaredMethods(); ICPPClassType[] bases= getAllBases(ct); for (ICPPClassType base : bases) { - methods = (ICPPMethod[]) ArrayUtil.addAll(ICPPMethod.class, methods, base.getDeclaredMethods()); + methods = ArrayUtil.addAll(ICPPMethod.class, methods, base.getDeclaredMethods()); } - return (ICPPMethod[]) ArrayUtil.trim(ICPPMethod.class, methods); + return ArrayUtil.trim(ICPPMethod.class, methods); } public static ICPPMethod[] getMethods(ICPPClassType ct) { @@ -376,7 +376,7 @@ public class ClassTypeHelper { } } } - return (ICPPMethod[]) ArrayUtil.trim(ICPPMethod.class, result); + return ArrayUtil.trim(ICPPMethod.class, result); } /* (non-Javadoc) @@ -421,16 +421,16 @@ public class ClassTypeHelper { result = (ICPPClassType[])ArrayUtil.append(ICPPClassType.class, result, binding); } } - return (ICPPClassType[]) ArrayUtil.trim(ICPPClassType.class, result); + return ArrayUtil.trim(ICPPClassType.class, result); } public static IField[] getFields(ICPPClassType ct) { IField[] fields = ct.getDeclaredFields(); ICPPClassType[] bases = getAllBases(ct); for (ICPPClassType base : bases) { - fields = (IField[]) ArrayUtil.addAll(IField.class, fields, base.getDeclaredFields()); + fields = ArrayUtil.addAll(IField.class, fields, base.getDeclaredFields()); } - return (IField[]) ArrayUtil.trim(IField.class, fields); + return ArrayUtil.trim(IField.class, fields); } public static IField findField(ICPPClassType ct, String name) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java index 8b73bb6d741..f0a3aa88b97 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java @@ -2364,9 +2364,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser { markBeforDtor= null; dtor= addInitializer(e, declOption); } - declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, dtor); + declarators = ArrayUtil.append(IASTDeclarator.class, declarators, dtor); } - declarators = (IASTDeclarator[]) ArrayUtil.removeNulls(IASTDeclarator.class, declarators); + declarators = ArrayUtil.removeNulls(IASTDeclarator.class, declarators); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java index d37ea4bc93e..4d3b7d3344e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java @@ -44,11 +44,13 @@ public class GPPASTSimpleDeclSpecifier extends CPPASTSimpleDeclSpecifier impleme return copy; } - public void setTypeofExpression(IASTExpression typeofExpression) { + @Override + public void setTypeofExpression(IASTExpression typeofExpression) { setDeclTypeExpression(typeofExpression); } - public IASTExpression getTypeofExpression() { + @Override + public IASTExpression getTypeofExpression() { return getDeclTypeExpression(); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java index 3a086562752..4dd8464e8fd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java @@ -33,6 +33,7 @@ public interface ICPPClassSpecializationScope extends ICPPClassScope { /** * The specialized class. */ + @Override ICPPClassSpecialization getClassType(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java index 2341cba3178..8bd724ab129 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java @@ -30,5 +30,6 @@ public interface ICPPDeferredClassInstance extends ICPPUnknownClassType, ICPPTem * arguments of this instance. * @since 5.1 */ + @Override public ICPPTemplateParameterMap getTemplateParameterMap(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java index 187a3a94e19..af964f6f7b8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java @@ -26,7 +26,8 @@ interface ICPPInternalClassTypeMixinHost extends ICPPClassType, ICPPInternalBind /** * {@inheritDoc} */ - ICPPClassScope getCompositeScope(); + @Override + ICPPClassScope getCompositeScope(); /** * Ensures the ICPPInternalBinding definition is set, if this is possible. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java index 139889242e6..1d2208a312a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java @@ -30,5 +30,6 @@ public interface ICPPInternalNamespaceScope extends ICPPNamespaceScope { /** * Returns the inline namespace scopes mapped back to the AST. */ + @Override public ICPPInternalNamespaceScope[] getInlineNamespaces(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java index 24316c3a014..bcda5244bcd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java @@ -42,103 +42,128 @@ class AutoTypeResolver implements ICPPFunctionTemplate { functionType = new CPPFunctionType(new CPPBasicType(Kind.eVoid, 0), new IType[] { paramType }); } + @Override public ICPPTemplateParameter[] getTemplateParameters() { return TEMPLATE_PARAMETERS; } + @Override public ICPPFunctionType getType() { return functionType; } + @Override public boolean isMutable() { return false; } + @Override public boolean isInline() { return false; } + @Override public boolean isExternC() { return false; } + @Override public boolean isDeleted() { return false; } + @Override public IType[] getExceptionSpecification() { return null; } + @Override public ICPPParameter[] getParameters() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public int getRequiredArgumentCount() { return 1; } + @Override public boolean hasParameterPack() { return false; } + @Override public IScope getFunctionScope() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public boolean isStatic() { return false; } + @Override public boolean isExtern() { return false; } + @Override public boolean isAuto() { return false; } + @Override public boolean isRegister() { return false; } + @Override public boolean takesVarArgs() { return false; } + @Override public String getName() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public char[] getNameCharArray() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public ILinkage getLinkage() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public IBinding getOwner() { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public IScope getScope() throws DOMException { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public String[] getQualifiedName() throws DOMException { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public char[][] getQualifiedNameCharArray() throws DOMException { throw new UnsupportedOperationException(UNEXPECTED_CALL); } + @Override public boolean isGloballyQualified() throws DOMException { throw new UnsupportedOperationException(UNEXPECTED_CALL); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java index f6a714cf3d6..c37e3b9b8e7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java @@ -29,18 +29,22 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding { fBindings = ArrayUtil.removeNulls(bindingList); } + @Override public String getName() { return fBindings[0].getName(); } + @Override public char[] getNameCharArray() { return fBindings[0].getNameCharArray(); } + @Override public IScope getScope() throws DOMException { return fBindings[0].getScope(); } + @Override public IBinding getOwner() { return fBindings[0].getOwner(); } @@ -49,15 +53,18 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding { return fBindings; } + @Override public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } + @Override public IBinding resolveFinalBinding(CPPASTNameBase astName) { return CPPSemantics.resolveTargetedFunction(astName, fBindings); } + @Override @SuppressWarnings("unchecked") public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (adapter.isAssignableFrom(getClass())) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java index fde5e727d38..761b47cb16e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java @@ -1449,7 +1449,7 @@ public class CPPSemantics { if (item instanceof ICPPASTLinkageSpecification) { IASTDeclaration[] decls = ((ICPPASTLinkageSpecification) item).getDeclarations(); if (decls != null && decls.length > 0) { - nodeStack = (IASTNode[][]) ArrayUtil.append(IASTNode[].class, nodeStack, nodes); + nodeStack = ArrayUtil.append(IASTNode[].class, nodeStack, nodes); nodeIdxStack = ArrayUtil.setInt(nodeIdxStack, ++nodeStackPos, idx); nodes = ((ICPPASTLinkageSpecification) item).getDeclarations(); idx = 0; @@ -1783,7 +1783,7 @@ public class CPPSemantics { IBinding[] result = null; for (Object binding : bindings) { if (binding instanceof IASTName) - result = (IBinding[]) ArrayUtil.append(IBinding.class, result, ((IASTName) binding).resolveBinding()); + result = ArrayUtil.append(IBinding.class, result, ((IASTName) binding).resolveBinding()); else if (binding instanceof IBinding) result = (IBinding[]) ArrayUtil.append(IBinding.class, result, binding); } @@ -2021,13 +2021,13 @@ public class CPPSemantics { IBinding[] bindings = null; if (cmp > 0) { - bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, obj); - bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, type); + bindings = ArrayUtil.append(IBinding.class, bindings, obj); + bindings = ArrayUtil.append(IBinding.class, bindings, type); } else { - bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, type); + bindings = ArrayUtil.append(IBinding.class, bindings, type); bindings = (IBinding[]) ArrayUtil.addAll(IBinding.class, bindings, fns.keyArray()); } - bindings = (IBinding[]) ArrayUtil.trim(IBinding.class, bindings); + bindings = ArrayUtil.trim(IBinding.class, bindings); ICPPUsingDeclaration composite = new CPPUsingDeclaration(data.astName, bindings); return composite; } @@ -2328,7 +2328,7 @@ public class CPPSemantics { } public static IBinding resolveFunction(LookupData data, ICPPFunction[] fns, boolean allowUDC) throws DOMException { - fns= (ICPPFunction[]) ArrayUtil.trim(ICPPFunction.class, fns); + fns= ArrayUtil.trim(ICPPFunction.class, fns); if (fns == null || fns.length == 0) return null; @@ -2413,7 +2413,7 @@ public class CPPSemantics { bestFnCost= fnCost; ambiguousFunctions= null; } else if (cmp == 0) { - ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, fn); + ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, fn); } } @@ -2425,7 +2425,7 @@ public class CPPSemantics { bestFnCost= fnCost; ambiguousFunctions= null; } else if (cmp == 0) { - ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, fnCost.getFunction()); + ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, fnCost.getFunction()); } } } @@ -2435,7 +2435,7 @@ public class CPPSemantics { return null; if (ambiguousFunctions != null) { - ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, bestFnCost.getFunction()); + ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, bestFnCost.getFunction()); return new ProblemBinding(data.astName, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, ambiguousFunctions); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java index c8255cfca5a..c46a0b1e620 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java @@ -533,7 +533,7 @@ public class CPPTemplates { parent = parent.getParent(); templates = (ICPPASTTemplateDeclaration[]) ArrayUtil.append(ICPPASTTemplateDeclaration.class, templates, parent); } - templates = (ICPPASTTemplateDeclaration[]) ArrayUtil.trim(ICPPASTTemplateDeclaration.class, templates); + templates = ArrayUtil.trim(ICPPASTTemplateDeclaration.class, templates); ICPPASTTemplateDeclaration templateDeclaration = templates[0]; IASTDeclaration decl = templateDeclaration.getDeclaration(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index e97fe4f13e1..f8229c7fbe0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -2289,9 +2289,9 @@ public class CPPVisitor extends ASTQueries { continue; } - ns = (String[]) ArrayUtil.append(String.class, ns, n); + ns = ArrayUtil.append(String.class, ns, n); } - ns = (String[]) ArrayUtil.trim(String.class, ns); + ns = ArrayUtil.trim(String.class, ns); String[] result = new String[ns.length + 1]; for (int i = ns.length - 1; i >= 0; i--) { result[ns.length - i - 1] = ns[i]; @@ -2311,10 +2311,10 @@ public class CPPVisitor extends ASTQueries { if (owner instanceof ICPPNamespace && n.length == 0) continue; - ns = (char[][]) ArrayUtil.append(n.getClass(), ns, n); + ns = ArrayUtil.append(n.getClass(), ns, n); } final char[] bname = binding.getNameCharArray(); - ns = (char[][]) ArrayUtil.trim(bname.getClass(), ns); + ns = ArrayUtil.trim(bname.getClass(), ns); char[][] result = new char[ns.length + 1][]; for (int i = ns.length - 1; i >= 0; i--) { result[ns.length - i - 1] = ns[i]; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java index b6c39944c15..29f411715c5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java @@ -34,6 +34,7 @@ public class FunctionSetType implements IType { fPointerType= addressOf; } + @Override public boolean isSameType(IType type) { return type == this; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java index fd4578cb33b..8cb763dc3ff 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java @@ -29,6 +29,7 @@ class InitializerListType implements IType { fInitializerList= list; } + @Override public boolean isSameType(IType type) { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java index cde78f029fc..eca0003abaa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java @@ -20,6 +20,7 @@ class UniqueType implements IType { fForParameterPack= forParameterPack; } + @Override public boolean isSameType(IType type) { return type == this; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java index db3ed821391..40eb821584b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java @@ -62,7 +62,6 @@ import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ContainerNode; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ProblemRuntimeException; import org.eclipse.cdt.internal.core.dom.rewrite.commenthandler.NodeCommentMap; import org.eclipse.cdt.internal.core.dom.rewrite.util.FileHelper; -import org.eclipse.cdt.internal.formatter.CCodeFormatter; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; @@ -89,7 +88,7 @@ public class ChangeGenerator extends ASTVisitor { private CompositeChange change; private final ASTModificationStore modificationStore; - private NodeCommentMap commentMap; + private final NodeCommentMap commentMap; { shouldVisitArrayModifiers= true; @@ -372,7 +371,7 @@ public class ChangeGenerator extends ASTVisitor { DefaultCodeFormatterConstants.FALSE); CodeFormatter formatter = ToolFactory.createCodeFormatter(options); code = document.get(); - TextEdit[] formatEdits = formatter.format(CCodeFormatter.K_TRANSLATION_UNIT, code, + TextEdit[] formatEdits = formatter.format(CodeFormatter.K_TRANSLATION_UNIT, code, regionsAfter, TextUtilities.getDefaultLineDelimiter(document)); // For each of the regions we apply formatting changes and create a ReplaceEdit using diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java index 2c5a02188eb..47d06d5b46a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java @@ -27,6 +27,7 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC this.delegate = typedef; } + @Override public IType getType() { if (type == null) { return delegate.getType(); @@ -34,31 +35,38 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC return type; } + @Override public ILinkage getLinkage() { return delegate.getLinkage(); } + @Override public String getName() { return delegate.getName(); } + @Override public char[] getNameCharArray() { return delegate.getNameCharArray(); } + @Override public IScope getScope() throws DOMException { return delegate.getScope(); } + @Override public IBinding getOwner() { return delegate.getOwner(); } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { return delegate.getAdapter(adapter); } + @Override public boolean isSameType(IType type) { IType myrtype = getType(); if (myrtype == null) @@ -70,18 +78,22 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC return myrtype.isSameType(type); } + @Override public void setType(IType type) { this.type = type; } + @Override public String[] getQualifiedName() throws DOMException { return ((ICPPBinding) delegate).getQualifiedName(); } + @Override public char[][] getQualifiedNameCharArray() throws DOMException { return ((ICPPBinding) delegate).getQualifiedNameCharArray(); } + @Override public boolean isGloballyQualified() throws DOMException { return ((ICPPBinding) delegate).isGloballyQualified(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java index 404c0770b58..c7bea3b2613 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java @@ -18,6 +18,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; * this implementation is too slow. */ public class DefaultFragmentBindingComparator implements IIndexFragmentBindingComparator { + @Override public int compare(IIndexFragmentBinding a, IIndexFragmentBinding b) { int cmp= compareQualifiedNames(CPPVisitor.getQualifiedName(a), CPPVisitor.getQualifiedName(b)); if (cmp == 0) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java index acc91a98edc..383217ae74c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java @@ -39,136 +39,168 @@ final public class EmptyCIndex implements IIndex { private EmptyCIndex() { } + @Override public IIndexName[] findDeclarations(IBinding binding) { return IIndexFragmentName.EMPTY_NAME_ARRAY; } + @Override public IIndexName[] findDefinitions(IBinding binding) { return IIndexFragmentName.EMPTY_NAME_ARRAY; } + @Override public IIndexName[] findReferences(IBinding binding) { return IIndexFragmentName.EMPTY_NAME_ARRAY; } + @Override public IIndexName[] findNames(IBinding binding, int flags) { return IIndexFragmentName.EMPTY_NAME_ARRAY; } + @Override @Deprecated public IIndexFile getFile(int linkageID, IIndexFileLocation location) { return null; } + @Override public IIndexFile getFile(int linkageID, IIndexFileLocation location, ISignificantMacros significantFiles) throws CoreException { return null; } + @Override public IIndexFile[] getFiles(int linkageID, IIndexFileLocation location) throws CoreException { return IIndexFile.EMPTY_FILE_ARRAY; } + @Override public IIndexFile[] getFiles(IIndexFileLocation location) { return IIndexFile.EMPTY_FILE_ARRAY; } + @Override public IIndexFile resolveInclude(IIndexInclude include) { return null; } + @Override public IIndexInclude[] findIncludedBy(IIndexFile file) { return IIndexInclude.EMPTY_INCLUDES_ARRAY; } + @Override public IIndexInclude[] findIncludedBy(IIndexFile file, int depth) { return IIndexInclude.EMPTY_INCLUDES_ARRAY; } + @Override public IIndexInclude[] findIncludes(IIndexFile file) { return IIndexInclude.EMPTY_INCLUDES_ARRAY; } + @Override public IIndexInclude[] findIncludes(IIndexFile file, int depth) { return IIndexInclude.EMPTY_INCLUDES_ARRAY; } + @Override public void acquireReadLock() { } + @Override public void releaseReadLock() { } + @Override public boolean hasWaitingReaders() { return false; } + @Override public long getLastWriteAccess() { return 0; } + @Override public IIndexBinding findBinding(IName name) { return null; } + @Override public IIndexBinding[] findBindings(Pattern pattern, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding[] findBindings(Pattern[] pattern, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) throws CoreException { return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding adaptBinding(IBinding binding) { return null; } + @Override public IIndexBinding[] findBindingsForPrefix(char[] prefix, boolean filescope, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding[] findBindingsForContentAssist(char[] prefix, boolean filescope, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding[] findBindings(char[][] names, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding[] findBindings(char[] names, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexMacro[] findMacros(char[] name, IndexFilter filter, IProgressMonitor monitor) { return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY; } + @Override public IIndexMacro[] findMacrosForPrefix(char[] prefix, IndexFilter filter, IProgressMonitor monitor) { return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY; } + @Override public IIndexFileSet createFileSet() { return new IndexFileSet(); } + @Override public IIndexFile[] getAllFiles() { return IIndexFile.EMPTY_FILE_ARRAY; } + @Override public IIndexBinding[] findBindings(char[] name, boolean fileScopeOnly, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IIndexBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor) { return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY; } + @Override public IScope[] getInlineNamespaces() { return new IScope[0]; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java index 778a76ea282..61f6e0ac56a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java @@ -27,6 +27,7 @@ public interface IIndexFragmentBinding extends IIndexBinding { /** * Returns the linkage the binding belongs to. */ + @Override ILinkage getLinkage(); /** @@ -49,12 +50,14 @@ public interface IIndexFragmentBinding extends IIndexBinding { /** * Returns the scope that contains this binding, or null for bindings in global scope. */ + @Override IIndexScope getScope(); /** * {@inheritDoc} * @since 5.1 */ + @Override IIndexFragmentBinding getOwner(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java index 210261583b7..a8c922b561b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java @@ -54,6 +54,7 @@ public interface IIndexFragmentFile extends IIndexFile { /** * Returns the id of the linkage this file belongs to. */ + @Override int getLinkageID() throws CoreException; /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java index 12efd0e5f74..17ee9cf89fc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java @@ -31,10 +31,12 @@ public interface IIndexScope extends IScope { /** * Returns the parent scope or null if the scope is nested in the global scope. */ + @Override IIndexScope getParent(); /** * Returns the name of this scope. */ + @Override IIndexName getScopeName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java index cb0ce7d8864..10082a6ee7c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java @@ -32,6 +32,7 @@ public class IndexChangeEvent implements IIndexChangeEvent { fChangeEvent= new ChangeEvent(); } + @Override public ICProject getAffectedProject() { return fAffectedProject; } @@ -41,22 +42,27 @@ public class IndexChangeEvent implements IIndexChangeEvent { fChangeEvent= e; } + @Override public Set getFilesCleared() { return fChangeEvent.fClearedFiles; } + @Override public Set getFilesWritten() { return fChangeEvent.fFilesWritten; } + @Override public boolean isCleared() { return fChangeEvent.isCleared(); } + @Override public boolean isReloaded() { return fChangeEvent.isReloaded(); } + @Override public boolean hasNewFile() { return fChangeEvent.hasNewFiles(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java index 215ced10904..4f53ea73de6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java @@ -52,7 +52,7 @@ public class IndexFactory { } public IIndex getIndex(ICProject[] projects, int options) throws CoreException { - projects = (ICProject[]) ArrayUtil.removeNulls(ICProject.class, projects); + projects = ArrayUtil.removeNulls(ICProject.class, projects); boolean addDependencies= (options & ADD_DEPENDENCIES) != 0; boolean addDependent= (options & ADD_DEPENDENT) != 0; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java index 62b5a78801a..7d58439d30a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java @@ -32,6 +32,7 @@ public class IndexerStateEvent implements IIndexerStateEvent { fState= state; } + @Override public boolean indexerIsIdle() { return fState == STATE_IDLE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java index 0a0526da2c5..dca03afd456 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java @@ -38,37 +38,45 @@ public class WritableCIndex extends CIndex implements IWritableIndex { return result; } + @Override public IWritableIndexFragment getWritableFragment() { return fWritableFragment; } + @Override public IIndexFragmentFile getWritableFile(int linkageID, IIndexFileLocation location, ISignificantMacros macroDictionary) throws CoreException { return fWritableFragment.getFile(linkageID, location, macroDictionary); } + @Override public IIndexFragmentFile[] getWritableFiles(int linkageID, IIndexFileLocation location) throws CoreException { return fWritableFragment.getFiles(linkageID, location); } + @Override public IIndexFragmentFile[] getWritableFiles(IIndexFileLocation location) throws CoreException { return fWritableFragment.getFiles(location); } + @Override public IIndexFragmentFile addFile(int linkageID, IIndexFileLocation location, ISignificantMacros macroDictionary) throws CoreException { return fWritableFragment.addFile(linkageID, location, macroDictionary); } + @Override public IIndexFragmentFile addUncommittedFile(int linkageID, IIndexFileLocation location, ISignificantMacros macroDictionary) throws CoreException { return fWritableFragment.addUncommittedFile(linkageID, location, macroDictionary); } + @Override public IIndexFragmentFile commitUncommittedFile() throws CoreException { return fWritableFragment.commitUncommittedFile(); } + @Override public void clearUncommittedFile() throws CoreException { fWritableFragment.clearUncommittedFile(); } @@ -77,6 +85,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex { return frag == fWritableFragment; } + @Override public void setFileContent(IIndexFragmentFile file, int linkageID, IncludeInformation[] includes, IASTPreprocessorStatement[] macros, IASTName[][] names, ASTFilePathResolver resolver, YieldableIndexLock lock) throws CoreException, InterruptedException { @@ -94,15 +103,18 @@ public class WritableCIndex extends CIndex implements IWritableIndex { } } + @Override public void clear() throws CoreException { fWritableFragment.clear(); } + @Override public boolean isWritableFile(IIndexFile file) { return file instanceof IIndexFragmentFile && isWritableFragment(((IIndexFragmentFile)file).getIndexFragment()); } + @Override public void clearFile(IIndexFragmentFile file) throws CoreException { IIndexFragment indexFragment = file.getIndexFragment(); if (!isWritableFragment(indexFragment)) { @@ -128,6 +140,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex { fThread= null; } + @Override public void acquireWriteLock() throws InterruptedException { checkThread(); assert !fIsWriteLocked: "Multiple write locks is not allowed"; //$NON-NLS-1$ @@ -136,10 +149,12 @@ public class WritableCIndex extends CIndex implements IWritableIndex { fIsWriteLocked= true; } + @Override public void releaseWriteLock() { releaseWriteLock(true); } + @Override public void releaseWriteLock(boolean flush) { checkThread(); assert fIsWriteLocked: "No write lock to be released"; //$NON-NLS-1$ @@ -173,15 +188,18 @@ public class WritableCIndex extends CIndex implements IWritableIndex { super.clearResultCache(); } + @Override public void flush() throws CoreException { assert !fIsWriteLocked; fWritableFragment.flush(); } + @Override public long getDatabaseSizeBytes() { return fWritableFragment.getDatabaseSizeBytes(); } + @Override public void transferIncluders(IIndexFragmentFile source, IIndexFragmentFile target) throws CoreException { if (source == null || target == null || !isWritableFile(source) || !isWritableFile(target)) throw new IllegalArgumentException(); @@ -190,6 +208,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex { target.transferIncluders(source); } + @Override public void transferContext(IIndexFragmentFile source, IIndexFragmentFile target) throws CoreException { if (source == null || target == null || !isWritableFile(source) || !isWritableFile(target)) throw new IllegalArgumentException(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java index b10ff4aa34d..0017b69df52 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java @@ -64,6 +64,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory { /** * @see ICompositesFactory#getCompositeBindings(IIndexFragmentBinding[][]) */ + @Override public final IIndexBinding[] getCompositeBindings(IIndexFragmentBinding[][] fragmentBindings) { return getCompositeBindings(mergeBindingArrays(fragmentBindings)); } @@ -75,6 +76,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory { return result; } + @Override public final IIndexFragmentBinding[] findEquivalentBindings(IBinding binding) { CIndex cindex= (CIndex) index; try { @@ -139,6 +141,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory { this.comparators= comparators; } + @Override public int compare(IIndexFragmentBinding f1, IIndexFragmentBinding f2) { for (IIndexFragmentBindingComparator comparator : comparators) { int cmp= comparator.compare(f1, f2); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java index 8bf0fb56e2f..2cdf226499a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java @@ -46,18 +46,22 @@ public abstract class CompositeIndexBinding implements IIndexBinding { this.rbinding = rbinding; } + @Override public ILinkage getLinkage() { return rbinding.getLinkage(); } + @Override public String getName() { return rbinding.getName(); } + @Override public char[] getNameCharArray() { return rbinding.getNameCharArray(); } + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class adapter) { if (adapter.isInstance(rbinding)) { @@ -66,10 +70,12 @@ public abstract class CompositeIndexBinding implements IIndexBinding { return null; } + @Override public String[] getQualifiedName() { return new String[] { getName() }; } + @Override public IIndexScope getScope() { return cf.getCompositeScope(rbinding.getScope()); } @@ -87,10 +93,12 @@ public abstract class CompositeIndexBinding implements IIndexBinding { return rbinding.toString(); } + @Override public boolean isFileLocal() throws CoreException { return rbinding != null && rbinding.isFileLocal(); } + @Override public IIndexFile getLocalToFile() throws CoreException { return rbinding != null ? rbinding.getLocalToFile() : null; } @@ -110,6 +118,7 @@ public abstract class CompositeIndexBinding implements IIndexBinding { return rbinding.hashCode(); } + @Override public IIndexBinding getOwner() { final IIndexFragmentBinding owner= rbinding.getOwner(); if (owner == null) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java index 3fe5f8ba58e..9537c4dad99 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation - * Markus Schorn (Wind River Systems) + * Andrew Ferguson (Symbian) - Initial implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.index.composite; @@ -38,24 +38,26 @@ public abstract class CompositeScope implements IIndexScope { protected final IIndexFragmentBinding rbinding; public CompositeScope(ICompositesFactory cf, IIndexFragmentBinding rbinding) { - if(cf==null || rbinding==null) + if (cf == null || rbinding == null) throw new NullPointerException(); this.cf = cf; this.rbinding = rbinding; } + @Override public IIndexScope getParent() { IIndexScope rscope = rbinding.getScope(); - if(rscope!=null) { + if (rscope != null) { return cf.getCompositeScope(rscope); } return null; } + @Override public IIndexName getScopeName() { - if(rbinding instanceof IIndexScope) + if (rbinding instanceof IIndexScope) return ((IIndexScope) rbinding).getScopeName(); - if(rbinding instanceof ICPPClassType) + if (rbinding instanceof ICPPClassType) return (IIndexName) ((ICPPClassType) rbinding).getCompositeScope().getScopeName(); return null; } @@ -76,22 +78,22 @@ public abstract class CompositeScope implements IIndexScope { * @return a suitable binding at the composite layer */ protected final IBinding processUncertainBinding(IBinding binding) { - if(binding instanceof IIndexFragmentBinding) { + if (binding instanceof IIndexFragmentBinding) { return cf.getCompositeBinding((IIndexFragmentBinding)binding); - } else if(binding instanceof ProblemBinding) { + } else if (binding instanceof ProblemBinding) { return binding; - } else if(binding instanceof CPPCompositeBinding /* AST composite */) { + } else if (binding instanceof CPPCompositeBinding /* AST composite */) { return new CPPCompositeBinding( - processUncertainBindings(((CPPCompositeBinding)binding).getBindings()) + processUncertainBindings(((CPPCompositeBinding) binding).getBindings()) ); - } else if(binding instanceof CPPUsingDeclaration) { + } else if (binding instanceof CPPUsingDeclaration) { return binding; - } else if(binding == null) { + } else if (binding == null) { return null; - } else if(binding instanceof ICPPSpecialization) { + } else if (binding instanceof ICPPSpecialization) { return binding; } - CCorePlugin.log("CompositeFactory unsure how to process: "+binding.getClass().getName()); //$NON-NLS-1$ + CCorePlugin.log("CompositeFactory unsure how to process: " + binding.getClass().getName()); //$NON-NLS-1$ return binding; } @@ -102,9 +104,9 @@ public abstract class CompositeScope implements IIndexScope { * @return a non-null IBinding[] */ protected final IBinding[] processUncertainBindings(IBinding[] frgBindings) { - if(frgBindings != null) { + if (frgBindings != null) { IBinding[] result= new IBinding[frgBindings.length]; - for(int i=0; i result = new ArrayList(); IPDOMDescriptor[] descriptions = provider.getDescriptors(config); @@ -48,6 +49,7 @@ public class ReadOnlyPDOMProviderBridge implements IIndexFragmentProvider { return result.toArray(new IIndexFragment[result.size()]); } + @Override public boolean providesFor(ICProject cproject) throws CoreException { return provider.providesFor(cproject); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java index f95aa8167c7..25939c72be6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java @@ -39,6 +39,7 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa super(null); } + @Override public CodeReader createCodeReaderForInclusion(String path) { try { if (!new File(path).isFile()) @@ -49,6 +50,7 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa } } + @Override public CodeReader createCodeReaderForTranslationUnit(String path) { try { if (!new File(path).isFile()) @@ -59,10 +61,12 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa } } + @Override public ICodeReaderCache getCodeReaderCache() { return null; } + @Override public int getUniqueIdentifier() { return 0; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java index d22aaf80a50..0df000ab842 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java @@ -34,6 +34,7 @@ class CodeReaderCacheEntry implements ILRUCacheable { size = (int)Math.ceil(reader.buffer.length / CHAR_TO_KB_FACTOR); // get the size of the file in terms of KB } + @Override public int getCacheFootprint() { return size; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java index 3ac9468aaab..fae7015df1b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java @@ -44,6 +44,7 @@ public class CodeReaderFactoryAdapter extends AbstractCodeReaderFactory { fDelegate= fcp; } + @Override public org.eclipse.cdt.core.parser.CodeReader createCodeReaderForInclusion(String path) { return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(path, null)); } @@ -54,15 +55,18 @@ public class CodeReaderFactoryAdapter extends AbstractCodeReaderFactory { return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(ifl, astPath)); } + @Override public org.eclipse.cdt.core.parser.CodeReader createCodeReaderForTranslationUnit(String path) { return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(path, null)); } + @Override @Deprecated public org.eclipse.cdt.core.parser.ICodeReaderCache getCodeReaderCache() { return null; } + @Override public int getUniqueIdentifier() { return 0; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java index 9a1ede73052..63803aaba3d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java @@ -27,21 +27,24 @@ public final class EmptyIterator implements Iterator { /* (non-Javadoc) * @see java.util.Iterator#hasNext() */ - public final boolean hasNext() { + @Override + public final boolean hasNext() { return false; } /* (non-Javadoc) * @see java.util.Iterator#next() */ - public final T next() { + @Override + public final T next() { throw new NoSuchElementException(); } /* (non-Javadoc) * @see java.util.Iterator#remove() */ - public final void remove() { + @Override + public final void remove() { throw new UnsupportedOperationException(); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java index 314e83a5751..555666df72b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java @@ -83,10 +83,12 @@ abstract class ASTPreprocessorNode extends ASTNode { nodeSpec.visit(this); } + @Override public IASTNode copy() { throw new UnsupportedOperationException(); } + @Override public IASTNode copy(CopyStyle style) { throw new UnsupportedOperationException(); } @@ -115,14 +117,17 @@ class ASTComment extends ASTPreprocessorNode implements IASTComment { fIsBlockComment= isBlockComment; } + @Override public char[] getComment() { return getSource(getOffset(), getLength()); } + @Override public boolean isBlockComment() { return fIsBlockComment; } + @Override public void setComment(char[] comment) { assert false; } @@ -169,7 +174,8 @@ class ASTElse extends ASTPreprocessorNode implements IASTPreprocessorElseStateme super(parent, IASTTranslationUnit.PREPROCESSOR_STATEMENT, startNumber, endNumber); fTaken= taken; } - public boolean taken() { + @Override + public boolean taken() { return fTaken; } } @@ -186,6 +192,7 @@ class ASTIfndef extends ASTDirectiveWithCondition implements IASTPreprocessorIfn /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement#getMacroReference() */ + @Override public ASTPreprocessorName getMacroReference() { return fMacroRef; } @@ -202,6 +209,7 @@ class ASTIfdef extends ASTDirectiveWithCondition implements IASTPreprocessorIfde /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement#getMacroReference() */ + @Override public ASTPreprocessorName getMacroReference() { return fMacroRef; } @@ -218,6 +226,7 @@ class ASTError extends ASTDirectiveWithCondition implements IASTPreprocessorErro super(parent, startNumber, condNumber, condEndNumber, true); } + @Override public char[] getMessage() { return getCondition(); } @@ -228,10 +237,12 @@ class ASTPragma extends ASTDirectiveWithCondition implements IASTPreprocessorPra super(parent, startNumber, condNumber, condEndNumber, true); } + @Override public char[] getMessage() { return getCondition(); } + @Override public boolean isPragmaOperator() { return false; } @@ -289,18 +300,22 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces } } + @Override public IASTName getName() { return fName; } + @Override public String getPath() { return fPath; } + @Override public boolean isResolved() { return fIsResolved; } + @Override public boolean isSystemInclude() { return fIsSystemInclude; } @@ -311,10 +326,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces nodeSpec.visit(fName); } + @Override public boolean isResolvedByHeuristics() { return fFoundByHeuristics; } + @Override public boolean hasPragmaOnceSemantics() { if (fNominationDelegate != null) { try { @@ -330,6 +347,7 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces fPragmaOnce= value; } + @Override public ISignificantMacros getSignificantMacros() { if (fNominationDelegate != null) { try { @@ -350,10 +368,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces fLoadedVersions= versions; } + @Override public ISignificantMacros[] getLoadedVersions() { return fLoadedVersions; } + @Override public long getContentsHash() { if (fNominationDelegate != null) { return 0; @@ -367,10 +387,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces fContentsHash= hash; } + @Override public boolean createsAST() { return fCreatesAST; } + @Override public IIndexFile getImportedIndexFile() { if (fNominationDelegate instanceof IIndexFile) return (IIndexFile) fNominationDelegate; @@ -421,14 +443,17 @@ class ASTMacroDefinition extends ASTPreprocessorNode implements IASTPreprocessor return (IMacroBinding) fName.getBinding(); } + @Override public String getExpansion() { return new String(getMacro().getExpansion()); } + @Override public IASTName getName() { return fName; } + @Override public int getRoleForName(IASTName n) { return (fName == n) ? r_definition : r_unclear; } @@ -439,9 +464,12 @@ class ASTMacroDefinition extends ASTPreprocessorNode implements IASTPreprocessor nodeSpec.visit(fName); } + @Override public void setExpansion(String exp) {assert false;} + @Override public void setName(IASTName name) {assert false;} + @Override public IASTFileLocation getExpansionLocation() { if (fExpansionNumber >= 0) { IASTTranslationUnit ast = getTranslationUnit(); @@ -476,10 +504,12 @@ class ASTMacroParameter extends ASTPreprocessorNode implements IASTFunctionStyle fParameter= new String(param); } + @Override public String getParameter() { return fParameter; } + @Override public void setParameter(String value) {assert false;} } @@ -500,6 +530,7 @@ class ASTFunctionStyleMacroDefinition extends ASTMacroDefinition implements IAST super(parent, macro, nameLoc, expansionOffset); } + @Override public IASTFunctionStyleMacroParameter[] getParameters() { IMacroBinding macro= getMacro(); char[][] paramList= macro.getParameterList(); @@ -529,6 +560,7 @@ class ASTFunctionStyleMacroDefinition extends ASTMacroDefinition implements IAST return result; } + @Override public void addParameter(IASTFunctionStyleMacroParameter parm) {assert false;} @Override @@ -561,6 +593,7 @@ class ASTUndef extends ASTPreprocessorNode implements IASTPreprocessorUndefState setInactive(); } + @Override public ASTPreprocessorName getMacroName() { return fName; } @@ -574,10 +607,12 @@ class ASTInclusionNode implements IASTInclusionNode { fLocationCtx= ctx; } + @Override public IASTPreprocessorIncludeStatement getIncludeDirective() { return fLocationCtx.getInclusionStatement(); } + @Override public IASTInclusionNode[] getNestedInclusions() { if (fInclusions == null) { ArrayList result= new ArrayList(); @@ -593,10 +628,12 @@ class DependencyTree extends ASTInclusionNode implements IDependencyTree { super(ctx); } + @Override public IASTInclusionNode[] getInclusions() { return getNestedInclusions(); } + @Override public String getTranslationUnitPath() { return fLocationCtx.getFilePath(); } @@ -613,27 +650,33 @@ class ASTFileLocation implements IASTFileLocation { fLength= length; } + @Override public String getFileName() { return fLocationCtx.getFilePath(); } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public int getNodeLength() { return fLength; } + @Override public int getNodeOffset() { return fOffset; } + @Override public int getEndingLineNumber() { int end= fLength > 0 ? fOffset+fLength-1 : fOffset; return fLocationCtx.getLineNumber(end); } + @Override public int getStartingLineNumber() { return fLocationCtx.getLineNumber(fOffset); } @@ -659,6 +702,7 @@ class ASTFileLocation implements IASTFileLocation { return fLocationCtx; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return fLocationCtx.getInclusionStatement(); } @@ -679,6 +723,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getName() */ + @Override public ASTMacroReferenceName getMacroReference() { return fContext.getMacroReference(); } @@ -686,6 +731,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getMacroDefinition() */ + @Override public IASTPreprocessorMacroDefinition getMacroDefinition() { return fContext.getMacroDefinition(); } @@ -693,6 +739,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getNestedExpansions() */ + @Override public ASTPreprocessorName[] getNestedMacroReferences() { return fContext.getNestedMacroReferences(); } @@ -718,31 +765,38 @@ class ASTMacroExpansionLocation implements IASTMacroExpansionLocation, org.eclip /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IASTMacroExpansionLocation#getExpansion() */ + @Override public IASTPreprocessorMacroExpansion getExpansion() { return fContext.getExpansion(); } + @Override public IASTNodeLocation[] getExpansionLocations() { final IASTFileLocation fl= asFileLocation(); return fl == null ? new IASTNodeLocation[0] : new IASTNodeLocation[] {fl}; } + @Override public IASTPreprocessorMacroDefinition getMacroDefinition() { return fContext.getMacroDefinition(); } + @Override public IASTName getMacroReference() { return fContext.getMacroReference(); } + @Override public IASTFileLocation asFileLocation() { return ((LocationCtxContainer) fContext.getParent()).createFileLocation(fContext.fOffsetInParent, fContext.fEndOffsetInParent-fContext.fOffsetInParent); } + @Override public int getNodeLength() { return fLength; } + @Override public int getNodeOffset() { return fOffset; } @@ -768,30 +822,37 @@ class ASTFileLocationForBuiltins implements IASTFileLocation { fLength= length; } + @Override public String getFileName() { return fFile; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public int getNodeLength() { return fLength; } + @Override public int getNodeOffset() { return fOffset; } + @Override public int getEndingLineNumber() { return 0; } + @Override public int getStartingLineNumber() { return 0; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } @@ -806,6 +867,7 @@ class ASTImageLocation extends ASTFileLocationForBuiltins implements IASTImageLo fKind= kind; } + @Override public int getLocationKind() { return fKind; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java index 5e5053e2fed..bb1837e07c8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java @@ -18,7 +18,9 @@ import org.eclipse.cdt.core.parser.IProblem; */ public interface ILexerLog { ILexerLog NULL = new ILexerLog() { + @Override public void handleComment(boolean isBlockComment, int offset, int endOffset) {} + @Override public void handleProblem(int problemID, char[] info, int offset, int endOffset) {} }; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java index 7a5e0a0d771..f6d303c4c6e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java @@ -25,10 +25,12 @@ public class InactiveCodeToken extends Token implements IInactiveCodeToken { fNewNesting= newNesting; } + @Override public int getOldNesting() { return fOldNesting; } + @Override public int getNewNesting() { return fNewNesting; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java index 5bfffcf6237..00125a9e335 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java @@ -47,10 +47,12 @@ abstract class LocationCtx implements ILocationCtx { } } + @Override public String getFilePath() { return fParent.getFilePath(); } + @Override final public ILocationCtx getParent() { return fParent; } @@ -136,6 +138,7 @@ abstract class LocationCtx implements ILocationCtx { /** * Support for the dependency tree, returns inclusion statement that created this context, or null. */ + @Override public ASTInclusionStatement getInclusionStatement() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java index 4617031d704..e6844cc1ed0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java @@ -31,10 +31,12 @@ public class MacroExpansionStep implements IMacroExpansionStep { fMacroLocation= macroLoc; } + @Override public String getCodeBeforeStep() { return fBefore; } + @Override public String getCodeAfterStep() { StringBuilder result= new StringBuilder(); int offset= 0; @@ -48,12 +50,15 @@ public class MacroExpansionStep implements IMacroExpansionStep { return result.toString(); } + @Override public IMacroBinding getExpandedMacro() { return fMacroDefinition; } + @Override public ReplaceEdit[] getReplacements() { return fReplacements; } + @Override public IASTFileLocation getLocationOfExpandedMacroDefinition() { return fMacroLocation; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java index 89deea45e9e..dd18b64510f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java @@ -49,13 +49,20 @@ public class MultiMacroExpansionExplorer extends MacroExpansionExplorer { fOffset= offset; fLength= length; } + @Override public int getNodeOffset() { return fOffset; } + @Override public int getNodeLength() { return fLength; } + @Override public String getFileName() { return fFilePath; } + @Override public int getStartingLineNumber() { return 0; } + @Override public int getEndingLineNumber() { return 0; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java index beb11a8f5a3..59b597d8ed3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java @@ -31,31 +31,38 @@ public class Token implements IToken, Cloneable { fSource= source; } + @Override final public int getType() { return fKind; } + @Override final public int getOffset() { return fOffset; } + @Override final public int getEndOffset() { return fEndOffset; } + @Override final public int getLength() { return fEndOffset-fOffset; } + @Override final public IToken getNext() { return fNextToken; } + @Override final public void setType(int kind) { fKind= kind; } + @Override final public void setNext(IToken t) { fNextToken= t; } @@ -70,6 +77,7 @@ public class Token implements IToken, Cloneable { fEndOffset+= shift; } + @Override public char[] getCharImage() { return TokenUtil.getImage(getType()); } @@ -79,10 +87,12 @@ public class Token implements IToken, Cloneable { return getImage(); } + @Override final public boolean isOperator() { return TokenUtil.isOperator(fKind); } + @Override public String getImage() { return new String(getCharImage()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java index 6ac40fe7527..93e778c6150 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java @@ -37,14 +37,17 @@ public class ContentAssistMatcherFactory { matcher = new SegmentMatcher(pattern); } + @Override public char[] getPrefixForBinarySearch() { return matcher.getPrefixForBinarySearch(); } + @Override public boolean matchRequiredAfterBinarySearch() { return matcher.matchRequiredAfterBinarySearch(); } + @Override public boolean match(char[] name) { return matcher.match(name); } @@ -58,14 +61,17 @@ public class ContentAssistMatcherFactory { this.prefix = prefix; } + @Override public char[] getPrefixForBinarySearch() { return prefix; } + @Override public boolean matchRequiredAfterBinarySearch() { return false; } + @Override public boolean match(char[] name) { return CharArrayUtils.equals(name, 0, prefix.length, prefix, true); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java index 247285b5732..70bae49466e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java @@ -136,6 +136,7 @@ public class Profiler { List> list = new ArrayList>(profiler.timers.entrySet()); Comparator> c = new Comparator>() { + @Override public int compare(Entry o1, Entry o2) { long diff = o2.getValue().getElapsedTime() - o1.getValue().getElapsedTime(); return diff < 0 ? -1 : diff > 0 ? 1 : 0; @@ -152,6 +153,7 @@ public class Profiler { List> keyList = new ArrayList>(profiler.counters.entrySet()); Comparator> c2 = new Comparator>() { + @Override public int compare(Entry o1, Entry o2) { return o2.getValue()[0] - o1.getValue()[0]; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java index a0cb1fe0c94..aaeb280dfd8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java @@ -301,6 +301,7 @@ public class WritablePDOM extends PDOM implements IWritableIndexFragment { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.index.IWritableIndexFragment#getDatabaseSizeBytes() */ + @Override public long getDatabaseSizeBytes() { return getDB().getSizeBytes(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java index 718fc77340c..4e88f118e6f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java @@ -633,10 +633,14 @@ public class BTree { public String getMsg() { return msg; } public boolean isValid() { return valid; } + @Override public void postNode(long node) throws CoreException { depth--; } + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { return true; } + @Override public void preNode(long node) throws CoreException { depth++; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java index 5cdf202b075..a3709fd54de 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java @@ -127,9 +127,11 @@ public class DBProperties { */ public void clear() throws CoreException { index.accept(new IBTreeVisitor(){ + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { new DBProperty(db, record).delete(); return false; // there should never be duplicates @@ -204,6 +206,7 @@ public class DBProperties { public static IBTreeComparator getComparator(final Database db) { return new IBTreeComparator() { + @Override public int compare(long record1, long record2) throws CoreException { IString left= db.getString(db.getRecPtr(record1 + KEY)); IString right= db.getString(db.getRecPtr(record2 + KEY)); @@ -215,9 +218,11 @@ public class DBProperties { public static DBProperty search(final Database db, final BTree index, final String key) throws CoreException { final DBProperty[] result= new DBProperty[1]; index.accept(new IBTreeVisitor(){ + @Override public int compare(long record) throws CoreException { return db.getString(db.getRecPtr(record + KEY)).compare(key, true); } + @Override public boolean visit(long record) throws CoreException { result[0] = new DBProperty(db, record); return false; // there should never be duplicates @@ -229,9 +234,11 @@ public class DBProperties { public static Set getKeySet(final Database db, final BTree index) throws CoreException { final Set result= new HashSet(); index.accept(new IBTreeVisitor(){ + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { result.add(new DBProperty(db, record).getKey().getString()); return true; // there should never be duplicates diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java index 50db8b78f33..5c9198bba2f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java @@ -67,6 +67,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { return fBuffer; } + @Override public void marshalBinding(IBinding binding) throws CoreException { if (binding instanceof ISerializableType) { ((ISerializableType) binding).marshal(this); @@ -84,6 +85,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { } } + @Override public IBinding unmarshalBinding() throws CoreException { if (fPos >= fBuffer.length) throw unmarshallingError(); @@ -105,6 +107,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { throw unmarshallingError(); } + @Override public void marshalType(IType type) throws CoreException { if (type instanceof IBinding) { marshalBinding((IBinding) type); @@ -118,6 +121,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { } } + @Override public IType unmarshalType() throws CoreException { if (fPos >= fBuffer.length) throw unmarshallingError(); @@ -138,6 +142,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { return fLinkage.unmarshalType(this); } + @Override public void marshalValue(IValue value) throws CoreException { if (value instanceof Value) { ((Value) value).marshall(this); @@ -146,6 +151,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { } } + @Override public IValue unmarshalValue() throws CoreException { if (fPos >= fBuffer.length) throw unmarshallingError(); @@ -172,17 +178,20 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { } } + @Override public void putByte(byte b) { request(1); fBuffer[fPos++]= b; } + @Override public int getByte() throws CoreException { if (fPos+1 > fBuffer.length) throw unmarshallingError(); return 0xff & fBuffer[fPos++]; } + @Override public CoreException unmarshallingError() { return new CoreException(CCorePlugin.createStatus("Unmarshalling error")); //$NON-NLS-1$ } @@ -190,12 +199,14 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { return new CoreException(CCorePlugin.createStatus("Marshalling error")); //$NON-NLS-1$ } + @Override public void putShort(short value) { request(2); fBuffer[fPos++]= (byte)(value >> 8); fBuffer[fPos++]= (byte)(value); } + @Override public int getShort() throws CoreException { if (fPos+2 > fBuffer.length) throw unmarshallingError(); @@ -225,6 +236,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { return result; } + @Override public void putLong(long value) { request(8); fPos += 8; @@ -239,6 +251,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { fBuffer[--p]= (byte)(value); } + @Override public long getLong() throws CoreException { if (fPos+8 > fBuffer.length) throw unmarshallingError(); @@ -270,6 +283,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { return Chunk.getRecPtr(fBuffer, pos); } + @Override public void putCharArray(char[] chars) { putShort((short) chars.length); for (char c : chars) { @@ -277,6 +291,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer { } } + @Override public char[] getCharArray() throws CoreException { int len= getShort(); char[] expr= new char[len]; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java index 72139f6b9e6..6e63870e2a6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java @@ -28,10 +28,12 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor { this.visitor= visitor; } + @Override public int compare(long record) throws CoreException { return 0; // visit all nodes in a b-tree } + @Override public boolean visit(IPDOMNode node) throws CoreException { if(node instanceof PDOMBinding) { ((PDOMBinding)node).accept(visitor); @@ -40,6 +42,7 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor { return false; // don't visit children of the node } + @Override public boolean visit(long record) throws CoreException { if (record == 0) return true; @@ -51,6 +54,7 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor { return true; } + @Override public void leave(IPDOMNode node) throws CoreException { } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java index 57450629dc0..f8614bee19d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java @@ -35,6 +35,7 @@ public class FindBinding { this.database= linkage.getDB(); } + @Override public int compare(long record1, long record2) throws CoreException { IString nm1 = PDOMNamedNode.getDBName(database, record1); IString nm2 = PDOMNamedNode.getDBName(database, record2); @@ -72,6 +73,7 @@ public class FindBinding { } // IBTreeVisitor + @Override public int compare(long record) throws CoreException { final Database db = fLinkage.getDB(); IString nm1 = PDOMNamedNode.getDBName(db, record); @@ -85,6 +87,7 @@ public class FindBinding { } // IBTreeVisitor + @Override public boolean visit(long record) throws CoreException { final PDOMNamedNode nnode = (PDOMNamedNode) fLinkage.getNode(record); if (nnode instanceof PDOMBinding) { @@ -113,6 +116,7 @@ public class FindBinding { return fResult; } // IPDOMVisitor + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof PDOMBinding) { final PDOMBinding nnode = (PDOMBinding) node; @@ -124,6 +128,7 @@ public class FindBinding { return false; /* do not visit children of node */ } // IPDOMVisitor + @Override public void leave(IPDOMNode node) throws CoreException { } } @@ -153,6 +158,7 @@ public class FindBinding { public MacroBTreeComparator(Database database) { db= database; } + @Override public int compare(long record1, long record2) throws CoreException { return compare(PDOMNamedNode.getDBName(db, record1), PDOMNamedNode.getDBName(db, record2)); // compare names } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java index 829ea8024b8..d88a4451445 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java @@ -32,5 +32,6 @@ public interface IPDOMBinding extends IPDOMNode, IIndexFragmentBinding { /** * Returns the linkage of the binding. */ + @Override PDOMLinkage getLinkage(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java index db75385a3e5..d2d0e650dfc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java @@ -79,6 +79,7 @@ public final class MacroContainerCollector implements IBTreeVisitor { monitor= pm; } + @Override final public int compare(long record) throws CoreException { if (monitor != null) checkCancelled(); @@ -104,6 +105,7 @@ public final class MacroContainerCollector implements IBTreeVisitor { return cmp; } + @Override final public boolean visit(long record) throws CoreException { if (monitor != null) checkCancelled(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java index cf349ee613d..dcc7f8a0dc5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java @@ -31,6 +31,7 @@ public final class MacroContainerFinder implements IBTreeVisitor { fLinkage= linkage; } + @Override final public int compare(long record) throws CoreException { IString name= PDOMNamedNode.getDBName(fLinkage.getDB(), record); return compare(name); @@ -40,6 +41,7 @@ public final class MacroContainerFinder implements IBTreeVisitor { return rhsName.compareCompatibleWithIgnoreCase(fName); } + @Override final public boolean visit(long record) throws CoreException { if (record == 0) return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java index b2a4a283e34..083c0e0344e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java @@ -39,12 +39,14 @@ public final class MacroContainerPatternCollector implements IBTreeVisitor { } + @Override final public int compare(long record) throws CoreException { if (fMonitor != null) checkCancelled(); return 0; } + @Override final public boolean visit(long record) throws CoreException { if (record == 0) return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java index 651a02d49ce..be12fa0e7a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java @@ -87,6 +87,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { monitor= pm; } + @Override final public int compare(long record) throws CoreException { if (monitor != null) checkCancelled(); @@ -112,6 +113,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { return cmp; } + @Override final public boolean visit(long record) throws CoreException { if (monitor != null) checkCancelled(); @@ -145,6 +147,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { return nodes.toArray(new PDOMNamedNode[nodes.size()]); } + @Override final public boolean visit(IPDOMNode node) throws CoreException { if (monitor != null) checkCancelled(); @@ -164,6 +167,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor { } } + @Override final public void leave(IPDOMNode node) throws CoreException { } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java index 2fdbb79020a..d04f19fe4ee 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java @@ -60,6 +60,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding super(linkage, record); } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(PDOMBinding.class)) @@ -85,6 +86,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding && db.getRecPtr(record + FIRST_REF_OFFSET) == 0; } + @Override public final boolean hasDeclaration() throws CoreException { if (hasDeclaration == -1) { final Database db = getDB(); @@ -156,6 +158,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding getDB().putRecPtr(record + FIRST_REF_OFFSET, namerec); } + @Override public final PDOMFile getLocalToFile() throws CoreException { final long filerec = getLocalToFileRec(getDB(), record); return filerec == 0 ? null : new PDOMFile(getLinkage(), filerec); @@ -173,6 +176,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding getDB().putRecPtr(record + LOCAL_TO_FILE, rec); } + @Override public String getName() { try { return super.getDBName().getString(); @@ -204,6 +208,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding return null; } + @Override public final IIndexScope getScope() { // The parent node in the binding hierarchy is the scope. try { @@ -232,6 +237,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding return null; } + @Override public IIndexFragment getFragment() { return getPDOM(); } @@ -303,14 +309,17 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding } } + @Override public String[] getQualifiedName() { return new String[] { getName() }; } + @Override final public boolean isFileLocal() throws CoreException { return getDB().getRecPtr(record + LOCAL_TO_FILE) != 0; } + @Override public boolean hasDefinition() throws CoreException { return getDB().getRecPtr(record + FIRST_DEF_OFFSET) != 0; } @@ -382,6 +391,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding return pdomCompareTo(other)==0; } + @Override public final int getBindingConstant() { return getNodeType(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java index be4f1a8024b..0bb20610ac6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java @@ -18,6 +18,7 @@ import org.eclipse.cdt.internal.core.index.IIndexFragmentBindingComparator; * */ public class PDOMFragmentBindingComparator implements IIndexFragmentBindingComparator { + @Override public int compare(IIndexFragmentBinding a, IIndexFragmentBinding b) { if(a instanceof PDOMBinding && b instanceof PDOMBinding) { return ((PDOMBinding) a).pdomCompareTo((PDOMBinding) b); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java index 52fc6379f33..48c2c731d71 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java @@ -136,6 +136,7 @@ public class PDOMInclude implements IIndexFragmentInclude { nextInclude.setPrevInIncludedBy(prevInclude); } + @Override public IIndexFragmentFile getIncludes() throws CoreException { long rec = linkage.getDB().getRecPtr(record + INCLUDED_FILE); return rec != 0 ? new PDOMFile(linkage, rec) : null; @@ -166,6 +167,7 @@ public class PDOMInclude implements IIndexFragmentInclude { return true; } + @Override public IIndexFile getIncludedBy() throws CoreException { long rec = linkage.getDB().getRecPtr(record + INCLUDED_BY); return rec != 0 ? new PDOMFile(linkage, rec) : null; @@ -210,15 +212,18 @@ public class PDOMInclude implements IIndexFragmentInclude { linkage.getDB().putRecPtr(record + INCLUDED_BY_PREV, rec); } + @Override public IIndexFileLocation getIncludedByLocation() throws CoreException { return getIncludedBy().getLocation(); } + @Override public IIndexFileLocation getIncludesLocation() throws CoreException { IIndexFragmentFile includes = getIncludes(); return includes != null ? includes.getLocation() : null; } + @Override public IIndexFragment getFragment() { return linkage.getPDOM(); } @@ -231,30 +236,37 @@ public class PDOMInclude implements IIndexFragmentInclude { return linkage.getDB().getByte(record + FLAGS); } + @Override public boolean isSystemInclude() throws CoreException { return (getFlag() & FLAG_SYSTEM_INCLUDE) != 0; } + @Override public boolean isActive() throws CoreException { return (getFlag() & FLAG_INACTIVE_INCLUDE) == 0; } + @Override public boolean isResolved() throws CoreException { return linkage.getDB().getRecPtr(record + INCLUDED_FILE) != 0; } + @Override public boolean isResolvedByHeuristics() throws CoreException { return (getFlag() & FLAG_RESOLVED_BY_HEURISTICS) != 0; } + @Override public int getNameOffset() throws CoreException { return linkage.getDB().get3ByteUnsignedInt(record + NODE_OFFSET); } + @Override public int getNameLength() throws CoreException { return linkage.getDB().getShort(record + NODE_LENGTH) & 0xffff; } + @Override public String getFullName() throws CoreException { if (fName == null) { final Database db = linkage.getDB(); @@ -272,6 +284,7 @@ public class PDOMInclude implements IIndexFragmentInclude { return fName; } + @Override public String getName() throws CoreException { final String fullName= getFullName(); final int idx= Math.max(fullName.lastIndexOf('/'), fullName.lastIndexOf('\\')); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java index 8f8b0a6f10d..30c881dd18d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java @@ -115,14 +115,17 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { container.addDefinition(this); } + @Override public PDOM getPDOM() { return fLinkage.getPDOM(); } + @Override public long getRecord() { return fRecord; } + @Override public void delete(PDOMLinkage linkage) throws CoreException { // Delete from the binding chain PDOMMacro prevName = getPrevInContainer(); @@ -208,6 +211,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return namerec != 0 ? new PDOMMacro(fLinkage, namerec) : null; } + @Override public char[][] getParameterList() { if (fParameterList == UNINITIALIZED) { fParameterList= null; @@ -240,6 +244,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return fExpansion != null; } + @Override public char[] getExpansionImage() { if (fExpansion == UNINITIALIZED1) { try { @@ -253,6 +258,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return fExpansion; } + @Override public char[] getNameCharArray() { try { return getContainer().getNameCharArray(); @@ -262,10 +268,12 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { } } + @Override public String getName() { return new String(getNameCharArray()); } + @Override public PDOMFile getFile() throws CoreException { long filerec = fLinkage.getDB().getRecPtr(fRecord + FILE); return filerec != 0 ? new PDOMFile(fLinkage, filerec) : null; @@ -279,6 +287,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { fLinkage.getDB().putRecPtr(fRecord + FILE, file != null ? file.getRecord() : 0); } + @Override public String getFileName() { try { IIndexFile file = getFile(); @@ -296,26 +305,32 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return null; } + @Override public int getStartingLineNumber() { return 0; } + @Override public int getEndingLineNumber() { return 0; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public IASTFileLocation getFileLocation() { return this; } + @Override public int getNodeLength() { try { return fLinkage.getDB().getShort(fRecord + NAME_LENGTH); @@ -325,6 +340,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { } } + @Override public int getNodeOffset() { try { return fLinkage.getDB().getInt(fRecord + NAME_OFFSET); @@ -334,11 +350,13 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { } } + @Override public char[] getExpansion() { char[] expansionImage= getExpansionImage(); return MacroDefinitionParser.getExpansion(new CharArray(expansionImage), 0, expansionImage.length); } + @Override public char[][] getParameterPlaceholderList() { char[][] params= getParameterList(); if (params != null && params.length > 0) { @@ -354,22 +372,27 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return params; } + @Override public boolean isFunctionStyle() { return getParameterList() != null; } + @Override public boolean isDynamic() { return false; } + @Override public PDOMLinkage getLinkage() { return fLinkage; } + @Override public IIndexScope getScope() { return null; } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(PDOMMacro.class)) { @@ -378,6 +401,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return null; } + @Override public IIndexFragmentName getDefinition() throws CoreException { if (!isMacroDefinition()) { return null; @@ -388,41 +412,51 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return fDefinition; } + @Override public IIndexFile getLocalToFile() throws CoreException { return null; } + @Override public String[] getQualifiedName() { return new String[]{getName()}; } + @Override public boolean isFileLocal() throws CoreException { return false; } + @Override public int getBindingConstant() { return IIndexBindingConstants.MACRO_DEFINITION; } + @Override public IIndexFragment getFragment() { return fLinkage.getPDOM(); } + @Override public boolean hasDeclaration() throws CoreException { return false; } + @Override public boolean hasDefinition() throws CoreException { return true; } + @Override public IIndexFragmentBinding getOwner() { return null; } + @Override public void accept(IPDOMVisitor visitor) { } + @Override public long getBindingID() { return fRecord; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java index 179d5171ed3..cd529df81b4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java @@ -114,6 +114,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont super.delete(linkage); } + @Override public int getBindingConstant() { return IIndexBindingConstants.MACRO_CONTAINER; } @@ -121,30 +122,37 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.index.IIndexFragmentBinding#getFragment() */ + @Override public IIndexFragment getFragment() { return getPDOM(); } + @Override public IIndexScope getScope() { return null; } + @Override public boolean hasDeclaration() throws CoreException { return false; } + @Override public boolean hasDefinition() throws CoreException { return getDB().getRecPtr(record + FIRST_DEF_OFFSET) != 0; } + @Override public IIndexFile getLocalToFile() throws CoreException { return null; } + @Override public String[] getQualifiedName() { return new String[]{getName()}; } + @Override public boolean isFileLocal() throws CoreException { return false; } @@ -159,10 +167,12 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont return CharArrayUtils.EMPTY; } + @Override public String getName() { return new String(getNameCharArray()); } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(PDOMMacroContainer.class)) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java index c7be074395d..60228f832c2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java @@ -29,49 +29,64 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { return fMacro; } + @Override public boolean couldBePolymorphicMethodCall() throws CoreException { return false; } + @Override public IIndexName[] getEnclosedNames() throws CoreException { return IIndexName.EMPTY_ARRAY; } + @Override public IIndexName getEnclosingDefinition() throws CoreException { return null; } + @Override public IIndexFile getFile() throws CoreException { return fMacro.getFile(); } + @Override public int getNodeLength() { return fMacro.getNodeLength(); } + @Override public int getNodeOffset() { return fMacro.getNodeOffset(); } + @Override public boolean isBaseSpecifier() throws CoreException { return false; } + @Override public boolean isReadAccess() throws CoreException { return false; } + @Override public boolean isWriteAccess() throws CoreException { return false; } + @Override public IASTFileLocation getFileLocation() { return fMacro; } + @Override public boolean isDeclaration() { return false; } + @Override public boolean isDefinition() { return true; } + @Override public boolean isReference() { return false; } + @Override public boolean isInlineNamespaceDefinition() { return false; } + @Override @Deprecated public char[] toCharArray() { return fMacro.getNameCharArray(); @@ -81,12 +96,15 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { return new String(getSimpleID()); } + @Override public char[] getSimpleID() { return fMacro.getNameCharArray(); } + @Override public IIndexFragmentBinding getBinding() { return fMacro; } + @Override public IIndexFragment getIndexFragment() { return fMacro.getFragment(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java index ff242e63d2e..dfde12a3978 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java @@ -113,6 +113,7 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil setNameField(CONTAINER_NEXT_OFFSET, name); } + @Override public PDOMFile getFile() throws CoreException { long filerec = linkage.getDB().getRecPtr(record + FILE_REC_OFFSET); return filerec != 0 ? new PDOMFile(linkage, filerec) : null; @@ -137,11 +138,13 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil /** * @deprecated use {@link #getSimpleID()}. */ + @Override @Deprecated public char[] toCharArray() { return getSimpleID(); } + @Override public char[] getSimpleID() { try { return getContainer().getNameCharArray(); @@ -156,42 +159,52 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil return new String(getSimpleID()); } + @Override public boolean isBaseSpecifier() throws CoreException { return false; } + @Override public boolean couldBePolymorphicMethodCall() throws CoreException { return false; } + @Override public boolean isInlineNamespaceDefinition() { return false; } + @Override public boolean isReadAccess() throws CoreException { return false; } + @Override public boolean isWriteAccess() throws CoreException { return false; } + @Override public boolean isDeclaration() { return false; } + @Override public boolean isReference() { return true; } + @Override public boolean isDefinition() { return false; } + @Override public IASTFileLocation getFileLocation() { return this; } + @Override public String getFileName() { try { IIndexFile file = getFile(); @@ -209,22 +222,27 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil return null; } + @Override public int getStartingLineNumber() { return 0; } + @Override public int getEndingLineNumber() { return 0; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public int getNodeLength() { try { return (linkage.getDB().getShort(record + NODE_LENGTH_OFFSET)) & 0xffff; @@ -234,6 +252,7 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil } } + @Override public int getNodeOffset() { try { return linkage.getDB().getInt(record + NODE_OFFSET_OFFSET); @@ -260,18 +279,22 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil linkage.getDB().free(record); } + @Override public IIndexFragment getIndexFragment() { return linkage.getPDOM(); } + @Override public IIndexName[] getEnclosedNames() throws CoreException { return IIndexName.EMPTY_ARRAY; } + @Override public IIndexFragmentBinding getBinding() throws CoreException { return getContainer(); } + @Override public IIndexName getEnclosingDefinition() throws CoreException { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java index cad23af7f64..3be5bdb1452 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java @@ -128,6 +128,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { return linkage.getPDOM(); } + @Override public PDOMBinding getBinding() throws CoreException { long bindingrec = getRecField(BINDING_REC_OFFSET); return linkage.getBinding(bindingrec); @@ -164,6 +165,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { setNameField(BINDING_NEXT_OFFSET, name); } + @Override public PDOMFile getFile() throws CoreException { long filerec = linkage.getDB().getRecPtr(record + FILE_REC_OFFSET); return filerec != 0 ? new PDOMFile(linkage, filerec) : null; @@ -177,6 +179,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { linkage.getDB().putRecPtr(record + FILE_REC_OFFSET, file != null ? file.getRecord() : 0); } + @Override public IIndexName getEnclosingDefinition() throws CoreException { long namerec = getEnclosingDefinitionRecord(); return namerec != 0 ? new PDOMName(linkage, namerec) : null; @@ -197,11 +200,13 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { /** * @deprecated use {@link #getSimpleID()}, instead. */ + @Override @Deprecated public char[] toCharArray() { return getSimpleID(); } + @Override public char[] getSimpleID() { try { Database db = linkage.getDB(); @@ -245,26 +250,32 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_FRIEND_SPEC; } + @Override public boolean isBaseSpecifier() throws CoreException { return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_INHERITANCE_SPEC; } + @Override public boolean isInlineNamespaceDefinition() throws CoreException { return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_INLINE_NAMESPACE; } + @Override public boolean couldBePolymorphicMethodCall() throws CoreException { return getFlags(COULD_BE_POLYMORPHIC_METHOD_CALL) == COULD_BE_POLYMORPHIC_METHOD_CALL; } + @Override public boolean isReadAccess() throws CoreException { return getFlags(READ_ACCESS) == READ_ACCESS; } + @Override public boolean isWriteAccess() throws CoreException { return getFlags(WRITE_ACCESS) == WRITE_ACCESS; } + @Override public boolean isDeclaration() { try { int flags = getFlags(DECL_DEF_REF_MASK); @@ -275,6 +286,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { } } + @Override public boolean isReference() { try { int flags = getFlags(DECL_DEF_REF_MASK); @@ -285,6 +297,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { } } + @Override public boolean isDefinition() { try { int flags = getFlags(DECL_DEF_REF_MASK); @@ -295,10 +308,12 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { } } + @Override public IASTFileLocation getFileLocation() { return this; } + @Override public String getFileName() { try { IIndexFile file = getFile(); @@ -316,22 +331,27 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { return null; } + @Override public int getStartingLineNumber() { return 0; } + @Override public int getEndingLineNumber() { return 0; } + @Override public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; } + @Override public IASTFileLocation asFileLocation() { return this; } + @Override public int getNodeLength() { try { return (linkage.getDB().getShort(record + NODE_LENGTH_OFFSET)) & 0xffff; @@ -341,6 +361,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { } } + @Override public int getNodeOffset() { try { return linkage.getDB().get3ByteUnsignedInt(record + NODE_OFFSET_OFFSET); @@ -377,10 +398,12 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { linkage.getDB().free(record); } + @Override public IIndexFragment getIndexFragment() { return linkage.getPDOM(); } + @Override public IIndexName[] getEnclosedNames() throws CoreException { ArrayList result= new ArrayList(); PDOMName name= getNextInFile(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java index 49409e4ce80..7f50ad5f082 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java @@ -76,6 +76,7 @@ public abstract class PDOMNode implements IInternalPDOMNode { public abstract int getNodeType(); + @Override public final long getRecord() { return record; } @@ -114,6 +115,7 @@ public abstract class PDOMNode implements IInternalPDOMNode { return System.identityHashCode(getPDOM()) + (int) (41 * record); } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { // No children here. } @@ -168,6 +170,7 @@ public abstract class PDOMNode implements IInternalPDOMNode { * @param linkage * @throws CoreException */ + @Override public void delete(PDOMLinkage linkage) throws CoreException { getDB().free(record); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java index f9fe7294a9b..ddf959d40dd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java @@ -47,6 +47,7 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#fromInternalFormat(java.lang.String) */ + @Override public IIndexFileLocation fromInternalFormat(String raw) { String fullPath = null; URI uri= null; @@ -73,6 +74,7 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#toRaw(java.net.URI) */ + @Override public String toInternalFormat(IIndexFileLocation location) { String fullPath= location.getFullPath(); if(fullPath!=null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java index 26cdc22c179..e8823998e44 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java @@ -86,6 +86,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType, return IIndexCBindingConstants.CENUMERATION; } + @Override public IEnumerator[] getEnumerators() { List result = getCachedEnumerators(true); return result.toArray(new IEnumerator[result.size()]); @@ -111,12 +112,14 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType, try { PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + OFFSET_ENUMERATOR_LIST); list.accept(new IPDOMVisitor() { + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof PDOMCEnumerator) { result.add((PDOMCEnumerator) node); } return true; } + @Override public void leave(IPDOMNode node) {} }); } catch (CoreException e) { @@ -151,6 +154,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType, } + @Override public long getMinValue() { if (fMinValue != null) { return fMinValue.longValue(); @@ -164,6 +168,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType, return minValue; } + @Override public long getMaxValue() { if (fMaxValue != null) { return fMaxValue.longValue(); @@ -177,6 +182,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType, return maxValue; } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java index da9da2ba9a8..3e6758c720a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java @@ -70,6 +70,7 @@ class PDOMCEnumerator extends PDOMBinding implements IEnumerator { storeValue(getDB(), (IEnumerator) newBinding); } + @Override public IType getType() throws DOMException { IIndexFragmentBinding owner = getOwner(); if (owner instanceof IType) @@ -77,6 +78,7 @@ class PDOMCEnumerator extends PDOMBinding implements IEnumerator { return null; } + @Override public IValue getValue() { try { int val= getDB().getInt(record + VALUE); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java index 44511a16da7..8bfcfdc9638 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java @@ -69,6 +69,7 @@ class PDOMCField extends PDOMCVariable implements IField { return false; } + @Override public ICompositeType getCompositeTypeOwner() { try { return (ICompositeType)getParentNode(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java index 50e5d7637e8..c749f068612 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java @@ -135,6 +135,7 @@ class PDOMCFunction extends PDOMBinding implements IFunction { return IIndexCBindingConstants.CFUNCTION; } + @Override public IFunctionType getType() { try { return (IFunctionType) getLinkage().loadType(record + FUNCTION_TYPE); @@ -144,14 +145,17 @@ class PDOMCFunction extends PDOMBinding implements IFunction { } } + @Override public boolean isStatic() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET); } + @Override public boolean isExtern() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET); } + @Override public IParameter[] getParameters() { try { PDOMLinkage linkage= getLinkage(); @@ -176,24 +180,29 @@ class PDOMCFunction extends PDOMBinding implements IFunction { } } + @Override public boolean isAuto() { // ISO/IEC 9899:TC1 6.9.1.4 return false; } + @Override public boolean isRegister() { // ISO/IEC 9899:TC1 6.9.1.4 return false; } + @Override public boolean isInline() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.INLINE_OFFSET); } + @Override public boolean takesVarArgs() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.VARARGS_OFFSET); } + @Override public IScope getFunctionScope() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java index 6543eb6cfc3..f7ae39f14da 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java @@ -21,10 +21,12 @@ import org.eclipse.core.runtime.CoreException; */ public class PDOMCLinkageFactory implements IPDOMLinkageFactory { + @Override public PDOMLinkage getLinkage(PDOM pdom, long record) { return new PDOMCLinkage(pdom, record); } + @Override public PDOMLinkage createLinkage(PDOM pdom) throws CoreException { return new PDOMCLinkage(pdom); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java index 08e229365b2..d7a5ef03c2b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java @@ -68,28 +68,34 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin return IIndexCBindingConstants.CPARAMETER; } + @Override public IType getType() { return fType; } + @Override public boolean isAuto() { byte flag = 1< fields = new ArrayList(); + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof IField) { IField field= (IField) node; @@ -137,12 +141,14 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom } return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public IField[] getFields() { return fields.toArray(new IField[fields.size()]); } } + @Override public IField[] getFields() { try { GetFields fields = new GetFields(); @@ -160,6 +166,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom public FindField(String name) { this.name = name; } + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof IField) { IField tField = (IField)node; @@ -176,11 +183,13 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom } return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public IField getField() { return field; } } + @Override public IField findField(String name) { final PDOM pdom = getPDOM(); final String key= pdom.createKeyForCache(record, name.toCharArray()); @@ -208,10 +217,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom return result; } + @Override public IScope getCompositeScope() { return this; } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -251,10 +262,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom return true; } + @Override public ICompositeType getCompositeType() { return this; } + @Override public IBinding getBinding(char[] name) { return findField(new String(name)); } @@ -269,6 +282,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom return getBindings(name.toCharArray()); } + @Override public IBinding[] find(String name) { return getBindings(name.toCharArray()); } @@ -280,6 +294,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom return new IBinding[]{b}; } + @Override public IIndexBinding getScopeBinding() { return this; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java index 7ade95656fb..6ce1b2b2037 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java @@ -90,6 +90,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable { return IIndexCBindingConstants.CVARIABLE; } + @Override public IType getType() { try { return getLinkage().loadType(record + TYPE_OFFSET); @@ -99,6 +100,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable { } } + @Override public IValue getInitialValue() { try { return getLinkage().loadValue(record + VALUE_OFFSET); @@ -108,18 +110,22 @@ class PDOMCVariable extends PDOMBinding implements IVariable { } } + @Override public boolean isStatic() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET); } + @Override public boolean isExtern() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET); } + @Override public boolean isAuto() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.AUTO_OFFSET); } + @Override public boolean isRegister() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.REGISTER_OFFSET); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java index 2395d9b6e85..19b7e2b5c5a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java @@ -27,6 +27,7 @@ public interface IPDOMCPPEnumType extends ICPPEnumeration, IPDOMBinding, IIndexT */ IIndexName getScopeName(); + @Override IEnumerator[] getEnumerators(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java index 891fb17e875..7fea377b174 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java @@ -77,6 +77,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { return getDB().getByte(record + FLAGS); } + @Override public PDOMName getBaseClassSpecifierName() { try { long rec = getDB().getRecPtr(record + BASECLASS_SPECIFIER); @@ -89,6 +90,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { return null; } + @Override public IBinding getBaseClass() { if (fCachedBaseClass != null) return fCachedBaseClass; @@ -108,6 +110,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { return null; } + @Override public int getVisibility() { try { return getFlags() & 0x3; @@ -118,6 +121,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { } + @Override public boolean isVirtual() { try { return (getFlags() & 0x4) != 0; @@ -131,6 +135,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { getDB().free(record); } + @Override public void setBaseClass(IBinding binding) { throw new UnsupportedOperationException(); } @@ -147,21 +152,26 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { public PDOMCPPBaseClone(ICPPBase base) { this.base = base; } + @Override public IBinding getBaseClass() { if (baseClass == null) { return base.getBaseClass(); } return baseClass; } + @Override public IName getBaseClassSpecifierName() { return base.getBaseClassSpecifierName(); } + @Override public int getVisibility() { return base.getVisibility(); } + @Override public boolean isVirtual() { return base.isVirtual(); } + @Override public void setBaseClass(IBinding binding) { baseClass = binding; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java index f57114c1ab1..0ffc5f4b4d5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java @@ -39,10 +39,12 @@ public abstract class PDOMCPPBinding extends PDOMBinding implements ICPPBinding return CPPVisitor.getQualifiedName(this); } + @Override final public char[][] getQualifiedNameCharArray() { return CPPVisitor.getQualifiedNameCharArray(this); } + @Override public final boolean isGloballyQualified() throws DOMException { // local stuff is not stored in the index. return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java index 53568867bf9..fa449e7db7e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java @@ -63,10 +63,12 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem return IIndexCPPBindingConstants.CPP_CLASS_INSTANCE; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return (ICPPTemplateDefinition) getSpecializedBinding(); } + @Override public ICPPTemplateArgument[] getTemplateArguments() { try { final long rec= getPDOM().getDB().getRecPtr(record + ARGUMENTS); @@ -83,6 +85,7 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem return hasDeclaration(); } + @Override public boolean isExplicitSpecialization() { return !(getCompositeScope() instanceof ICPPClassSpecializationScope); } @@ -103,6 +106,7 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem return CPPClassInstance.isSameClassInstance(this, type); } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java index 9ba21e35989..4a572add8e3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java @@ -65,6 +65,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { fResult = result; } + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof PDOMBinding) { final PDOMBinding binding= (PDOMBinding) node; @@ -82,6 +83,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { return false; } + @Override public void leave(IPDOMNode node){} } @@ -100,22 +102,27 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { fBinding= binding; } + @Override public EScopeKind getKind() { return EScopeKind.eClassType; } + @Override public ICPPClassType getClassType() { return fBinding; } + @Override public IBinding getBinding(IASTName name, boolean resolve) { return getBinding(name, resolve, null); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) { return getBindings(name, resolve, prefixLookup, null); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) { try { final char[] nameChars = name.getSimpleID(); @@ -140,6 +147,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { return fBinding; } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) { try { if (name instanceof ICPPASTConversionName) { @@ -243,14 +251,17 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { return map; } + @Override public IBinding[] find(String name) { return CPPSemantics.findBindings( this, name, false ); } + @Override public IIndexBinding getScopeBinding() { return fBinding; } + @Override public ICPPMethod[] getImplicitMethods() { try { PDOMClassUtil.MethodCollector methods = new PDOMClassUtil.MethodCollector(true, false); @@ -261,14 +272,17 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope { } } + @Override public ICPPConstructor[] getConstructors() { return fBinding.getConstructors(); } + @Override public IIndexScope getParent() { return fBinding.getScope(); } + @Override public IIndexName getScopeName() { return fBinding.getScopeName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java index 07dedf34799..eb31fe7c9dc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java @@ -87,6 +87,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return (ICPPClassType) super.getSpecializedBinding(); } + @Override public IBinding specializeMember(IBinding original) { if (specializationMap == null) { final Long key= record+PDOMCPPLinkage.CACHE_INSTANCE_SCOPE; @@ -126,6 +127,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return newSpec; } + @Override public ICPPClassScope getCompositeScope() { if (fScope == null) { try { @@ -185,6 +187,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } // implementation of class type + @Override public ICPPBase[] getBases() { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { @@ -211,6 +214,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return ICPPBase.EMPTY_BASE_ARRAY; } + @Override public ICPPConstructor[] getConstructors() { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { @@ -226,6 +230,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } } + @Override public ICPPMethod[] getDeclaredMethods() { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { @@ -241,6 +246,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } } + @Override public ICPPField[] getDeclaredFields() { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { @@ -256,6 +262,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } } + @Override public ICPPClassType[] getNestedClasses() { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { @@ -271,31 +278,38 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } } + @Override public IBinding[] getFriends() { // not yet supported. return IBinding.EMPTY_BINDING_ARRAY; } + @Override public ICPPMethod[] getMethods() { return ClassTypeHelper.getMethods(this); } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ClassTypeHelper.getAllDeclaredMethods(this); } + @Override public IField[] getFields() { return ClassTypeHelper.getFields(this); } + @Override public IField findField(String name) { return ClassTypeHelper.findField(this, name); } + @Override public int getKey() { return getSpecializedBinding().getKey(); } + @Override public boolean isSameType(IType type) { if (type == this) return true; @@ -332,6 +346,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements list.addMember(member); } + @Override public void acceptUncached(IPDOMVisitor visitor) throws CoreException { PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + MEMBERLIST); list.accept(visitor); @@ -342,6 +357,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements PDOMCPPClassScope.acceptViaCache(this, visitor, false); } + @Override public boolean isAnonymous() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java index ef0d77a4199..58c503d1365 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java @@ -25,6 +25,7 @@ public class PDOMCPPClassSpecializationScope extends AbstractCPPClassSpecializat super(specialization); } + @Override public IIndexBinding getScopeBinding() { return (IIndexBinding) getClassType(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java index 0e6592c5d51..c5e4af6af93 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java @@ -73,6 +73,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate super(linkage, bindingRecord); } + @Override public int getSignatureHash() throws CoreException { return getDB().getInt(record + SIGNATURE_HASH); } @@ -97,6 +98,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate getDB().putRecPtr(record + NEXT_PARTIAL, value); } + @Override public ICPPClassTemplate getPrimaryClassTemplate() { try { return new PDOMCPPClassTemplate(getLinkage(), getDB().getRecPtr(record + PRIMARY)); @@ -106,10 +108,12 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate } } + @Override public IBinding getSpecializedBinding() { return getPrimaryClassTemplate(); } + @Override public void setArguments(ICPPTemplateArgument[] templateArguments) throws CoreException { final Database db = getPDOM().getDB(); long oldRec = db.getRecPtr(record+ARGUMENTS); @@ -120,6 +124,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate } } + @Override public ICPPTemplateArgument[] getTemplateArguments() { try { final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS); @@ -130,6 +135,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate } } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); @@ -155,6 +161,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate return cmp; } + @Override public ICPPTemplateParameterMap getTemplateParameterMap() { return CPPTemplates.createParameterMap(getPrimaryClassTemplate(), getTemplateArguments()); } @@ -198,6 +205,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends PDOMCPPClassTemplate return true; } + @Override @Deprecated public ObjectMap getArgumentMap() { ICPPTemplateParameter[] params = getPrimaryClassTemplate().getTemplateParameters(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java index 31464ea5f49..f79a0c1f2f1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java @@ -117,6 +117,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO /** * Called to populate the cache for the bindings in the class scope. */ + @Override public void acceptUncached(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + MEMBERLIST); @@ -202,6 +203,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPClassScope getCompositeScope() { if (fScope == null) { fScope= new PDOMCPPClassScope(this); @@ -209,6 +211,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO return fScope; } + @Override public int getKey() { try { return getDB().getByte(record + KEY); @@ -218,6 +221,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public boolean isAnonymous() { try { return getDB().getByte(record + ANONYMOUS) != 0; @@ -227,6 +231,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -260,6 +265,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO return key == k_class ? k_struct : key; } + @Override public ICPPBase[] getBases() { Long key= record + PDOMCPPLinkage.CACHE_BASES; ICPPBase[] bases= (ICPPBase[]) getPDOM().getCachedResult(key); @@ -280,6 +286,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPConstructor[] getConstructors() { PDOMClassUtil.ConstructorCollector visitor= new PDOMClassUtil.ConstructorCollector(); try { @@ -291,6 +298,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPMethod[] getDeclaredMethods() { try { PDOMClassUtil.MethodCollector methods = new PDOMClassUtil.MethodCollector(false); @@ -302,6 +310,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPField[] getDeclaredFields() { try { PDOMClassUtil.FieldCollector visitor = new PDOMClassUtil.FieldCollector(); @@ -313,6 +322,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPClassType[] getNestedClasses() { try { PDOMClassUtil.NestedClassCollector visitor = new PDOMClassUtil.NestedClassCollector(); @@ -324,6 +334,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public IBinding[] getFriends() { try { final List list = new ArrayList(); @@ -338,18 +349,22 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO } } + @Override public ICPPMethod[] getMethods() { return ClassTypeHelper.getMethods(this); } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ClassTypeHelper.getAllDeclaredMethods(this); } + @Override public IField[] getFields() { return ClassTypeHelper.getFields(this); } + @Override public IField findField(String name) { return ClassTypeHelper.findField(this, name); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java index 1c853a74f4c..67d65e7672b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java @@ -81,14 +81,17 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization return IIndexCPPBindingConstants.CPP_DEFERRED_CLASS_INSTANCE; } + @Override public boolean isExplicitSpecialization() { return false; } + @Override public IScope getCompositeScope() { return asScope(); } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -112,6 +115,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization return false; } + @Override public ICPPClassTemplate getClassTemplate() { return (ICPPClassTemplate) getSpecializedBinding(); } @@ -129,47 +133,58 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization list.accept(visitor); } - public ICPPBase[] getBases() { + @Override + public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } - public IField[] getFields() { + @Override + public IField[] getFields() { return IField.EMPTY_FIELD_ARRAY; } - public IField findField(String name) { + @Override + public IField findField(String name) { return null; } - public ICPPField[] getDeclaredFields() { + @Override + public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } - public ICPPMethod[] getMethods() { + @Override + public ICPPMethod[] getMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPMethod[] getAllDeclaredMethods() { + @Override + public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPMethod[] getDeclaredMethods() { + @Override + public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } - public ICPPConstructor[] getConstructors() { + @Override + public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } - public IBinding[] getFriends() { + @Override + public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } - public int getKey(){ + @Override + public int getKey(){ return getClassTemplate().getKey(); } @@ -178,6 +193,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization throw new UnsupportedOperationException(); } + @Override public ICPPScope asScope() { if (unknownScope == null) { unknownScope= new PDOMCPPUnknownScope(this, getUnknownName()); @@ -185,14 +201,17 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization return unknownScope; } + @Override public IASTName getUnknownName() { return new CPPASTName(getNameCharArray()); } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return (ICPPTemplateDefinition) getSpecializedBinding(); } + @Override public ICPPTemplateArgument[] getTemplateArguments() { try { final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS); @@ -203,6 +222,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization } } + @Override public boolean isAnonymous() { return false; } @@ -219,6 +239,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization return map; } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java index 62c6cd90ab2..0514ae7a11e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java @@ -47,18 +47,22 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope { fBinding= binding; } + @Override public EScopeKind getKind() { return EScopeKind.eEnumeration; } + @Override public IBinding getBinding(IASTName name, boolean resolve) { return getBinding(name, resolve, null); } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) { return getBindings(name, resolve, prefixLookup, null); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) { try { CharArrayMap map= getBindingMap(fBinding); @@ -69,6 +73,7 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope { } } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) { try { CharArrayMap map= getBindingMap(fBinding); @@ -93,18 +98,22 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public IBinding[] find(String name) { return CPPSemantics.findBindings(this, name, false); } + @Override public IIndexBinding getScopeBinding() { return fBinding; } + @Override public IIndexScope getParent() { return fBinding.getScope(); } + @Override public IIndexName getScopeName() { return fBinding.getScopeName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java index 6d935832939..33cc375ef8f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java @@ -99,6 +99,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD return IIndexCPPBindingConstants.CPPENUMERATION; } + @Override public IEnumerator[] getEnumerators() { return PDOMCPPEnumScope.getEnumerators(this); } @@ -122,6 +123,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD return true; } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -148,6 +150,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD return false; } + @Override public long getMinValue() { if (fMinValue != null) { return fMinValue.longValue(); @@ -161,6 +164,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD return minValue; } + @Override public long getMaxValue() { if (fMaxValue != null) { return fMaxValue.longValue(); @@ -179,6 +183,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD throw new IllegalArgumentException("Enums must not be cloned"); //$NON-NLS-1$ } + @Override public boolean isScoped() { try { return getDB().getByte(record + OFFSET_FLAGS) != 0; @@ -187,6 +192,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD } } + @Override public IType getFixedType() { if (fFixedType == ProblemBinding.NOT_INITIALIZED) { fFixedType= loadFixedType(); @@ -203,6 +209,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD } } + @Override public ICPPScope asScope() { if (fScope == null) { fScope= new PDOMCPPEnumScope(this); @@ -210,10 +217,12 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD return fScope; } + @Override public void loadEnumerators(final CharArrayMap map) { try { PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + OFFSET_ENUMERATOR_LIST); list.accept(new IPDOMVisitor() { + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof PDOMCPPEnumerator) { final PDOMCPPEnumerator item = (PDOMCPPEnumerator) node; @@ -221,6 +230,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD } return true; } + @Override public void leave(IPDOMNode node) {} }); } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java index 8640fc9828d..80e2efa3428 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java @@ -67,6 +67,7 @@ class PDOMCPPEnumerator extends PDOMCPPBinding implements IEnumerator { storeValue((IEnumerator) newBinding); } + @Override public IType getType() throws DOMException { IIndexFragmentBinding owner = getOwner(); if (owner instanceof IType) @@ -74,6 +75,7 @@ class PDOMCPPEnumerator extends PDOMCPPBinding implements IEnumerator { return null; } + @Override public IValue getValue() { try { int val= getDB().getInt(record + VALUE); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java index 3bc3a5b46f2..9e09aeb0c02 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java @@ -47,10 +47,12 @@ class PDOMCPPField extends PDOMCPPVariable implements ICPPField { return IIndexCPPBindingConstants.CPPFIELD; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return PDOMCPPAnnotation.getVisibility(getByte(record + ANNOTATIONS)); } @@ -88,6 +90,7 @@ class PDOMCPPField extends PDOMCPPVariable implements ICPPField { return false; } + @Override public ICompositeType getCompositeTypeOwner() { return getClassOwner(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java index fe1365dad38..ada16051d73 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java @@ -64,10 +64,12 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi return (ICPPField) getSpecializedBinding(); } + @Override public ICompositeType getCompositeTypeOwner() { return getClassOwner(); } + @Override public IType getType() { try { return getLinkage().loadType(record + TYPE_OFFSET); @@ -77,6 +79,7 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi } } + @Override public IValue getInitialValue() { try { return getLinkage().loadValue(record + VALUE_OFFSET); @@ -86,34 +89,42 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi } } + @Override public boolean isAuto() { return getField().isAuto(); } + @Override public boolean isExtern() { return getField().isExtern(); } + @Override public boolean isExternC() { return false; } + @Override public boolean isRegister() { return getField().isRegister(); } + @Override public boolean isStatic() { return getField().isStatic(); } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return getField().getVisibility(); } + @Override public boolean isMutable() { return getField().isMutable(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java index 765e16e7d88..0dc03ab7a29 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java @@ -208,6 +208,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl getLinkage().storeType(record+FUNCTION_TYPE, ft); } + @Override public int getSignatureHash() throws CoreException { return getDB().getInt(record + SIGNATURE_HASH); } @@ -235,11 +236,13 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl return rec != 0 ? new PDOMCPPParameter(getLinkage(), rec, type) : null; } + @Override public boolean isInline() { return getBit(getAnnotation(), PDOMCAnnotation.INLINE_OFFSET); } + @Override public int getRequiredArgumentCount() { if (fRequiredArgCount == -1) { try { @@ -262,18 +265,22 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl return fAnnotation; } + @Override public boolean isExternC() { return getBit(getAnnotation(), PDOMCPPAnnotation.EXTERN_C_OFFSET); } + @Override public boolean isMutable() { return false; } + @Override public IScope getFunctionScope() { return null; } + @Override public ICPPParameter[] getParameters() { try { PDOMLinkage linkage= getLinkage(); @@ -298,6 +305,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl } } + @Override public final ICPPFunctionType getType() { if (fType == null) { try { @@ -310,32 +318,39 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl return fType; } + @Override public boolean isAuto() { // ISO/IEC 14882:2003 7.1.1.2 return false; } + @Override public boolean isDeleted() { return getBit(getAnnotation(), ANNOT_IS_DELETED); } + @Override public boolean isExtern() { return getBit(getAnnotation(), PDOMCAnnotation.EXTERN_OFFSET); } + @Override public boolean isRegister() { // ISO/IEC 14882:2003 7.1.1.2 return false; } + @Override public boolean isStatic() { return getBit(getAnnotation(), PDOMCAnnotation.STATIC_OFFSET); } + @Override public boolean takesVarArgs() { return getBit(getAnnotation(), PDOMCAnnotation.VARARGS_OFFSET); } + @Override public boolean hasParameterPack() { return getBit(getAnnotation(), ANNOT_PARAMETER_PACK); } @@ -367,6 +382,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl return 0; } + @Override public IType[] getExceptionSpecification() { try { final long rec = getPDOM().getDB().getRecPtr(record+EXCEPTION_SPEC); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java index fdb432d0b0f..7cea5740b6a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java @@ -65,10 +65,12 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I return IIndexCPPBindingConstants.CPP_FUNCTION_INSTANCE; } + @Override public ICPPTemplateDefinition getTemplateDefinition() { return (ICPPTemplateDefinition) getSpecializedBinding(); } + @Override public boolean isExplicitSpecialization() { try { return hasDeclaration(); @@ -77,6 +79,7 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I } } + @Override public ICPPTemplateArgument[] getTemplateArguments() { try { final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS); @@ -98,6 +101,7 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I } } + @Override @Deprecated public IType[] getArguments() { return CPPTemplates.getArguments(getTemplateArguments()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java index 72c2092749d..fcb5a413c11 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java @@ -151,6 +151,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP return IIndexCPPBindingConstants.CPP_FUNCTION_SPECIALIZATION; } + @Override public boolean isInline() { return getBit(readAnnotation(), PDOMCAnnotation.INLINE_OFFSET); } @@ -166,14 +167,17 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP return fAnnotation; } + @Override public boolean isMutable() { return false; } + @Override public IScope getFunctionScope() { return null; } + @Override public ICPPParameter[] getParameters() { try { PDOMLinkage linkage= getLinkage(); @@ -198,6 +202,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP } } + @Override public ICPPFunctionType getType() { if (fType == null) { try { @@ -210,33 +215,40 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP return fType; } + @Override public boolean isAuto() { // ISO/IEC 14882:2003 7.1.1.2 return false; } + @Override public boolean isExtern() { return getBit(readAnnotation(), PDOMCAnnotation.EXTERN_OFFSET); } + @Override public boolean isExternC() { return getBit(readAnnotation(), PDOMCPPAnnotation.EXTERN_C_OFFSET); } + @Override public boolean isRegister() { // ISO/IEC 14882:2003 7.1.1.2 return false; } + @Override public boolean isStatic() { return getBit(readAnnotation(), PDOMCAnnotation.STATIC_OFFSET); } + @Override public boolean takesVarArgs() { return getBit(readAnnotation(), PDOMCAnnotation.VARARGS_OFFSET); } + @Override public int getRequiredArgumentCount() { if (fRequiredArgCount == -1) { try { @@ -248,10 +260,12 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP return fRequiredArgCount; } + @Override public boolean hasParameterPack() { return getBit(readAnnotation(), ANNOT_PARAMETER_PACK); } + @Override public boolean isDeleted() { return getBit(readAnnotation(), ANNOT_IS_DELETED); } @@ -274,6 +288,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP return cmp==0 ? PDOMCPPFunction.compareSignatures(this, other) : cmp; } + @Override public IType[] getExceptionSpecification() { try { final long rec = getPDOM().getDB().getRecPtr(record+EXCEPTION_SPEC); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java index f1ed558d752..d47af8e9d5c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java @@ -73,6 +73,7 @@ class PDOMCPPFunctionTemplate extends PDOMCPPFunction return IIndexCPPBindingConstants.CPP_FUNCTION_TEMPLATE; } + @Override public IPDOMCPPTemplateParameter[] getTemplateParameters() { if (params == null) { try { @@ -90,18 +91,22 @@ class PDOMCPPFunctionTemplate extends PDOMCPPFunction return params; } + @Override public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) { return PDOMInstanceCache.getCache(this).getInstance(arguments); } + @Override public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) { PDOMInstanceCache.getCache(this).addInstance(arguments, instance); } + @Override public ICPPTemplateInstance[] getAllInstances() { return PDOMInstanceCache.getCache(this).getAllInstances(); } + @Override public ICPPTemplateParameter adaptTemplateParameter(ICPPTemplateParameter param) { // Template parameters are identified by their position in the parameter list. int pos = param.getParameterPosition(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java index 3a14fc814d8..9c3e6cf40d8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java @@ -44,19 +44,23 @@ class PDOMCPPFunctionTemplateSpecialization extends PDOMCPPFunctionSpecializatio return IIndexCPPBindingConstants.CPP_FUNCTION_TEMPLATE_SPECIALIZATION; } + @Override public ICPPTemplateParameter[] getTemplateParameters() { ICPPFunctionTemplate template = (ICPPFunctionTemplate) getSpecializedBinding(); return template.getTemplateParameters(); } + @Override public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) { return PDOMInstanceCache.getCache(this).getInstance(arguments); } + @Override public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) { PDOMInstanceCache.getCache(this).addInstance(arguments, instance); } + @Override public ICPPTemplateInstance[] getAllInstances() { return PDOMInstanceCache.getCache(this).getAllInstances(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java index bbd4eb3b474..9f4bdfe97e0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java @@ -22,10 +22,12 @@ import org.eclipse.core.runtime.CoreException; */ public class PDOMCPPLinkageFactory implements IPDOMLinkageFactory { + @Override public PDOMLinkage getLinkage(PDOM pdom, long record) { return new PDOMCPPLinkage(pdom, record); } + @Override public PDOMLinkage createLinkage(PDOM pdom) throws CoreException { return new PDOMCPPLinkage(pdom); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java index fe5f3c02950..4fb803f0ba4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java @@ -50,6 +50,7 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements ICPPMetho return IIndexCPPBindingConstants.CPP_METHOD_INSTANCE; } + @Override public boolean isDestructor() { return ((ICPPMethod)getTemplateDefinition()).isDestructor(); } @@ -59,26 +60,32 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements ICPPMetho return false; } + @Override public boolean isImplicit() { return ((ICPPMethod)getTemplateDefinition()).isImplicit(); } + @Override public boolean isVirtual() { return ((ICPPMethod)getTemplateDefinition()).isVirtual(); } + @Override public boolean isPureVirtual() { return ((ICPPMethod)getTemplateDefinition()).isPureVirtual(); } + @Override public boolean isExplicit() { return ((ICPPMethod)getTemplateDefinition()).isExplicit(); } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return ((ICPPMethod)getTemplateDefinition()).getVisibility(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java index e7c45b5cde5..03dfa708e9d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java @@ -78,22 +78,27 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization return IIndexCPPBindingConstants.CPP_METHOD_SPECIALIZATION; } + @Override public boolean isDestructor() { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.DESTRUCTOR_OFFSET); } + @Override public boolean isImplicit() { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.IMPLICIT_METHOD_OFFSET); } + @Override public boolean isExplicit() { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.EXPLICIT_METHOD_OFFSET); } + @Override public boolean isVirtual() { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.VIRTUAL_OFFSET); } + @Override public boolean isPureVirtual() { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.PURE_VIRTUAL_OFFSET); } @@ -109,10 +114,12 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization return false; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return PDOMCPPAnnotation.getVisibility(getByte(record + ANNOTATION_OFFSET)); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java index 9f368747ae6..fc246b59470 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java @@ -79,6 +79,7 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE; } + @Override public boolean isDestructor() { return getBit(getAnnotation1(), PDOMCPPAnnotation.DESTRUCTOR_OFFSET); } @@ -89,22 +90,27 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho return annotation1; } + @Override public boolean isImplicit() { return getBit(getAnnotation1(), PDOMCPPAnnotation.IMPLICIT_METHOD_OFFSET); } + @Override public boolean isExplicit() { return getBit(getAnnotation1(), PDOMCPPAnnotation.EXPLICIT_METHOD_OFFSET); } + @Override public boolean isVirtual() { return getBit(getAnnotation1(), PDOMCPPAnnotation.VIRTUAL_OFFSET); } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { return PDOMCPPAnnotation.getVisibility(getAnnotation()); } @@ -140,6 +146,7 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho return false; } + @Override public boolean isPureVirtual() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java index 1771a31ed99..ba697af9949 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java @@ -42,6 +42,7 @@ class PDOMCPPMethodTemplateSpecialization extends return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE_SPECIALIZATION; } + @Override public boolean isDestructor() { IBinding spec = getSpecializedBinding(); if (spec instanceof ICPPMethod) { @@ -50,6 +51,7 @@ class PDOMCPPMethodTemplateSpecialization extends return false; } + @Override public boolean isImplicit() { IBinding spec = getSpecializedBinding(); if (spec instanceof ICPPMethod) { @@ -58,6 +60,7 @@ class PDOMCPPMethodTemplateSpecialization extends return false; } + @Override public boolean isExplicit() { IBinding spec = getSpecializedBinding(); if (spec instanceof ICPPMethod) { @@ -66,6 +69,7 @@ class PDOMCPPMethodTemplateSpecialization extends return false; } + @Override public boolean isVirtual() { IBinding spec = getSpecializedBinding(); if (spec instanceof ICPPMethod) { @@ -74,10 +78,12 @@ class PDOMCPPMethodTemplateSpecialization extends return false; } + @Override public ICPPClassType getClassOwner() { return (ICPPClassType) getOwner(); } + @Override public int getVisibility() { IBinding spec = getSpecializedBinding(); if (spec instanceof ICPPMethod) { @@ -91,6 +97,7 @@ class PDOMCPPMethodTemplateSpecialization extends return false; } + @Override public boolean isPureVirtual() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java index 2ff8c6ea598..33f84b2ad59 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java @@ -86,6 +86,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding getDB().putByte(record + FLAG_OFFSET, (byte) flag); } + @Override public EScopeKind getKind() { return EScopeKind.eNamespace; } @@ -110,9 +111,11 @@ class PDOMCPPNamespace extends PDOMCPPBinding getIndex().accept((IBTreeVisitor) visitor); } else { getIndex().accept(new IBTreeVisitor() { + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { PDOMBinding binding = getLinkage().getBinding(record); if (binding != null) { @@ -142,14 +145,17 @@ class PDOMCPPNamespace extends PDOMCPPBinding db.putRecPtr(listRecord, record); } + @Override public ICPPNamespaceScope getNamespaceScope() { return this; } + @Override public ICPPUsingDirective[] getUsingDirectives() { return ICPPUsingDirective.EMPTY_ARRAY; } + @Override public IBinding[] find(String name) { try { BindingCollector visitor = new BindingCollector(getLinkage(), name.toCharArray(), @@ -194,7 +200,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding } catch (CoreException e) { CCorePlugin.log(e); } - return (IBinding[]) ArrayUtil.trim(IBinding.class, result); + return ArrayUtil.trim(IBinding.class, result); } private IBinding[] getBindingsViaCache(final char[] name) throws CoreException { @@ -217,14 +223,17 @@ class PDOMCPPNamespace extends PDOMCPPBinding return true; } + @Override public IBinding[] getMemberBindings() { IBinding[] result = null; final List preresult = new ArrayList(); try { getIndex().accept(new IBTreeVisitor() { + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { preresult.add(getLinkage().getNode(record)); return true; @@ -237,10 +246,12 @@ class PDOMCPPNamespace extends PDOMCPPBinding return result; } + @Override public void addUsingDirective(ICPPUsingDirective directive) { throw new UnsupportedOperationException(); } + @Override public IIndexBinding getScopeBinding() { return this; } @@ -254,6 +265,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON)); } + @Override public ICPPNamespaceScope[] getInlineNamespaces() { if (fInlineNamespaces == null) { List nslist = collectInlineNamespaces(getDB(), getLinkage(), @@ -288,6 +300,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding return nslist; } + @Override public boolean isInline() { if (fFlag == -1) { try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java index ef058652067..15b1016d5da 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java @@ -68,6 +68,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias return IIndexCPPBindingConstants.CPPNAMESPACEALIAS; } + @Override public ICPPNamespaceScope getNamespaceScope() { return getNamespaceScope(this, 20); // avoid an infinite loop. } @@ -87,6 +88,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias return null; } + @Override public IBinding[] getMemberBindings() { ICPPNamespace ns= this; for (int i = 0; i < 20; i++) { @@ -104,6 +106,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias return ns.getMemberBindings(); } + @Override public IBinding getBinding() { try { return (IBinding) getLinkage().getNode(getPDOM().getDB().getRecPtr(record + NAMESPACE_BINDING)); @@ -113,6 +116,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias return null; } + @Override public boolean isInline() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java index 53b8825570d..beed91a0823 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java @@ -96,61 +96,74 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind return IIndexCPPBindingConstants.CPPPARAMETER; } + @Override public String[] getQualifiedName() { return new String[] {getName()}; } + @Override public char[][] getQualifiedNameCharArray() throws DOMException { return new char[][]{getNameCharArray()}; } + @Override public boolean isGloballyQualified() { return false; } + @Override public boolean isMutable() { // ISO/IEC 14882:2003 7.1.1.8 return false; } + @Override public IType getType() { return fType; } + @Override public boolean isAuto() { // ISO/IEC 14882:2003 7.1.1.2 byte flag = 1<> 16); } + @Override public boolean isParameterPack() { return getType() instanceof ICPPParameterPackType; } + @Override public int getParameterID() { readParamID(); return fCachedParamID; @@ -136,6 +142,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem linkage.storeType(record + TYPE_OFFSET, newType); } + @Override public void configure(ICPPTemplateParameter param) { try { if (param instanceof ICPPTemplateNonTypeParameter) { @@ -161,6 +168,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem } } + @Override public IType getType() { if (fType == null) { try { @@ -172,24 +180,31 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem return fType; } + @Override public IValue getInitialValue() { return null; } + @Override public boolean isAuto() { return false; } + @Override public boolean isExtern() { return false; } + @Override public boolean isRegister() { return false; } + @Override public boolean isStatic() { return false; } + @Override public boolean isExternC() { return false; } + @Override public boolean isMutable() { return false; } @@ -201,6 +216,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem /** * @deprecated */ + @Override @Deprecated public IASTExpression getDefault() { return null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java index 42fb3abf1e0..091b5db7277 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java @@ -94,20 +94,24 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return IIndexCPPBindingConstants.CPP_TEMPLATE_TEMPLATE_PARAMETER; } + @Override public short getParameterPosition() { return (short) getParameterID(); } + @Override public short getTemplateNestingLevel() { readParamID(); return (short)(getParameterID() >> 16); } + @Override public boolean isParameterPack() { readParamID(); return (fCachedParamID & PACK_BIT) != 0; } + @Override public int getParameterID() { readParamID(); return fCachedParamID & ~PACK_BIT; @@ -137,6 +141,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding list.accept(visitor); } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -148,6 +153,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return getParameterID() == ((ICPPTemplateParameter) type).getParameterID(); } + @Override public IType getDefault() { try { return getLinkage().loadType(record + DEFAULT_TYPE); @@ -157,6 +163,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return null; } + @Override public ICPPTemplateArgument getDefaultValue() { IType d= getDefault(); if (d == null) @@ -171,6 +178,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding } + @Override public ICPPScope asScope() { if (fUnknownScope == null) { fUnknownScope= new PDOMCPPUnknownScope(this, new CPPASTName(getNameCharArray())); @@ -178,10 +186,12 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return fUnknownScope; } + @Override public IASTName getUnknownName() { return new CPPASTName(getNameCharArray()); } + @Override public void configure(ICPPTemplateParameter param) { try { ICPPTemplateArgument val= param.getDefaultValue(); @@ -227,6 +237,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding } } + @Override public void forceDelete(PDOMLinkage linkage) throws CoreException { getDBName().delete(); linkage.storeType(record + DEFAULT_TYPE, null); @@ -241,6 +252,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding } } + @Override public IPDOMCPPTemplateParameter[] getTemplateParameters() { if (params == null) { try { @@ -258,62 +270,77 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return params; } + @Override public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() { return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY; } + @Override public IField findField(String name) { return null; } + @Override public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } + @Override public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } + @Override public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } + @Override public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public IField[] getFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } + @Override public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } + @Override public ICPPMethod[] getMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } + @Override public IScope getCompositeScope() { return asScope(); } + @Override public int getKey() { return 0; } + @Override public boolean isAnonymous() { return false; } + @Override public ICPPTemplateParameter adaptTemplateParameter(ICPPTemplateParameter param) { int pos = param.getParameterPosition(); ICPPTemplateParameter[] pars = getTemplateParameters(); @@ -335,6 +362,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding return null; } + @Override public ICPPDeferredClassInstance asDeferredInstance() throws DOMException { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java index c8c3f1ae74d..fe65201466d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java @@ -80,20 +80,24 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember return IIndexCPPBindingConstants.CPP_TEMPLATE_TYPE_PARAMETER; } + @Override public short getParameterPosition() { return (short) getParameterID(); } + @Override public short getTemplateNestingLevel() { readParamID(); return (short)(getParameterID() >> 16); } + @Override public boolean isParameterPack() { readParamID(); return (fCachedParamID & PACK_BIT) != 0; } + @Override public int getParameterID() { readParamID(); return fCachedParamID & ~PACK_BIT; @@ -123,6 +127,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember list.accept(visitor); } + @Override public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); @@ -134,6 +139,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember return getParameterID() == ((ICPPTemplateParameter) type).getParameterID(); } + @Override public IType getDefault() { try { return getLinkage().loadType(record + DEFAULT_TYPE); @@ -143,6 +149,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember return null; } + @Override public ICPPTemplateArgument getDefaultValue() { IType d= getDefault(); if (d == null) @@ -156,6 +163,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember throw new UnsupportedOperationException(); } + @Override public ICPPScope asScope() { if (fUnknownScope == null) { fUnknownScope= new PDOMCPPUnknownScope(this, new CPPASTName(getNameCharArray())); @@ -163,10 +171,12 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember return fUnknownScope; } + @Override public IASTName getUnknownName() { return new CPPASTName(getNameCharArray()); } + @Override public void configure(ICPPTemplateParameter param) { try { ICPPTemplateArgument val= param.getDefaultValue(); @@ -198,6 +208,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember } } + @Override public void forceDelete(PDOMLinkage linkage) throws CoreException { getDBName().delete(); getLinkage().storeType(record + DEFAULT_TYPE, null); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java index a13b13fbf36..32a54c1fcf4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java @@ -73,6 +73,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp return IIndexCPPBindingConstants.CPP_TYPEDEF_SPECIALIZATION; } + @Override public IType getType() { try { return getLinkage().loadType(record + TYPE_OFFSET); @@ -82,6 +83,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp } } + @Override public boolean isSameType(IType o) { if( this.equals(o) ) return true; @@ -98,6 +100,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp return false; } + @Override public void setType(IType type) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java index a24efe9dd98..ccde7a87f8a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java @@ -46,7 +46,8 @@ class PDOMCPPUnknownBinding extends PDOMCPPBinding implements ICPPUnknownBinding return IIndexCPPBindingConstants.CPP_UNKNOWN_BINDING; } - public ICPPScope asScope() { + @Override + public ICPPScope asScope() { return null; } @@ -55,6 +56,7 @@ class PDOMCPPUnknownBinding extends PDOMCPPBinding implements ICPPUnknownBinding return false; } + @Override public IASTName getUnknownName() { return new CPPASTName(getNameCharArray()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java index c8798925839..272deb85c00 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java @@ -71,10 +71,12 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP return IIndexCPPBindingConstants.CPP_UNKNOWN_CLASS_INSTANCE; } + @Override public int getSignatureHash() throws CoreException { return getDB().getInt(record + SIGNATURE_HASH); } + @Override public ICPPTemplateArgument[] getArguments() { if (arguments == null) { try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java index 7733501a587..8e219260eae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java @@ -66,6 +66,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass super(linkage, bindingRecord); } + @Override public EScopeKind getKind() { return EScopeKind.eClassType; } @@ -106,10 +107,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass list.accept(visitor); } + @Override public ICPPMethod[] getImplicitMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } + @Override public IScope getCompositeScope() { return this; } @@ -122,10 +125,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass return unknownScope; } + @Override public IIndexBinding getScopeBinding() { return this; } + @Override public ICPPClassType getClassType() { return this; } @@ -140,6 +145,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass return IBinding.EMPTY_BINDING_ARRAY; } + @Override public IBinding[] find(String name) { return CPPSemantics.findBindings(this, name, false); } @@ -151,6 +157,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass throw new UnsupportedOperationException(); } + @Override public IField findField(String name) { return null; } @@ -163,70 +170,80 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getBases() */ - public ICPPBase[] getBases() { + @Override + public ICPPBase[] getBases() { return ICPPBase.EMPTY_BASE_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getFields() */ - public IField[] getFields() { + @Override + public IField[] getFields() { return IField.EMPTY_FIELD_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredFields() */ - public ICPPField[] getDeclaredFields() { + @Override + public ICPPField[] getDeclaredFields() { return ICPPField.EMPTY_CPPFIELD_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getMethods() */ - public ICPPMethod[] getMethods() { + @Override + public ICPPMethod[] getMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getAllDeclaredMethods() */ - public ICPPMethod[] getAllDeclaredMethods() { + @Override + public ICPPMethod[] getAllDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredMethods() */ - public ICPPMethod[] getDeclaredMethods() { + @Override + public ICPPMethod[] getDeclaredMethods() { return ICPPMethod.EMPTY_CPPMETHOD_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getConstructors() */ - public ICPPConstructor[] getConstructors() { + @Override + public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getFriends() */ - public IBinding[] getFriends() { + @Override + public IBinding[] getFriends() { return IBinding.EMPTY_BINDING_ARRAY; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getKey() */ - public int getKey() { + @Override + public int getKey() { return 0; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) */ - public boolean isSameType(IType type) { + @Override + public boolean isSameType(IType type) { if (type instanceof ITypedef) { return type.isSameType(this); } @@ -255,10 +272,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass return false; } + @Override public ICPPClassType[] getNestedClasses() { return ICPPClassType.EMPTY_CLASS_ARRAY; } + @Override public boolean isAnonymous() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java index 07ceaa1c657..888d4713d27 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java @@ -91,6 +91,7 @@ class PDOMCPPUsingDeclaration extends PDOMCPPBinding implements ICPPUsingDeclara return IIndexCPPBindingConstants.CPP_USING_DECLARATION; } + @Override public IBinding[] getDelegates() { if (delegates == null) { delegates = new IBinding[1]; @@ -100,13 +101,13 @@ class PDOMCPPUsingDeclaration extends PDOMCPPBinding implements ICPPUsingDeclara do { IBinding delegate = alias.getBinding(); if (delegate != null) { - delegates= (IBinding[]) ArrayUtil.append(IBinding.class, delegates, i++, delegate); + delegates= ArrayUtil.appendAt(IBinding.class, delegates, i++, delegate); } } while ((alias = alias.getNext()) != null); } catch (CoreException e) { CCorePlugin.log(e); } - delegates = (IBinding[]) ArrayUtil.trim(IBinding.class, delegates); + delegates = ArrayUtil.trim(IBinding.class, delegates); } return delegates; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java index 5e84e80e8a6..2a305683c4f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java @@ -64,18 +64,21 @@ class PDOMCPPUsingDeclarationSpecialization extends PDOMCPPSpecialization implem return IIndexCPPBindingConstants.CPP_USING_DECLARATION; } + @Override public IBinding[] getDelegates() { if (delegates == null) { PDOMNodeLinkedList list= new PDOMNodeLinkedList(getLinkage(), record+TARGET_BINDINGS); final List result= new ArrayList(); try { list.accept(new IPDOMVisitor() { + @Override public boolean visit(IPDOMNode node) { if (node instanceof IBinding) { result.add((IBinding) node); } return true; } + @Override public void leave(IPDOMNode node) { } }); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java index 0e3b9ff9c1b..641d095b5e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java @@ -62,6 +62,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getNamespace() */ + @Override public ICPPNamespaceScope getNominatedScope() { try { long rec = fLinkage.getDB().getRecPtr(fRecord + NOMINATED_NAMESPACE); @@ -79,6 +80,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getContainingScope() */ + @Override public IScope getContainingScope() { try { long rec = fLinkage.getDB().getRecPtr(fRecord + CONTAINER_NAMESPACE); @@ -97,6 +99,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getPointOfDeclaration() */ + @Override public int getPointOfDeclaration() { final Database db= fLinkage.getDB(); try { @@ -118,9 +121,11 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.IPDOMNode#accept(org.eclipse.cdt.core.dom.IPDOMVisitor) */ + @Override public void accept(IPDOMVisitor visitor) throws CoreException { } + @Override public void delete(PDOMLinkage linkage) throws CoreException { fLinkage.getDB().free(fRecord); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java index f6ec0c1d112..0f357c206d0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java @@ -89,11 +89,13 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable { return IIndexCPPBindingConstants.CPPVARIABLE; } + @Override public boolean isMutable() { // ISO/IEC 14882:2003 7.1.1.8 return false; } + @Override public IType getType() { try { return getLinkage().loadType(record + TYPE_OFFSET); @@ -103,6 +105,7 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable { } } + @Override public IValue getInitialValue() { try { return getLinkage().loadValue(record + VALUE_OFFSET); @@ -112,22 +115,27 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable { } } + @Override public boolean isAuto() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.AUTO_OFFSET); } + @Override public boolean isExtern() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET); } + @Override public boolean isExternC() { return getBit(getByte(record + ANNOTATIONS), PDOMCPPAnnotation.EXTERN_C_OFFSET); } + @Override public boolean isRegister() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.REGISTER_OFFSET); } + @Override public boolean isStatic() { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java index 99a51cfb63d..eeb07ceb5fb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java @@ -31,6 +31,7 @@ import org.eclipse.core.runtime.CoreException; class PDOMClassUtil { static class FieldCollector implements IPDOMVisitor { private List fields = new ArrayList(); + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof ICPPField) { ICPPField field= (ICPPField) node; @@ -40,6 +41,7 @@ class PDOMClassUtil { } return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public ICPPField[] getFields() { @@ -49,6 +51,7 @@ class PDOMClassUtil { static class ConstructorCollector implements IPDOMVisitor { private List fConstructors = new ArrayList(); + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof ICPPConstructor) { ICPPConstructor cons= (ICPPConstructor) node; @@ -64,6 +67,7 @@ class PDOMClassUtil { } return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public ICPPConstructor[] getConstructors() { @@ -83,6 +87,7 @@ class PDOMClassUtil { this.acceptNonImplicit= acceptNonImplicit; this.filter= acceptImplicit ? IndexFilter.ALL_DECLARED_OR_IMPLICIT : IndexFilter.ALL_DECLARED; } + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof ICPPMethod) { ICPPMethod method= (ICPPMethod) node; @@ -94,6 +99,7 @@ class PDOMClassUtil { } return false; // don't visit the method } + @Override public void leave(IPDOMNode node) throws CoreException { } public ICPPMethod[] getMethods() { @@ -103,11 +109,13 @@ class PDOMClassUtil { static class NestedClassCollector implements IPDOMVisitor { private List nestedClasses = new ArrayList(); + @Override public boolean visit(IPDOMNode node) throws CoreException { if (node instanceof ICPPClassType) nestedClasses.add(node); return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public ICPPClassType[] getNestedClasses() { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java index 6942e477255..03d2d1c8b2a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java @@ -62,6 +62,7 @@ public class GeneratePDOMApplication implements IApplication { * Starts this application * @throws CoreException on an unexpected failure */ + @Override public Object start(IApplicationContext context) throws CoreException { Object result= IApplication.EXIT_OK; try { @@ -151,6 +152,7 @@ public class GeneratePDOMApplication implements IApplication { System.out.println(s); } + @Override public void stop() { // do nothing } @@ -248,15 +250,19 @@ public class GeneratePDOMApplication implements IApplication { return true; } + @Override public void done() { } + @Override public void worked(int work) { internalWorked(work); } + @Override public void beginTask(String name, int total) { this.taskName = name; this.totalWork = total; } + @Override public void internalWorked(double work) { synchronized(mutex) { worked += work; @@ -267,16 +273,20 @@ public class GeneratePDOMApplication implements IApplication { } } + @Override public boolean isCanceled() { return canceled; } + @Override public void setCanceled(boolean value) { canceled = value; } + @Override public void setTaskName(String name) { taskName = name; } + @Override public void subTask(String name) { subTask = name; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java index 381625b9c6a..66da09ce548 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java @@ -24,10 +24,12 @@ public class PDOMFastIndexer extends AbstractPDOMIndexer { // Must match extension id public static final String ID = IPDOMManager.ID_FAST_INDEXER; + @Override public String getID() { return ID; } + @Override public IPDOMIndexerTask createTask(ITranslationUnit[] added, ITranslationUnit[] changed, ITranslationUnit[] removed) { return new PDOMFastIndexerTask(this, added, changed, removed); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java index 7203bf83bab..51c6b58379e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java @@ -27,10 +27,12 @@ public class PDOMNullIndexer extends AbstractPDOMIndexer { fProperties.clear(); // don't accept any properties } + @Override public String getID() { return ID; } + @Override public IPDOMIndexerTask createTask(ITranslationUnit[] added, ITranslationUnit[] changed, ITranslationUnit[] removed) { return null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java index 34304635d93..3efed4ab73b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java @@ -63,10 +63,12 @@ public class PDOMUpdateTask implements IPDOMIndexerTask { return progress; } + @Override public IPDOMIndexer getIndexer() { return fIndexer; } + @Override public void run(IProgressMonitor monitor) throws InterruptedException { monitor.subTask(NLS.bind(Messages.PDOMIndexerTask_collectingFilesTask, fIndexer.getProject().getElementName())); @@ -143,10 +145,12 @@ public class PDOMUpdateTask implements IPDOMIndexerTask { } } + @Override public synchronized IndexerProgress getProgressInformation() { return fDelegate != null ? fDelegate.getProgressInformation() : fProgress; } + @Override public synchronized boolean acceptUrgentTask(IPDOMIndexerTask task) { return fDelegate != null && fDelegate.acceptUrgentTask(task); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java index 1edfa61b7dd..a16957cfc7e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java @@ -43,6 +43,7 @@ public class ProjectIndexerIncludeResolutionHeuristics implements IIncludeFileRe fIgnoreCase= resolver.isCaseInsensitiveFileSystem(); } + @Override public String findInclusion(String include, String currentFile) { final IIndexFileLocation ifl= fResolver.resolveASTPath(currentFile); if (ifl == null || ifl.getFullPath() == null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java index 4a834ff0e39..07099d456f2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java @@ -95,6 +95,7 @@ public class TodoTaskUpdater implements ITodoTaskUpdater { taskParser = new TodoTaskParser(taskTags, taskPriorities, isTaskCaseSensitive); } + @Override public void updateTasks(IASTComment[] comments, IIndexFileLocation[] filesToUpdate) { class TaskList { IFile fFile; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java index 6bf16893d5a..641b347e728 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java @@ -29,6 +29,7 @@ final public class TranslationUnitCollector implements ICElementVisitor { fProgressMonitor= pm; } + @Override public boolean visit(ICElement element) throws CoreException { if (fProgressMonitor.isCanceled()) { return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java index ec5ec716d80..a7c2731dee3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java @@ -31,20 +31,24 @@ public class TriggerNotificationTask implements IPDOMIndexerTask { fPDOM= pdom; } + @Override public IPDOMIndexer getIndexer() { return null; } + @Override public IndexerProgress getProgressInformation() { return new IndexerProgress(); } + @Override public void run(IProgressMonitor monitor) { ChangeEvent event= new ChangeEvent(); event.setReloaded(); fManager.handleChange(fPDOM, event); } + @Override public boolean acceptUrgentTask(IPDOMIndexerTask task) { return false; } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableManager.java deleted file mode 100644 index 30ab3259a43..00000000000 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PathEntryVariableManager.java +++ /dev/null @@ -1,290 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2008 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software Systems - Initial API and implementation - * Markus Schorn (Wind River Systems) - *******************************************************************************/ - -package org.eclipse.cdt.internal.core; - -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.resources.IPathEntryVariableChangeListener; -import org.eclipse.cdt.core.resources.IPathEntryVariableManager; -import org.eclipse.cdt.core.resources.PathEntryVariableChangeEvent; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.ISafeRunnable; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Preferences; -import org.eclipse.core.runtime.SafeRunner; - - - -/** - * Core's implementation of IPathEntryVariableManager. - */ -public class PathEntryVariableManager implements IPathEntryVariableManager { - - private Set listeners; - private Preferences preferences; - - static final String VARIABLE_PREFIX = "pathEntryVariable."; //$NON-NLS-1$ - - /** - * Constructor for the class. - * - * The current manager implementation is not used any more - * Instead the CdtVarPathEntryVariableManager is used that actually wraps the CdtVariables contributed at workspace level - * - * NOTE: all PathEntryVariableManager functionality remains workable with the new - * CdtVarPathEntryVariableManager. We could either remove this class or copy the contents of the - * CdtVarPathEntryVariableManager to this class to preserve internal class name for better backward compatibility. - * - * - */ - private PathEntryVariableManager() { - this.listeners = Collections.synchronizedSet(new HashSet()); - this.preferences = CCorePlugin.getDefault().getPluginPreferences(); - } - - /** - * Note that if a user changes the key in the preferences file to be invalid - * and then calls #getValue using that key, they will get the value back for - * that. But then if they try and call #setValue using the same key it will throw - * an exception. We may want to revisit this behaviour in the future. - * - * @see org.eclipse.cdt.core.resources.IPathEntryVariableManager#getValue(String) - */ - @Override - public IPath getValue(String varName) { - String key = getKeyForName(varName); - String value = preferences.getString(key); - return value.length() == 0 ? null : Path.fromPortableString(value); - } - - /** - * @see org.eclipse.cdt.core.resources.IPathEntryVariableManager#setValue(String, IPath) - */ - @Override - public void setValue(String varName, IPath newValue) throws CoreException { - //if the location doesn't have a device, see if the OS will assign one - if (newValue != null && newValue.isAbsolute() && newValue.getDevice() == null) { - newValue = new Path(newValue.toFile().getAbsolutePath()); - } - int eventType; - // read previous value and set new value atomically in order to generate the right event - synchronized (this) { - IPath currentValue = getValue(varName); - boolean variableExists = currentValue != null; - if (currentValue == null) { - if (newValue == null) { - return; - } - } else if (currentValue.equals(newValue)) { - return; - } - if (newValue == null) { - preferences.setToDefault(getKeyForName(varName)); - eventType = PathEntryVariableChangeEvent.VARIABLE_DELETED; - } else { - preferences.setValue(getKeyForName(varName), newValue.toPortableString()); - eventType = variableExists ? PathEntryVariableChangeEvent.VARIABLE_CHANGED : PathEntryVariableChangeEvent.VARIABLE_CREATED; - } - } - // notify listeners from outside the synchronized block to avoid deadlocks - fireVariableChangeEvent(varName, newValue, eventType); - } - - /** - * Return a key to use in the Preferences. - */ - private String getKeyForName(String varName) { - return VARIABLE_PREFIX + varName; - } - - /** - * @see org.eclipse.cdt.core.resources.IPathEntryVariableManager#resolvePath(IPath) - */ - @Override - public IPath resolvePath(IPath path) { - if (path == null || path.segmentCount() == 0) { - return path; - } - String variable = path.toPortableString(); - if (variable.indexOf('$') == -1) { - return path; - } - String value = expandVariable(variable); - return (value == null || value.length() == 0) ? Path.EMPTY : new Path(value); - } - - /** - * Fires a property change event corresponding to a change to the - * current value of the variable with the given name. - * - * @param name the name of the variable, to be used as the variable - * in the event object - * @param value the current value of the path variable or null if - * the variable was deleted - * @param type one of IPathVariableChangeEvent.VARIABLE_CREATED, - * PathEntryVariableChangeEvent.VARIABLE_CHANGED, or - * PathEntryVariableChangeEvent.VARIABLE_DELETED - * @see PathEntryVariableChangeEvent - * @see PathEntryVariableChangeEvent#VARIABLE_CREATED - * @see PathEntryVariableChangeEvent#VARIABLE_CHANGED - * @see PathEntryVariableChangeEvent#VARIABLE_DELETED - */ - private void fireVariableChangeEvent(String name, IPath value, int type) { - if (this.listeners.size() == 0) - return; - // use a separate collection to avoid interference of simultaneous additions/removals - Object[] listenerArray = this.listeners.toArray(); - final PathEntryVariableChangeEvent pve = new PathEntryVariableChangeEvent(this, name, value, type); - for (int i = 0; i < listenerArray.length; ++i) { - final IPathEntryVariableChangeListener l = (IPathEntryVariableChangeListener) listenerArray[i]; - ISafeRunnable job = new ISafeRunnable() { - @Override - public void handleException(Throwable exception) { - // already being logged in Platform#run() - } - - @Override - public void run() throws Exception { - l.pathVariableChanged(pve); - } - }; - SafeRunner.run(job); - } - } - - /** - * @see org.eclipse.core.resources.IPathVariableManager#getPathVariableNames() - */ - @Override - public String[] getVariableNames() { - List result = new LinkedList(); - String[] names = preferences.propertyNames(); - for (String name : names) { - if (name.startsWith(VARIABLE_PREFIX)) { - String key = name.substring(VARIABLE_PREFIX.length()); - result.add(key); - } - } - return result.toArray(new String[result.size()]); - } - - /** - * @see org.eclipse.cdt.core.resources. - * IPathEntryVariableManager#addChangeListener(IPathEntryVariableChangeListener) - */ - @Override - public void addChangeListener(IPathEntryVariableChangeListener listener) { - listeners.add(listener); - } - - /** - * @see org.eclipse.cdt.core.resources. - * IPathEntryVariableManager#removeChangeListener(IPathEntryVariableChangeListener) - */ - @Override - public void removeChangeListener(IPathEntryVariableChangeListener listener) { - listeners.remove(listener); - } - - /** - * @see org.eclipse.core.resources.IPathVariableManager#isDefined(String) - */ - @Override - public boolean isDefined(String varName) { - return getValue(varName) != null; - } - - public void startup() { - } - - public void shutdown() { - } - - /** - * Expand the variable with the format ${key}. example: - * with variable HOME=/foobar - * ${HOME}/project - * The the return value will be /foobar/project. - */ - protected String expandVariable(String variable) { - StringBuffer sb = new StringBuffer(); - StringBuffer param = new StringBuffer(); - char prev = '\n'; - char ch = prev; - boolean inMacro = false; - boolean inSingleQuote = false; - - for (int i = 0; i < variable.length(); i++) { - ch = variable.charAt(i); - switch (ch) { - case '\'': - if (prev != '\\') { - inSingleQuote = !inSingleQuote; - } - break; - - case '$' : - if (!inSingleQuote && prev != '\\') { - if (i < variable.length() && variable.indexOf('}', i) > 0) { - char c = variable.charAt(i + 1); - if (c == '{') { - param.setLength(0); - inMacro = true; - prev = ch; - continue; - } - } - } - break; - - case '}' : - if (inMacro) { - inMacro = false; - String p = param.toString(); - IPath path = getValue(p); - if (path != null) { - String v = path.toPortableString(); - if (v != null) { - sb.append(v); - } - } - param.setLength(0); - /* Skip the trailing } */ - prev = ch; - continue; - } - break; - } /* switch */ - - if (!inMacro) { - sb.append(ch); - } else { - /* Do not had the '{' */ - if (!(ch == '{' && prev == '$')) { - param.append(ch); - } - } - prev = (ch == '\\' && prev == '\\') ? '\n' : ch; - } /* for */ - return sb.toString(); - } - - -} diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java index f69b375cb6c..08ed4f425de 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java @@ -77,26 +77,32 @@ public class Addr32 implements IAddress, Serializable { this(Long.parseLong(addr, radix), truncate); } + @Override public IAddress add(BigInteger offset) { return new Addr32(this.address + offset.longValue()); } + @Override public IAddress add(long offset) { return new Addr32(this.address + offset); } + @Override public BigInteger getMaxOffset() { return MAX_OFFSET; } + @Override public BigInteger getValue() { return BigInteger.valueOf(address); } + @Override public BigInteger distanceTo(IAddress other) { return other.getValue().subtract(getValue()); } + @Override public int compareTo(Object other) { if (!(other instanceof IAddress)) { throw new IllegalArgumentException(); @@ -105,10 +111,12 @@ public class Addr32 implements IAddress, Serializable { return getValue().compareTo(((IAddress)other).getValue()); } + @Override public boolean isMax() { return address == MAX.address; } + @Override public boolean isZero() { return address == ZERO.address; } @@ -118,6 +126,7 @@ public class Addr32 implements IAddress, Serializable { return toString(10); } + @Override public String toString(int radix) { return Long.toString(address, radix); } @@ -136,6 +145,7 @@ public class Addr32 implements IAddress, Serializable { return (int)(address ^ (address >> 32)); } + @Override public String toHexAddressString() { String addressString = Long.toString(address, 16); StringBuffer sb = new StringBuffer(CHARS_NUM); @@ -148,6 +158,7 @@ public class Addr32 implements IAddress, Serializable { return sb.toString(); } + @Override public String toBinaryAddressString() { String addressString = Long.toString(address, 2); StringBuffer sb = new StringBuffer(BINARY_CHARS_NUM); @@ -160,10 +171,12 @@ public class Addr32 implements IAddress, Serializable { return sb.toString(); } + @Override public int getCharsNum() { return CHARS_NUM; } + @Override public int getSize() { return BYTES_NUM; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java index 29c01c19c96..d7faed19e90 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java @@ -20,6 +20,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#getZero() */ + @Override public IAddress getZero() { return Addr32.ZERO; } @@ -27,6 +28,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#getMax() */ + @Override public IAddress getMax() { return Addr32.MAX; } @@ -34,6 +36,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String) */ + @Override public IAddress createAddress(String addr) { return createAddress(addr, true); } @@ -41,6 +44,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean) */ + @Override public IAddress createAddress(String addr, boolean truncate) { return new Addr32(addr, truncate); } @@ -48,6 +52,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int) */ + @Override public IAddress createAddress(String addr, int radix) { return createAddress(addr, radix, true); } @@ -55,6 +60,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean) */ + @Override public IAddress createAddress(String addr, int radix, boolean truncate) { return new Addr32(addr, radix, truncate); } @@ -62,6 +68,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger) */ + @Override public IAddress createAddress(BigInteger addr) { return createAddress(addr, true); } @@ -69,6 +76,7 @@ public class Addr32Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean) */ + @Override public IAddress createAddress(BigInteger addr, boolean truncate) { return new Addr32(addr.longValue(), truncate); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java index dcd23db9702..f7321cc39ff 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java @@ -81,34 +81,42 @@ public class Addr64 implements IAddress, Serializable { } + @Override public IAddress add(BigInteger offset) { return new Addr64(this.address.add(offset)); } + @Override public IAddress add(long offset) { return new Addr64(this.address.add(BigInteger.valueOf(offset))); } + @Override public BigInteger getMaxOffset() { return MAX_OFFSET; } + @Override public BigInteger distanceTo(IAddress other) { return other.getValue().subtract(getValue()); } + @Override public boolean isMax() { return address.equals(MAX.getValue()); } + @Override public boolean isZero() { return address.equals(ZERO.getValue()); } + @Override public BigInteger getValue() { return address; } + @Override public int compareTo(Object other) { if (!(other instanceof IAddress)) { throw new IllegalArgumentException(); @@ -136,10 +144,12 @@ public class Addr64 implements IAddress, Serializable { return toString(10); } + @Override public String toString(int radix) { return address.toString(radix); } + @Override public String toHexAddressString() { String addressString = address.toString(16); StringBuffer sb = new StringBuffer(CHARS_NUM); @@ -152,6 +162,7 @@ public class Addr64 implements IAddress, Serializable { return sb.toString(); } + @Override public String toBinaryAddressString() { String addressString = address.toString(2); StringBuffer sb = new StringBuffer(BINARY_CHARS_NUM); @@ -164,10 +175,12 @@ public class Addr64 implements IAddress, Serializable { return sb.toString(); } + @Override public int getCharsNum() { return CHARS_NUM; } + @Override public int getSize() { return BYTES_NUM; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java index 806a233a286..4322417d9a3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java @@ -20,6 +20,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#getZero() */ + @Override public IAddress getZero() { return Addr64.ZERO; } @@ -27,6 +28,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#getMax() */ + @Override public IAddress getMax() { return Addr64.MAX; } @@ -34,6 +36,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String) */ + @Override public IAddress createAddress(String addr) { return createAddress(addr, true); } @@ -41,6 +44,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean) */ + @Override public IAddress createAddress(String addr, boolean truncate) { return new Addr64(addr, truncate); } @@ -48,6 +52,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int) */ + @Override public IAddress createAddress(String addr, int radix) { return createAddress(addr, radix, true); } @@ -55,6 +60,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean) */ + @Override public IAddress createAddress(String addr, int radix, boolean truncate) { return new Addr64(addr, radix, truncate); } @@ -62,6 +68,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger) */ + @Override public IAddress createAddress(BigInteger addr) { return createAddress(addr, true); } @@ -69,6 +76,7 @@ public class Addr64Factory implements IAddressFactory2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean) */ + @Override public IAddress createAddress(BigInteger addr, boolean truncate) { return new Addr64(addr, truncate); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java index bf4c991392f..341809b09b4 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java @@ -36,6 +36,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile { this.type = type; } + @Override public final IBinaryParser getBinaryParser() { return parser; } @@ -43,6 +44,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getPath() */ + @Override public final IPath getPath() { return path; } @@ -50,6 +52,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getType() */ + @Override public final int getType() { return type; } @@ -58,6 +61,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile { * @throws IOException * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() */ + @Override public InputStream getContents() throws IOException { InputStream stream = null; if (path != null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java index 8a9ad348b96..350ac74009e 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java @@ -48,6 +48,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbol(long) */ + @Override public ISymbol getSymbol(IAddress addr) { ISymbol[] syms = getSymbols(); int insertion = Arrays.binarySearch(syms, addr); @@ -68,6 +69,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getBSS() */ + @Override public long getBSS() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -79,6 +81,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getCPU() */ + @Override public String getCPU() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -90,6 +93,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getData() */ + @Override public long getData() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -101,6 +105,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getText() */ + @Override public long getText() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -112,6 +117,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#hasDebug() */ + @Override public boolean hasDebug() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -123,6 +129,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#isLittleEndian() */ + @Override public boolean isLittleEndian() { BinaryObjectInfo info = getBinaryObjectInfo(); if (info != null) { @@ -156,6 +163,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getName() */ + @Override public String getName() { return getPath().lastSegment().toString(); } @@ -168,7 +176,9 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbols() */ + @Override public abstract ISymbol[] getSymbols(); + @Override public abstract IAddressFactory getAddressFactory(); protected abstract BinaryObjectInfo getBinaryObjectInfo(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java index d7c7fb72950..8f6fd2c4254 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java @@ -32,6 +32,7 @@ public class DefaultCygwinToolFactory extends DefaultGnuToolFactory implements I * * @see org.eclipse.cdt.utils.CygwinToolsProvider#getCygPath() */ + @Override public CygPath getCygPath() { IPath cygPathPath = getCygPathPath(); CygPath cygpath = null; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java index 568c72ce688..699dafaced4 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java @@ -31,6 +31,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { /* (non-Javadoc) * @see org.eclipse.cdt.utils.IGnuToolProvider#getAddr2line(org.eclipse.core.runtime.IPath) */ + @Override public Addr2line getAddr2line(IPath path) { IPath addr2LinePath = getAddr2linePath(); Addr2line addr2line = null; @@ -46,6 +47,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { /* (non-Javadoc) * @see org.eclipse.cdt.utils.IGnuToolProvider#getCPPFilt() */ + @Override public CPPFilt getCPPFilt() { IPath cppFiltPath = getCPPFiltPath(); CPPFilt cppfilt = null; @@ -61,6 +63,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { /* (non-Javadoc) * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath) */ + @Override public Objdump getObjdump(IPath path) { IPath objdumpPath = getObjdumpPath(); String objdumpArgs = getObjdumpArgs(); @@ -77,6 +80,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { /* (non-Javadoc) * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath) */ + @Override public NM getNM(IPath path) { IPath nmPath = getNMPath(); String nmArgs = getNMArgs(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java index 2e179703fcd..ff336b26df1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java @@ -52,6 +52,7 @@ public class Symbol implements ISymbol { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getBinarObject() */ + @Override public IBinaryObject getBinaryObject() { return binary; } @@ -59,6 +60,7 @@ public class Symbol implements ISymbol { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getFilename() */ + @Override public IPath getFilename() { return sourceFile; } @@ -66,6 +68,7 @@ public class Symbol implements ISymbol { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getName() */ + @Override public String getName() { return name; } @@ -73,6 +76,7 @@ public class Symbol implements ISymbol { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getType() */ + @Override public int getType() { return type; } @@ -82,6 +86,7 @@ public class Symbol implements ISymbol { * * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getAdress() */ + @Override public IAddress getAddress() { return addr; } @@ -91,6 +96,7 @@ public class Symbol implements ISymbol { * * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getEndLine() */ + @Override public int getEndLine() { return endLine; } @@ -100,6 +106,7 @@ public class Symbol implements ISymbol { * * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getStartLine() */ + @Override public int getStartLine() { return startLine; } @@ -109,6 +116,7 @@ public class Symbol implements ISymbol { * * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getLineNumber(long) */ + @Override public int getLineNumber(long offset) { return -1; } @@ -118,10 +126,12 @@ public class Symbol implements ISymbol { * * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getSize() */ + @Override public long getSize() { return size; } + @Override public int compareTo(Object obj) { IAddress thisVal = this.addr; IAddress anotherVal = null; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java index 75af6f58e42..62aa351a507 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java @@ -35,6 +35,7 @@ public class CodeViewReader implements ISymbolReader { fileList = new ArrayList(); } + @Override public String[] getSourceFiles() { if (!parsed) { try { @@ -169,6 +170,7 @@ public class CodeViewReader implements ISymbolReader { /** * @since 5.2 */ + @Override public String[] getSourceFiles(IProgressMonitor monitor) { return getSourceFiles(); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java index 2b039257205..84b9806577e 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java @@ -69,6 +69,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject { starttime = System.currentTimeMillis(); Runnable worker = new Runnable() { + @Override public void run() { long diff = System.currentTimeMillis() - starttime; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java index 45ba995912e..6ff0701e507 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java @@ -37,6 +37,7 @@ public class PEBinaryArchive extends BinaryFile implements IBinaryArchive { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java index 6d9e7918a77..ac846401848 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java @@ -30,6 +30,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } @@ -37,6 +38,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -87,6 +89,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser { /** * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "PE"; //$NON-NLS-1$ } @@ -94,6 +97,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] array, IPath path) { boolean isBin = PE.isExeHeader(array) || AR.isARHeader(array); // It maybe an object file try the known machine types. @@ -128,6 +132,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize() */ + @Override public int getHintBufferSize() { return 512; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java index 3a096ba4ed5..6a3beae3ce0 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java @@ -356,6 +356,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader { } } + @Override public String[] getSourceFiles() { if (!m_parsed) { m_fileCollection.clear(); @@ -484,6 +485,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader { /** * @since 5.2 */ + @Override public String[] getSourceFiles(IProgressMonitor monitor) { return getSourceFiles(); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java index 07e6e63efad..279d19f5661 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java @@ -42,6 +42,7 @@ public class StabsReader implements ISymbolReader { fileList = new ArrayList(); } + @Override public String[] getSourceFiles() { if (!parsed) { parse(); @@ -249,6 +250,7 @@ public class StabsReader implements ISymbolReader { /** * @since 5.2 */ + @Override public String[] getSourceFiles(IProgressMonitor monitor) { return getSourceFiles(); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java index 7eea4df5c6a..409b77ca767 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java @@ -92,6 +92,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCompilationUnit(java.lang.String, long) */ + @Override public void enterCompilationUnit(String name, long address) { write("/* Enter Compilation Unit " + name + " address " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ newLine(); @@ -103,6 +104,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCompilationUnit(long) */ + @Override public void exitCompilationUnit(long address) { write("/* Exit Compilation Unit "); //$NON-NLS-1$ if (currentCU != null) { @@ -118,6 +120,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterInclude(java.lang.String) */ + @Override public void enterInclude(String name) { write("#include \"" + name + "\" "); //$NON-NLS-1$ //$NON-NLS-2$ write("/* Enter Include */"); //$NON-NLS-1$ @@ -129,6 +132,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitInclude() */ + @Override public void exitInclude() { //write("/* Exit Include */"); //newLine();newLine(); @@ -139,6 +143,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterFunction(java.lang.String, int, boolean, long) */ + @Override public void enterFunction(String name, DebugType type, boolean isGlobal, long address) { write("/* Func:" + name + " address " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ newLine(); @@ -154,6 +159,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitFunction(long) */ + @Override public void exitFunction(long address) { if (paramCount > -1) { paramCount = -1; @@ -175,6 +181,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCodeBlock(long) */ + @Override public void enterCodeBlock(long offset) { if (paramCount > -1) { paramCount = -1; @@ -191,6 +198,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCodeBlock(long) */ + @Override public void exitCodeBlock(long offset) { bracket--; write(printTabs() + "} " + "/* " + offset + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -202,6 +210,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptStatement(int, long) */ + @Override public void acceptStatement(int line, long address) { if (paramCount > -1) { write(")"); //$NON-NLS-1$ @@ -220,6 +229,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptIntegerConst(java.lang.String, long) */ + @Override public void acceptIntegerConst(String name, int value) { write("const int " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ newLine(); @@ -230,6 +240,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptFloatConst(java.lang.String, double) */ + @Override public void acceptFloatConst(String name, double value) { write("const float " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ newLine(); @@ -241,6 +252,7 @@ public class DebugDump implements IDebugEntryRequestor { * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeConst(java.lang.String, * org.eclipse.cdt.utils.debug.DebugType, int) */ + @Override public void acceptTypeConst(String name, DebugType type, int value) { write("const " + type.toString() + " " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ newLine(); @@ -251,6 +263,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptParameter(java.lang.String, int, int, long) */ + @Override public void acceptParameter(String name, DebugType type, DebugParameterKind kind, long offset) { if (paramCount > 0) { write(", "); //$NON-NLS-1$ @@ -264,6 +277,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptVariable(java.lang.String, int, int, long) */ + @Override public void acceptVariable(String name, DebugType type, DebugVariableKind kind, long address) { write(printTabs() + type.toString() + " " + name + ";" + "/* " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ newLine(); @@ -275,6 +289,7 @@ public class DebugDump implements IDebugEntryRequestor { * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptCaughtException(java.lang.String, * org.eclipse.cdt.utils.debug.DebugType, long) */ + @Override public void acceptCaughtException(String name, DebugType type, long address) { } @@ -283,6 +298,7 @@ public class DebugDump implements IDebugEntryRequestor { * * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeDef(java.lang.String, org.eclipse.cdt.utils.debug.DebugType) */ + @Override public void acceptTypeDef(String name, DebugType type) { if (!name.equals(type.toString())) { write("typedef " + type.toString() + " " + name + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java index 71055866ed4..185fe9a7c42 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java @@ -25,6 +25,7 @@ public class DebugSym implements Comparable { public DebugSym() { } + @Override public int compareTo(Object obj) { long thisVal = 0; long anotherVal = 0; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java index d04e7fd11f9..d78c90e5d24 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java @@ -71,6 +71,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCompilationUnit(java.lang.String, long) */ + @Override public void enterCompilationUnit(String name, long address) { DebugSym sym = new DebugSym(); sym.name = name; @@ -84,6 +85,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCompilationUnit(long) */ + @Override public void exitCompilationUnit(long address) { if (currentCU != null) { currentCU.size = address; @@ -94,18 +96,21 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterInclude(java.lang.String) */ + @Override public void enterInclude(String name) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitInclude() */ + @Override public void exitInclude() { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterFunction(java.lang.String, int, boolean, long) */ + @Override public void enterFunction(String name, DebugType type, boolean isGlobal, long address) { DebugSym sym = new DebugSym(); sym.name = name; @@ -121,6 +126,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitFunction(long) */ + @Override public void exitFunction(long address) { if (currentFunction != null) { currentFunction.size = address; @@ -131,18 +137,21 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCodeBlock(long) */ + @Override public void enterCodeBlock(long offset) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCodeBlock(long) */ + @Override public void exitCodeBlock(long offset) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptStatement(int, long) */ + @Override public void acceptStatement(int line, long address) { DebugSym sym = new DebugSym(); sym.name = ""; //$NON-NLS-1$ @@ -164,24 +173,28 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptIntegerConst(java.lang.String, long) */ + @Override public void acceptIntegerConst(String name, int value) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptFloatConst(java.lang.String, double) */ + @Override public void acceptFloatConst(String name, double value) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeConst(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, int) */ + @Override public void acceptTypeConst(String name, DebugType type, int value) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptParameter(java.lang.String, int, int, long) */ + @Override public void acceptParameter(String name, DebugType type, DebugParameterKind kind, long offset) { DebugSym sym = new DebugSym(); sym.name = name; @@ -196,6 +209,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptVariable(java.lang.String, int, int, long) */ + @Override public void acceptVariable(String name, DebugType type, DebugVariableKind kind, long address) { DebugSym sym = new DebugSym(); sym.name = name; @@ -210,12 +224,14 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptCaughtException(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, long) */ + @Override public void acceptCaughtException(String name, DebugType type, long address) { } /* (non-Javadoc) * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeDef(java.lang.String, org.eclipse.cdt.utils.debug.DebugType) */ + @Override public void acceptTypeDef(String name, DebugType type) { } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java index 3bb15faba03..f5df628e78a 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java @@ -461,6 +461,7 @@ public class Elf { return (st_info >> 4) & 0xf; } + @Override public int compareTo(Object obj) { /* * long thisVal = 0; long anotherVal = 0; if ( obj instanceof Symbol ) { @@ -499,6 +500,7 @@ public class Elf { class SymbolComparator implements Comparator { IAddress val1, val2; + @Override public int compare(Object o1, Object o2) { if (o1 instanceof IAddress) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java index 102a1154779..ce914c45f62 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java @@ -19,6 +19,7 @@ import java.util.Comparator; @SuppressWarnings("rawtypes") @Deprecated public class SymbolSortCompare implements Comparator { + @Override public int compare( Object o1, Object o2 ) { String s1 = o1.toString(); String s2 = o2.toString(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java index c2b7fecf8d4..6a2d9aa1f25 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java @@ -38,6 +38,7 @@ public class ElfBinaryArchive extends BinaryFile implements IBinaryArchive { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java index 3ffd0b0f061..2d6f51ed2a1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java @@ -29,11 +29,13 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -92,6 +94,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser { /** * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "ELF"; //$NON-NLS-1$ } @@ -99,6 +102,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] array, IPath path) { return Elf.isElfHeader(array) || AR.isARHeader(array); } @@ -106,6 +110,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() */ + @Override public int getHintBufferSize() { return 128; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java index d1c7586d090..4af997ba3e7 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java @@ -66,6 +66,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject { starttime = System.currentTimeMillis(); Runnable worker = new Runnable() { + @Override public void run() { long diff = System.currentTimeMillis() - starttime; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java index 6238f79fd03..b67d3e431d9 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java @@ -737,6 +737,7 @@ public class MachO { return (n_type & REFERENCE_TYPE) == val; } + @Override public int compareTo(Object obj) { long thisVal = 0; long anotherVal = 0; @@ -887,6 +888,7 @@ public class MachO { */ public static class SymbolComparator implements Comparator { long val1, val2; + @Override public int compare(Object o1, Object o2) { if(o1 instanceof Long) { @@ -918,6 +920,7 @@ public class MachO { public String file; public String function; + @Override public int compareTo(Object obj) { long thisVal = 0; long anotherVal = 0; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java index 47f37450682..030b0eeb0f7 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java @@ -793,6 +793,7 @@ public class MachO64 { return (n_type & REFERENCE_TYPE) == val; } + @Override public int compareTo(Object obj) { long thisVal = 0; long anotherVal = 0; @@ -943,6 +944,7 @@ public class MachO64 { */ public static class SymbolComparator implements Comparator { long val1, val2; + @Override public int compare(Object o1, Object o2) { if (o1 instanceof Long) { val1 = ((Long) o1).longValue(); @@ -972,6 +974,7 @@ public class MachO64 { public String file; public String function; + @Override public int compareTo(Object obj) { long thisVal = 0; long anotherVal = 0; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java index 1f5d687e6c3..604c9f20cb3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java @@ -39,6 +39,7 @@ public class MachOBinaryArchive extends BinaryFile implements IBinaryArchive { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java index 417ea8c1d07..fc35e5df84b 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java @@ -37,6 +37,7 @@ public class MachOBinaryArchive64 extends BinaryFile implements IBinaryArchive { /** * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java index b3e6e625d27..dad32fc5b18 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java @@ -33,11 +33,13 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -87,6 +89,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser { /** * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "MACHO"; //$NON-NLS-1$ } @@ -94,6 +97,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] array, IPath path) { return MachO.isMachOHeader(array) || AR.isARHeader(array); } @@ -101,6 +105,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() */ + @Override public int getHintBufferSize() { return 128; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java index 8144d63ba0e..cb456ebe9a0 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java @@ -31,11 +31,13 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -85,6 +87,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { /** * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "MACHO"; //$NON-NLS-1$ } @@ -92,6 +95,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] array, IPath path) { return MachO64.isMachOHeader(array) || AR.isARHeader(array); } @@ -99,6 +103,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() */ + @Override public int getHintBufferSize() { return 128; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java index e122d1b8185..66ad8f7a107 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java @@ -43,6 +43,7 @@ public class SOMBinaryArchive extends BinaryFile implements IBinaryArchive { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java index 23da07e2377..e217c2d388c 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java @@ -254,6 +254,7 @@ public class SOMBinaryObject extends BinaryObjectAdapter { starttime = System.currentTimeMillis(); Runnable worker = new Runnable() { + @Override public void run() { long diff = System.currentTimeMillis() - starttime; while (diff < 10000) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java index fc8e2f4cc2a..8a8b0cff044 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java @@ -33,6 +33,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -82,6 +83,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } @@ -89,6 +91,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "SOM"; //$NON-NLS-1$ } @@ -96,6 +99,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] hints, IPath path) { return SOM.isSOMHeader(hints) || AR.isARHeader(hints); } @@ -103,6 +107,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize() */ + @Override public int getHintBufferSize() { return 512; // size of file header } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java index 7997eec8e69..3913eff1eb3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java @@ -37,6 +37,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser { * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], * org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$ @@ -88,6 +89,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser { * * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) */ + @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } @@ -97,6 +99,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser { * * @see org.eclipse.cdt.core.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "XCOFF32"; //$NON-NLS-1$ } @@ -107,6 +110,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser { * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], * org.eclipse.core.runtime.IPath) */ + @Override public boolean isBinary(byte[] hints, IPath path) { return XCoff32.isXCOFF32Header(hints) || AR.isARHeader(hints); } @@ -116,6 +120,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser { * * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize() */ + @Override public int getHintBufferSize() { return 512; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java index 8d3fe7ade1f..56b67470943 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java @@ -44,6 +44,7 @@ public class XCOFFBinaryArchive extends BinaryFile implements IBinaryArchive { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() */ + @Override public IBinaryObject[] getObjects() { if (hasChanged()) { children.clear(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java index 9e225c08f78..4975447d5c2 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java @@ -246,6 +246,7 @@ public class XCOFFBinaryObject extends BinaryObjectAdapter { starttime = System.currentTimeMillis(); Runnable worker = new Runnable() { + @Override public void run() { long diff = System.currentTimeMillis() - starttime; while (diff < 10000) { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java index d591d87aae8..9a49745bf0e 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java @@ -23,6 +23,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator /* * @see ILabelDecorator#decorateImage(Image, Object) */ + @Override public Image decorateImage(Image image, Object element) { return null; } @@ -30,6 +31,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator /* * @see ILabelDecorator#decorateText(String, Object) */ + @Override public String decorateText(String text, Object element) { return text + "*"; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java index 6469c67af6c..b0187dd30cf 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java @@ -19,13 +19,16 @@ public class CTestSetup extends TestSetup { * @deprecated * Not needed anymore. No added value */ + @Deprecated public CTestSetup(Test test) { super(test); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java index 5659d6210b1..59c20d53479 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java @@ -72,6 +72,7 @@ import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; @@ -91,6 +92,7 @@ import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy; public class EditorTestHelper { private static class ImportOverwriteQuery implements IOverwriteQuery { + @Override public String queryOverwrite(String file) { return ALL; } @@ -414,6 +416,7 @@ public class EditorTestHelper { public static void closeAllPopUps(SourceViewer sourceViewer) { IWidgetTokenKeeper tokenKeeper= new IWidgetTokenKeeper() { + @Override public boolean requestWidgetToken(IWidgetTokenOwner owner) { return true; } @@ -443,7 +446,7 @@ public class EditorTestHelper { } public static ICProject createCProject(String project, String externalSourceFolder, boolean linkSourceFolder, boolean useIndexer) throws CoreException { - ICProject cProject= CProjectHelper.createCCProject(project, "bin", useIndexer ? IIndexManager.ID_FAST_INDEXER : IIndexManager.ID_NO_INDEXER); + ICProject cProject= CProjectHelper.createCCProject(project, "bin", useIndexer ? IPDOMManager.ID_FAST_INDEXER : IPDOMManager.ID_NO_INDEXER); IFolder folder; if (linkSourceFolder) { File file= FileTool.getFileInPlugin(CTestPlugin.getDefault(), new Path(externalSourceFolder)); @@ -466,6 +469,7 @@ public class EditorTestHelper { final IWorkspace ws = ResourcesPlugin.getWorkspace(); final IProject newProject[] = new IProject[1]; ws.run(new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor monitor) throws CoreException { IWorkspaceRoot root = ws.getRoot(); IProject project = root.getProject(projectName); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java index cae4da2029a..3f0357206b5 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java @@ -304,6 +304,7 @@ protected String searchForPlugins(String start) { */ protected String searchForBoot(String start) { FileFilter filter = new FileFilter() { + @Override public boolean accept(File candidate) { return candidate.getName().startsWith(PI_BOOT); } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java index d7678725cd6..4268e1dbb3f 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java @@ -20,24 +20,28 @@ public class AccessibilityTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Accessibility"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the accessibility of the dialogs."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Accessibility"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) all widgets are accessible by tabbing."); @@ -52,6 +56,7 @@ public class AccessibilityTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "Some widgets aren't accessible by tabbing."; @@ -64,12 +69,14 @@ public class AccessibilityTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the accessibility of the dialog acceptable?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_ACCESS; } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java index 7f78aba9e2e..2208e88235e 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java @@ -35,7 +35,8 @@ public class ExpectedStringsTests extends TestCase { * Example code test the packages in the project * "com.qnx.tools.ide.cdt.core" */ - protected void setUp() { + @Override + protected void setUp() { } @@ -45,7 +46,8 @@ public class ExpectedStringsTests extends TestCase { * * Called after every test case method. */ - protected void tearDown() { + @Override + protected void tearDown() { // release resources here and clean-up } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java index f4535791cc4..67a02dbdb33 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java @@ -42,6 +42,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Window. */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText("Dialog Test Failed"); @@ -49,6 +50,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, "&OK", true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -56,6 +58,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { // page group Composite composite = (Composite)super.createDialogArea(parent); @@ -76,6 +79,7 @@ public class FailureDialog extends Dialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void okPressed() { _log = _text.getText(); super.okPressed(); @@ -103,6 +107,7 @@ public class FailureDialog extends Dialog { * Returns a string representation of this class which * the text contained in the input area of the dialog. */ + @Override public String toString() { return getText(); } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java index 69c5aaaf12d..34aa982aba1 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java @@ -23,24 +23,28 @@ public class FocusTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Initial Focus"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the initial focus of the dialogs."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Initial Focus"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) the initial focus is appropriate."); @@ -51,6 +55,7 @@ public class FocusTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "The initial focus is inappropriate."; @@ -59,12 +64,14 @@ public class FocusTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the initial focus of the dialog correct?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_FOCUS; } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java index d295b6207da..1240774fb7f 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java @@ -22,24 +22,28 @@ class SizingTestPass implements IDialogTestPass { /** * @see IDialogTestPass#title() */ + @Override public String title() { return "Test Pass: Sizing and Display"; } /** * @see IDialogTestPass#description() */ + @Override public String description() { return "Verify the sizing and display of the dialogs and widgets."; } /** * @see IDialogTestPass#label() */ + @Override public String label() { return "&Sizing and Display"; } /** * @see IDialogTestPass#checkListTexts() */ + @Override public ArrayList checkListTexts() { ArrayList list = new ArrayList(CHECKLIST_SIZE); list.add("&1) the correct dialog displays."); @@ -54,6 +58,7 @@ class SizingTestPass implements IDialogTestPass { * Size of the return array must be the same size as the checkListTexts' * ArrayList. */ + @Override public String[] failureTexts() { String[] failureText = new String[CHECKLIST_SIZE]; failureText[0] = "The wrong dialog displayed."; @@ -66,12 +71,14 @@ class SizingTestPass implements IDialogTestPass { /** * @see IDialogTestPass#queryText() */ + @Override public String queryText() { return "Is the sizing and display of the dialog correct?"; } /** * @see IDialogTestPass#getID() */ + @Override public int getID() { return VerifyDialog.TEST_SIZING; } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java index 22bbbc3faea..247809ad9a1 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java @@ -118,12 +118,12 @@ abstract public class StringAsserts { if (n1 + n2 > 0) { if (n1 == 1 && n2 == 1) { - assertEqualString((String) list1.get(0), (String) list2.get(0)); + assertEqualString(list1.get(0), list2.get(0)); } StringBuffer buf= new StringBuffer(); for (int i= 0; i < n1; i++) { - String s1= (String) list1.get(i); + String s1= list1.get(i); if (s1 != null) { buf.append(s1); buf.append("\n"); @@ -133,7 +133,7 @@ abstract public class StringAsserts { buf= new StringBuffer(); for (int i= 0; i < n2; i++) { - String s2= (String) list2.get(i); + String s2= list2.get(i); if (s2 != null) { buf.append(s2); buf.append("\n"); @@ -161,12 +161,12 @@ abstract public class StringAsserts { if (n2 > 0) { if (n1 == 1 && n2 == 1) { - assertEqualString((String) list1.get(0), (String) list2.get(0)); + assertEqualString(list1.get(0), list2.get(0)); } StringBuffer buf= new StringBuffer(); for (int i= 0; i < n1; i++) { - String s1= (String) list1.get(i); + String s1= list1.get(i); if (s1 != null) { buf.append(s1); buf.append("\n"); @@ -176,7 +176,7 @@ abstract public class StringAsserts { buf= new StringBuffer(); for (int i= 0; i < n2; i++) { - String s2= (String) list2.get(i); + String s2= list2.get(i); if (s2 != null) { buf.append(s2); buf.append("\n"); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java index 684a55d8fdc..2140ecbfd7c 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java @@ -74,6 +74,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Window. */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText("Dialog Verification"); @@ -82,6 +83,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void createButtonsForButtonBar(Composite parent) { _yesButton = createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true); _noButton = createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, false); @@ -89,6 +91,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected void buttonPressed(int buttonId) { if (IDialogConstants.YES_ID == buttonId) { setReturnCode(IDialogConstants.YES_ID); @@ -103,6 +106,7 @@ public class VerifyDialog extends TitleAreaDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { // top level composite Composite parentComposite = (Composite)super.createDialogArea(parent); @@ -145,6 +149,7 @@ public class VerifyDialog extends TitleAreaDialog { radio.setText( _dialogTests[i].label() ); final int testID = _dialogTests[i].getID(); radio.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TEST_TYPE = testID; initializeTest(); @@ -175,6 +180,7 @@ public class VerifyDialog extends TitleAreaDialog { } _checkList = new Button[checkListSize]; SelectionAdapter selectionAdapter = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkYesEnable(); } @@ -230,6 +236,7 @@ public class VerifyDialog extends TitleAreaDialog { * opening. Should use open(Dialog) instead. * */ + @Override public int open() { _failureText = "Testing dialog is required, use VerifyDialog::open(Dialog)"; return IDialogConstants.NO_ID; @@ -263,6 +270,7 @@ public class VerifyDialog extends TitleAreaDialog { _testDialog.getShell().setLocation(getShell().getSize().x + 1, 0); _testDialog.getShell().setSize(_testDialogSize); _testDialog.getShell().addShellListener(new ShellAdapter() { + @Override public void shellClosed(ShellEvent e) { e.doit = false; } @@ -307,6 +315,7 @@ public class VerifyDialog extends TitleAreaDialog { * In case the shell was closed by a means other than * the NO button. */ + @Override protected void handleShellCloseEvent() { handleFailure(); } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java index c196ea724b2..a97f0b189cf 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java @@ -93,7 +93,7 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu tree.setFiltersFlag(DOMASTNodeLeaf.FLAG_PROBLEM); if (node instanceof IASTProblemHolder) - astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem()); + astProblems = ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem()); else astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, node); } @@ -131,6 +131,7 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu return leaf; } + @Override public DOMASTNodeLeaf[] mergePreprocessorStatements(IASTPreprocessorStatement[] statements) { DOMASTNodeLeaf[] leaves = new DOMASTNodeLeaf[statements.length]; for(int i=0; i[])clazz.getInterfaces())); + search.addAll(Arrays.asList(clazz.getInterfaces())); final Class superclass = clazz.getSuperclass(); if (superclass != null) search.add(superclass); @@ -325,6 +325,7 @@ public class DOMASTNodeLeaf implements IAdaptable { return name; } + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class key) { if (key == IPropertySource.class) return new ASTPropertySource(getNode()); @@ -404,9 +405,11 @@ public class DOMASTNodeLeaf implements IAdaptable { this.node = node; } + @Override public Object getEditableValue() { return null; } + @Override public IPropertyDescriptor[] getPropertyDescriptors() { if (node instanceof IASTTranslationUnit) // skip the properties for the TU (too expensive) return BLANK_DESCRIPTORS; @@ -417,20 +420,20 @@ public class DOMASTNodeLeaf implements IAdaptable { IPropertyDescriptor[] desc = getPropertyDescriptors(((IASTName)node).resolveBinding()); if (desc != null) for (IPropertyDescriptor element : desc) - descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); + descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); desc = getPropertyDescriptors(node); if (desc != null) for (IPropertyDescriptor element : desc) - descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); + descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); } else { IPropertyDescriptor[] desc = getPropertyDescriptors(node); if (desc != null) for (IPropertyDescriptor element : desc) - descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); + descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element); } - return (IPropertyDescriptor[])ArrayUtil.trim(IPropertyDescriptor.class, descriptors); + return ArrayUtil.trim(IPropertyDescriptor.class, descriptors); } private IPropertyDescriptor[] getPropertyDescriptors(Object obj) { @@ -460,12 +463,12 @@ public class DOMASTNodeLeaf implements IAdaptable { text.setCategory(IBINDING_TAG + ((IASTName)node).resolveBinding().getClass().getName().substring(((IASTName)node).resolveBinding().getClass().getName().lastIndexOf(PERIOD) + 1) + COLON_SEPARATOR + getValueString(((IASTName)node).resolveBinding())); else text.setCategory(objClass.getName().substring(objClass.getName().lastIndexOf(PERIOD) + 1) + COLON_SEPARATOR + getValueString(node)); - desc = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, desc, text); + desc = ArrayUtil.append(IPropertyDescriptor.class, desc, text); } } } - return (IPropertyDescriptor[])ArrayUtil.trim(IPropertyDescriptor.class, desc); + return ArrayUtil.trim(IPropertyDescriptor.class, desc); } private boolean alreadyEncountered(Method method, IPropertyDescriptor[] desc) { @@ -484,6 +487,7 @@ public class DOMASTNodeLeaf implements IAdaptable { return false; } + @Override public Object getPropertyValue(Object id) { if (!(id instanceof String)) return BLANK_STRING; @@ -654,11 +658,14 @@ public class DOMASTNodeLeaf implements IAdaptable { return true; } + @Override public boolean isPropertySet(Object id) { return false; } + @Override public void resetPropertyValue(Object id) { } + @Override public void setPropertyValue(Object id, Object value) { } } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java index 0dd2a9c80f3..c26002a66ea 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Rational Software - Initial API and implementation + * IBM Rational Software - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.ui.tests.DOMAST; @@ -17,20 +17,21 @@ import org.eclipse.cdt.core.dom.ast.IASTNodeLocation; import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.parser.util.ArrayUtil; + import org.eclipse.cdt.internal.core.dom.parser.ASTNode; /** * @author dsteffle */ public class DOMASTNodeParent extends DOMASTNodeLeaf { - private static final int NO_PREPROCESSOR_STATMENT = -1; - private static final DOMASTNodeLeaf[] EMPTY_CHILDREN_ARRAY = new DOMASTNodeLeaf[0]; + private static final int NO_PREPROCESSOR_STATEMENT = -1; + private static final DOMASTNodeLeaf[] EMPTY_CHILDREN_ARRAY = {}; private static final int DEFAULT_NODE_CHAIN_SIZE = 4; private static final int DEFAULT_CHILDREN_SIZE = 4; - int index=0; + int index; private DOMASTNodeLeaf[] children; - boolean cleanupedElements = false; - private int indexFirstPreproStmnt=NO_PREPROCESSOR_STATMENT; + boolean cleanupedElements; + private int indexFirstPreproStmnt= NO_PREPROCESSOR_STATEMENT; public int getStartSearch() { return index; @@ -46,12 +47,12 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { children = new DOMASTNodeLeaf[DEFAULT_CHILDREN_SIZE]; } public void addChild(DOMASTNodeLeaf child) { - if (child.getNode() instanceof IASTPreprocessorStatement && indexFirstPreproStmnt == NO_PREPROCESSOR_STATMENT) { + if (child.getNode() instanceof IASTPreprocessorStatement && indexFirstPreproStmnt == NO_PREPROCESSOR_STATEMENT) { indexFirstPreproStmnt=index; } if (index==children.length) { - children = (DOMASTNodeLeaf[])ArrayUtil.append(DOMASTNodeLeaf.class, children, child); + children = ArrayUtil.append(DOMASTNodeLeaf.class, children, child); index++; } else { children[index++] = child; @@ -60,7 +61,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { child.setParent(this); } public void removeChild(DOMASTNodeLeaf child) { - for(int i=0; i T[] insert(Class c, T[] array, T obj, int pos) { if (pos < 0 || pos >= array.length) { return ArrayUtil.append(c, array, obj); } - Object[] temp = (Object[]) Array.newInstance( c, array.length + 1 ); + T[] temp = (T[]) Array.newInstance(c, array.length + 1); if (pos > 0) { - System.arraycopy( array, 0, temp, 0, pos ); + System.arraycopy(array, 0, temp, 0, pos); temp[pos] = obj; - System.arraycopy( array, pos, temp, pos + 1, array.length - pos ); + System.arraycopy(array, pos, temp, pos + 1, array.length - pos); } else { temp[0] = obj; - System.arraycopy( array, 0, temp, 1, array.length ); + System.arraycopy(array, 0, temp, 1, array.length); } return temp; @@ -116,7 +117,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { public void cleanChildren() { // remove null elements - children = (DOMASTNodeLeaf[])ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children); + children = ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children); // sort the elements //if (indexFirstPreproStmnt >= 0) { // TODO Devin what if it's ALL preprocessor statements ? @@ -126,7 +127,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { int checkLength=0; boolean moved=false; for (int j=0, i=0; j < children.length && children[j] != null; j++) { - if( !(children[j].getNode() instanceof IASTPreprocessorStatement) ) + if (!(children[j].getNode() instanceof IASTPreprocessorStatement)) continue; while(true) { if (i==j) break; // don't need to check itself or anything after it @@ -139,7 +140,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { // if the checking element comes before the first element then move the checking element before the first element if (checkOffset < firstOffset && checkOffset + checkLength < firstOffset + firstLength) { DOMASTNodeLeaf temp = children[j]; - System.arraycopy( children, i, children, i + 1, j - i ); + System.arraycopy(children, i, children, i + 1, j - i); children[i] = temp; break; } @@ -147,9 +148,9 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { // if the checking element is within the bounds of the first element then it must be a child of that element if (checkOffset > firstOffset && checkOffset + checkLength < firstOffset + firstLength) { DOMASTNodeLeaf temp = children[j]; - if( j + 1 < children.length ) - System.arraycopy( children, j + 1, children, j, children.length - j - 1 ); - children[ children.length - 1 ] = null; + if (j + 1 < children.length) + System.arraycopy(children, j + 1, children, j, children.length - j - 1); + children[children.length - 1] = null; ((DOMASTNodeParent)children[i]).addChild(temp); j--; break; @@ -159,14 +160,14 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { } } // } - children = (DOMASTNodeLeaf[])ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children); + children = ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children); // need to also clean up the children's children, to make sure all nulls are removed (prevent expansion sign when there isn't one) - for(int i=0; i=0; i--) { + outerLoop: for (int i=nodeChain.length-1; i>=0; i--) { if (nodeChain[i] != null) { parentToFind = nodeChain[i]; - for(; j>=0; j--) { + for (; j>=0; j--) { if (childrenToSearch[j] instanceof DOMASTNodeParent) { - if ( childrenToSearch[j].getNode() == node.getParent() ) { + if (childrenToSearch[j].getNode() == node.getParent()) { return (DOMASTNodeParent)childrenToSearch[j]; } @@ -253,22 +254,22 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { IASTNode[] nodeChain = new IASTNode[DEFAULT_NODE_CHAIN_SIZE]; IASTNode topNode = node.getParent(); ArrayUtil.append(IASTNode.class, nodeChain, node); - nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode); + nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode); while(topNode.getParent() != null && !(topNode.getParent() instanceof IASTTranslationUnit)) { topNode = topNode.getParent(); - nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode); + nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode); } // loop through the chain of nodes and use it to only search the necessary children required to find the node DOMASTNodeLeaf[] childrenToSearch = children; int j=getStartSearch(); - outerLoop: for(int i=nodeChain.length-1; i>=0; i--) { + outerLoop: for (int i=nodeChain.length-1; i>=0; i--) { if (nodeChain[i] != null) { parentToFind = nodeChain[i]; - for(; j>=0; j--) { // use the DOMASTNodeParent's index to start searching at the end of it's children (performance optimization) + for (; j>=0; j--) { // use the DOMASTNodeParent's index to start searching at the end of it's children (performance optimization) if (j 0 ){ + if (children.length > 0){ ASTNode first = (ASTNode) children[0].getNode(); - if( first.getOffset() > astNode.getOffset() ) + if (first.getOffset() > astNode.getOffset()) return -1; - ASTNode last = (ASTNode) children[ children.length - 1 ].getNode(); - if( (last.getOffset() + last.getLength()) < (astNode.getOffset() + astNode.getLength()) ) + ASTNode last = (ASTNode) children[children.length - 1].getNode(); + if ((last.getOffset() + last.getLength()) < (astNode.getOffset() + astNode.getLength())) return 1; return 0; } - return super.relativeNodePosition( n ); + return super.relativeNodePosition(n); } /** * Returns the DOMASTNodeParent that corresponds to the IASTNode. This is the DOMASTNodeParent @@ -326,34 +328,34 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { if (equalNodes(node, this.getNode(), useOffset)) { return this; } - if( children.length == 0 ) + if (children.length == 0) return null; - if( !cleanupedElements ){ + if (!cleanupedElements){ cleanChildren(); } int a = 0, z = children.length - 1; int idx = (z - a) / 2 ; - while( true ){ - int compare = children[ idx ].relativeNodePosition( node ); - if( compare == 0 ){ - if( children[idx] instanceof DOMASTNodeParent ){ - return ((DOMASTNodeParent)children[idx]).findTreeObject( node, useOffset ); + while(true){ + int compare = children[idx].relativeNodePosition(node); + if (compare == 0){ + if (children[idx] instanceof DOMASTNodeParent){ + return ((DOMASTNodeParent)children[idx]).findTreeObject(node, useOffset); } return null; //?? - } else if( compare == -1 ) + } else if (compare == -1) z = idx; else a = idx; int diff = z - a; - if( diff == 0 ) + if (diff == 0) return null; - else if( diff == 1 ) - idx = ( idx == z ) ? a : z; + else if (diff == 1) + idx = (idx == z) ? a : z; else - idx = a + ( z - a ) / 2; - if( z == a ) + idx = a + (z - a) / 2; + if (z == a) return null; - if( z - a == 1 && children[ a ].relativeNodePosition( node ) == 1 && children[ z ].relativeNodePosition( node ) == -1 ) + if (z - a == 1 && children[a].relativeNodePosition(node) == 1 && children[z].relativeNodePosition(node) == -1) return null; } } @@ -371,7 +373,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf { } else { IASTNodeLocation[] locs1 = node1.getNodeLocations(); IASTNodeLocation[] locs2 = node2.getNodeLocations(); - for(int i=0; i 0) fFindField.setText((String) fFindHistory.get(0)); else - fFindField.setText(BLANK_STRING); //$NON-NLS-1$ + fFindField.setText(BLANK_STRING); } } fFindField.setSelection(new Point(0, fFindField.getText().length())); @@ -1104,9 +1119,9 @@ class FindIASTNameDialog extends Dialog { try { boolean somethingFound= findNext(findString, isForwardSearch(), isCaseSensitiveSearch(), isWrapSearch(), isWholeWordSearch(), isIncrementalSearch() && !isRegExSearchAvailableAndChecked(), isRegExSearchAvailableAndChecked()); if (somethingFound) { - statusMessage(BLANK_STRING); //$NON-NLS-1$ + statusMessage(BLANK_STRING); } else { - statusMessage(NAME_NOT_FOUND); //$NON-NLS-1$ + statusMessage(NAME_NOT_FOUND); } } catch (PatternSyntaxException ex) { statusError(ex.getLocalizedMessage()); @@ -1264,6 +1279,7 @@ class FindIASTNameDialog extends Dialog { * * @param shell the new parent shell */ + @Override public void setParentShell(Shell shell) { if (shell != fParentShell) { diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java index e08838075d6..99f9170fb1b 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java @@ -266,6 +266,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind() */ + @Override public boolean canPerformFind() { return true; } @@ -340,6 +341,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean) */ + @Override public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) { return findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord, false); @@ -348,6 +350,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection() */ + @Override public Point getSelection() { IStructuredSelection selection = (IStructuredSelection)viewer.getSelection(); @@ -361,6 +364,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText() */ + @Override public String getSelectionText() { // TODO Auto-generated method stub return null; @@ -369,6 +373,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable() */ + @Override public boolean isEditable() { // TODO Auto-generated method stub return false; @@ -377,6 +382,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String) */ + @Override public void replaceSelection(String text) { // TODO Auto-generated method stub @@ -390,6 +396,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, java.lang.String, boolean, boolean, boolean, boolean) */ + @Override public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) { // find the next name in the list of names IASTName foundName = null; @@ -433,6 +440,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge /* (non-Javadoc) * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#replaceSelection(java.lang.String, boolean) */ + @Override public void replaceSelection(String text, boolean regExReplace) { // TODO Auto-generated method stub diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java index 8a2c82a1d2b..4bbff49483e 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java @@ -23,6 +23,7 @@ public class IncludeStatementFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof DOMASTNodeLeaf) { int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_INCLUDE_STATEMENTS; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java index be547a3e020..bdffe1d6f25 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java @@ -39,6 +39,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele /* (non-Javadoc) * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ + @Override public void init(IViewPart view) { this.viewPart = view; @@ -48,6 +49,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { // TODO Auto-generated method stub @@ -89,6 +91,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele /* (non-Javadoc) * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { this.selection = selection; } @@ -96,12 +99,14 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { } /* (non-Javadoc) * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java index d3f5e16a091..e61d7855ed8 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java @@ -22,6 +22,7 @@ public class PreprocessorFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof DOMASTNodeLeaf) { int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_PREPROCESSOR; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java index b698acd12e4..c288e870c70 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java @@ -24,6 +24,7 @@ public class ProblemHolderFilter extends ViewerFilter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof DOMASTNodeLeaf) { int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_PROBLEM; diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java index 403442511f1..c935c4741b4 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java @@ -53,6 +53,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IAction action, IEditorPart targetEditor) { if (targetEditor instanceof CEditor) editor = (CEditor)targetEditor; @@ -61,6 +62,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionDelegate#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event) */ + @Override public void runWithEvent(IAction action, Event event) { TextSelection selection = null; @@ -169,6 +171,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { if (view instanceof DOMAST) { IContentProvider provider = ((DOMAST)view).getContentProvider(); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java index 6be562644ac..a5f1c04287c 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java @@ -32,6 +32,7 @@ import org.eclipse.cdt.ui.templateengine.IWizardDataPage; public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvider { IWizardDataPage[] pages; + @Override public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard, IWorkbench workbench, IStructuredSelection selection) { pages= new IWizardDataPage[3]; @@ -41,6 +42,7 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi return pages; } + @Override public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) { return pages; } @@ -59,10 +61,12 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi this.dataValue= dataValue; } + @Override public Map getPageData() { return Collections.singletonMap(dataKey, dataValue); } + @Override public void createControl(Composite parent) { Label l= new Label(parent, SWT.NONE); l.setText(labelText); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java index 2879e691361..39492baa7a2 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java @@ -38,6 +38,7 @@ public class TestProcesses extends BaseTestCase { private static final String PROJECT_TYPE = "org.eclipse.cdt.core.tests.projectType"; //$NON-NLS-1$ + @Override protected void setUp() throws Exception { TemplateEngineTestsHelper.turnOffAutoBuild(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java index 0f41d57bfab..583bbf1d1f4 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java @@ -27,6 +27,7 @@ public class TestSharedDefaults extends BaseTestCase { /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { sharedDefaults = SharedDefaults.getInstance(); } @@ -34,6 +35,7 @@ public class TestSharedDefaults extends BaseTestCase { /* * @see TestCase#tearDown() */ + @Override protected void tearDown(){ sharedDefaults = null; } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java index c4b53a0ef7c..3159e702d8b 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java @@ -20,7 +20,8 @@ public class TestTemplateCore extends BaseTestCase { public TemplateCore[] templates = null; - protected void setUp() throws Exception { + @Override + protected void setUp() throws Exception { super.setUp(); templates = TemplateEngineTestsHelper.getTestTemplates(); } @@ -28,6 +29,7 @@ public class TestTemplateCore extends BaseTestCase { /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java index 85cbaab95b0..43145e4ffbd 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java @@ -22,6 +22,7 @@ public class TestTemplateEngine extends BaseTestCase { /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); templateEngine = TemplateEngine.getDefault(); @@ -30,6 +31,7 @@ public class TestTemplateEngine extends BaseTestCase { /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java index e8f220d178a..d98a4c2db1f 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java @@ -24,6 +24,7 @@ public class TestValueStore extends BaseTestCase { /** * setUp is called before execution of test method. */ + @Override protected void setUp() throws Exception { super.setUp(); } @@ -31,6 +32,7 @@ public class TestValueStore extends BaseTestCase { /** * release resources held. */ + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java index a77817e4725..8ada36387b8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpProviderTester.java @@ -62,10 +62,12 @@ public class CHelpProviderTester{ fTitle = generateBookTitle(providerID,type); } + @Override public String getTitle(){ return fTitle; } + @Override public int getCHelpType(){ return fCHelpType; } @@ -85,20 +87,24 @@ public class CHelpProviderTester{ fLabel = generateHelpString(helpBook, string, providerID); fResources = new IHelpResource[1]; fResources[0] = new IHelpResource(){ + @Override public String getHref(){ return fHref; } + @Override public String getLabel(){ return fLabel; } }; } + @Override public ICHelpBook getCHelpBook(){ return fBook; } + @Override public IHelpResource[] getHelpResources(){ return fResources; } @@ -119,11 +125,13 @@ public class CHelpProviderTester{ include = file; } - public String getIncludeName() { + @Override + public String getIncludeName() { return include; } - public boolean isStandard() { + @Override + public boolean isStandard() { return true; } } @@ -134,10 +142,14 @@ public class CHelpProviderTester{ } public class FunctionPrototypeSummary implements IFunctionPrototypeSummary { - public String getName() { return fName; } - public String getReturnType() { return fReturnType; } - public String getArguments() { return fPrototype; } - public String getPrototypeString(boolean namefirst) { + @Override + public String getName() { return fName; } + @Override + public String getReturnType() { return fReturnType; } + @Override + public String getArguments() { return fPrototype; } + @Override + public String getPrototypeString(boolean namefirst) { if (true == namefirst) { return fName + " (" + fPrototype + ") " + fReturnType; } @@ -147,12 +159,17 @@ public class CHelpProviderTester{ } } - public String getName() { return fName; } - public String getNamespace() { return "dummy namespace"; } - public String getDescription() { return fSummary; } - public IFunctionPrototypeSummary getPrototype() { return new FunctionPrototypeSummary(); } + @Override + public String getName() { return fName; } + @Override + public String getNamespace() { return "dummy namespace"; } + @Override + public String getDescription() { return fSummary; } + @Override + public IFunctionPrototypeSummary getPrototype() { return new FunctionPrototypeSummary(); } - public IRequiredInclude[] getIncludes() { + @Override + public IRequiredInclude[] getIncludes() { return incs; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java index 6adbbac3ac0..f142b008f0c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTest.java @@ -52,9 +52,11 @@ public class CHelpTest extends TestCase { if(fDefaultCCHelpContext == null){ final IProject project = getCCProject().getProject(); fDefaultCCHelpContext = new ICHelpInvocationContext(){ + @Override public IProject getProject(){ return project; } + @Override public ITranslationUnit getTranslationUnit(){ return null; } @@ -67,9 +69,11 @@ public class CHelpTest extends TestCase { if(fDefaultCHelpContext == null){ final IProject project = getCProject().getProject(); fDefaultCHelpContext = new ICHelpInvocationContext(){ + @Override public IProject getProject(){ return project; } + @Override public ITranslationUnit getTranslationUnit(){ return null; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java index 0b9ca24e2ab..103c24e8100 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/chelp/CHelpTestInfoProvider.java @@ -49,6 +49,7 @@ public class CHelpTestInfoProvider implements ICHelpProvider { /* (non-Javadoc) * @see org.eclipse.cdt.ui.ICHelpProvider#initialize() */ + @Override public void initialize() { Assert.assertFalse("initialize is called several times",fIsInitialized); fIsInitialized = true; @@ -57,6 +58,7 @@ public class CHelpTestInfoProvider implements ICHelpProvider { /* (non-Javadoc) * @see org.eclipse.cdt.ui.ICHelpProvider#getCHelpBooks() */ + @Override public ICHelpBook[] getCHelpBooks() { if (!fgEnabled) { return new ICHelpBook[0]; @@ -68,6 +70,7 @@ public class CHelpTestInfoProvider implements ICHelpProvider { /* (non-Javadoc) * @see org.eclipse.cdt.ui.ICHelpProvider#getFunctionInfo(org.eclipse.cdt.ui.text.ICHelpInvocationContext, org.eclipse.cdt.ui.ICHelpBook[], java.lang.String) */ + @Override public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) { if (!fgEnabled) { @@ -80,6 +83,7 @@ public class CHelpTestInfoProvider implements ICHelpProvider { /* (non-Javadoc) * @see org.eclipse.cdt.ui.ICHelpProvider#getMatchingFunctions(org.eclipse.cdt.ui.text.ICHelpInvocationContext, org.eclipse.cdt.ui.ICHelpBook[], java.lang.String) */ + @Override public IFunctionSummary[] getMatchingFunctions( ICHelpInvocationContext context, ICHelpBook[] helpBooks, String prefix) { @@ -94,6 +98,7 @@ public class CHelpTestInfoProvider implements ICHelpProvider { /* (non-Javadoc) * @see org.eclipse.cdt.ui.ICHelpProvider#getHelpResources(org.eclipse.cdt.ui.text.ICHelpInvocationContext, org.eclipse.cdt.ui.ICHelpBook[], java.lang.String) */ + @Override public ICHelpResourceDescriptor[] getHelpResources( ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) { if (!fgEnabled) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java index 296439e7bc4..0780f532d46 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java @@ -43,6 +43,7 @@ public class IncludeBrowserBaseTest extends BaseUITestCase { super(name); } + @Override protected void setUp() throws Exception { super.setUp(); fCProject= CProjectHelper.createCCProject("__ibTest__", "bin", IPDOMManager.ID_FAST_INDEXER); @@ -52,6 +53,7 @@ public class IncludeBrowserBaseTest extends BaseUITestCase { fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } + @Override protected void tearDown() throws Exception { if (fCProject != null) { CProjectHelper.delete(fCProject); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java index d1b648a775b..c5c02f85a9c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/RefactoringBaseTest.java @@ -93,6 +93,7 @@ public abstract class RefactoringBaseTest extends BaseTestFramework implements I super.tearDown(); } + @Override public void logging(IStatus status, String plugin) { Throwable ex = status.getException(); StringBuffer stackTrace = new StringBuffer(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/TestRenameParticipant.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/TestRenameParticipant.java index f6fca126dc7..09c972267d0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/TestRenameParticipant.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/TestRenameParticipant.java @@ -43,22 +43,26 @@ public class TestRenameParticipant extends RenameParticipant { sConditionCheck= sCreateChange= 0; } - protected boolean initialize(Object element) { + @Override + protected boolean initialize(Object element) { sElement= element; return true; } - public String getName() { + @Override + public String getName() { return "TestRenameParticipant"; //$NON-NLS-1$ } - public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException { + @Override + public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) throws OperationCanceledException { sConditionCheck++; sArguments= getArguments(); return new RefactoringStatus(); } - public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException { + @Override + public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException { sCreateChange++; return null; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java index ce22c312882..0eef8ff3784 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/BasicSearchTest.java @@ -284,15 +284,20 @@ public class BasicSearchTest extends BaseUITestCase { protected PDOMSearchResult runQuery(PDOMSearchQuery query) { final ISearchResult result[]= new ISearchResult[1]; IQueryListener listener= new IQueryListener() { + @Override public void queryAdded(ISearchQuery query) {} + @Override public void queryFinished(ISearchQuery query) { result[0]= query.getSearchResult(); } + @Override public void queryRemoved(ISearchQuery query) {} + @Override public void queryStarting(ISearchQuery query) {} }; NewSearchUI.addQueryListener(listener); NewSearchUI.runQueryInForeground(new IRunnableContext() { + @Override public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java index efa89496092..4de0f8a1942 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/search/LinkedNamesFinderTest.java @@ -33,6 +33,7 @@ import org.eclipse.cdt.internal.ui.search.LinkedNamesFinder; */ public class LinkedNamesFinderTest extends AST2BaseTest { private static class RegionComparator implements Comparator { + @Override public int compare(IRegion r1, IRegion r2) { return r1.getOffset() - r2.getOffset(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java index c89cce94787..051d96e76e5 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AbstractSemanticHighlightingTest.java @@ -102,14 +102,17 @@ public class AbstractSemanticHighlightingTest extends TestCase { IndexProviderManager ipm= CCoreInternals.getPDOMManager().getIndexProviderManager(); ipm.addIndexProvider(new ReadOnlyPDOMProviderBridge( new IReadOnlyPDOMProvider() { + @Override public IPDOMDescriptor[] getDescriptors( ICConfigurationDescription config) { return new IPDOMDescriptor[] { new IPDOMDescriptor() { + @Override public IIndexLocationConverter getIndexLocationConverter() { return new URIRelativeLocationConverter(baseURI); } + @Override public IPath getLocation() { return new Path(sdk.getAbsolutePath()); } @@ -117,6 +120,7 @@ public class AbstractSemanticHighlightingTest extends TestCase { } }; } + @Override public boolean providesFor(ICProject project) throws CoreException { return associatedProject.equals(project); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java index 418450a04be..0276edd385d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AsmPartitionerTest.java @@ -42,12 +42,14 @@ public class AsmPartitionerTest extends TestCase { super(name); } + @Override protected void setUp() { fDocument= new Document("xxx\n/*xxx*/\nxxx\n/**xxx*/\nxxx\n/**/\nxxx\n/***/\nxxx"); setupDefaultPartitioner(); fDocumentPartitioningChanged= false; fDocument.addDocumentPartitioningListener(new IDocumentPartitioningListener() { + @Override public void documentPartitioningChanged(IDocument document) { fDocumentPartitioningChanged= true; } @@ -82,6 +84,7 @@ public class AsmPartitionerTest extends TestCase { return new TestSuite(AsmPartitionerTest.class); } + @Override protected void tearDown () { IDocumentPartitioner partitioner= fDocument.getDocumentPartitioner(); if (partitioner != null) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java index 8ebc81e6da8..ca4b727ed4d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BasicCEditorTest.java @@ -77,9 +77,11 @@ public class BasicCEditorTest extends BaseUITestCase { final static class TestDocListener implements IDocumentListener { public boolean fDocChanged; + @Override public void documentAboutToBeChanged(DocumentEvent event) { } + @Override public void documentChanged(DocumentEvent event) { fDocChanged= true; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java index 54f11358671..f62769c582d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/BracketInserterTest.java @@ -435,11 +435,14 @@ public class BracketInserterTest extends TestCase { private void linkedType(char character, boolean nested, int expectedExitFlags) { final int[] exitFlags= { -1 }; assertModel(nested).addLinkingListener(new ILinkedModeListener() { + @Override public void left(LinkedModeModel model, int flags) { exitFlags[0]= flags; } + @Override public void resume(LinkedModeModel model, int flags) { } + @Override public void suspend(LinkedModeModel model) { } }); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java index edaef1b7b94..0d0288ebac4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CAutoIndentTest.java @@ -73,6 +73,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { fStatusLog= Collections.synchronizedList(new ArrayList()); fLogListener= new ILogListener() { + @Override public void logging(IStatus status, String plugin) { if(!status.isOK()) { fStatusLog.add(status); @@ -111,7 +112,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testCAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("void main() {\n"); //$NON-NLS-1$ assertEquals(1, tester.getCaretLine()); // Nested statement is indented by one. @@ -149,7 +150,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testPasteAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("class A {\n"); //$NON-NLS-1$ tester.goTo(1, 0); tester.paste("class B {\n" + @@ -176,7 +177,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testDefaultAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type(" initial indent=5\n"); //$NON-NLS-1$ assertEquals(1, tester.getCaretLine()); assertEquals(5, tester.getCaretColumn()); @@ -198,7 +199,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testCCommentAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("/*\n"); //$NON-NLS-1$ assertEquals(ICPartitions.C_MULTI_LINE_COMMENT, tester.getContentType(tester.getCaretOffset()-1)); assertEquals(1, tester.getCaretLine()); @@ -215,7 +216,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testPreprocessorAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("void main() {\n"); //$NON-NLS-1$ assertEquals(1, tester.getCaretLine()); // Nested statement is indented by one. @@ -237,7 +238,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testPasteBlockCommentAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("class A {\n};"); //$NON-NLS-1$ tester.goTo(1, 0); tester.paste("/*\n" + @@ -250,7 +251,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testPasteLineCommentAutoIndent() throws BadLocationException { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("class A {\n};"); //$NON-NLS-1$ tester.goTo(1, 0); tester.paste("// int f;\n"); @@ -353,7 +354,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { public void testBracketIndentForConstructorDefinition_Bug183814() throws BadLocationException { DefaultCodeFormatterOptions whitesmiths= DefaultCodeFormatterOptions.getWhitesmithsSettings(); CCorePlugin.setOptions(new HashMap(whitesmiths.getMap())); - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("Foo::Foo()\n{"); assertEquals("Foo::Foo()\n {", tester.fDoc.get()); @@ -362,7 +363,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { public void testSmartPasteWhitesmiths_Bug180531() throws Exception { DefaultCodeFormatterOptions whitesmiths= DefaultCodeFormatterOptions.getWhitesmithsSettings(); CCorePlugin.setOptions(new HashMap(whitesmiths.getMap())); - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("A::~A()\n{"); assertEquals("A::~A()\n {", tester.fDoc.get()); @@ -394,7 +395,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testSmartPaste_Bug215310() throws Exception { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); tester.type("#define S \\ \n"); tester.type("d\n"); @@ -408,7 +409,7 @@ public class CAutoIndentTest extends AbstractAutoEditTest { } public void testAutoIndentDisabled_Bug219923() throws Exception { - AutoEditTester tester = createAutoEditTester(); //$NON-NLS-1$ + AutoEditTester tester = createAutoEditTester(); IPreferenceStore store= PreferenceConstants.getPreferenceStore(); try { store.setValue(PreferenceConstants.EDITOR_AUTO_INDENT, false); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java index a8cb23461f1..35a390102ef 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CBreakIteratorTest.java @@ -26,6 +26,7 @@ public class CBreakIteratorTest extends BreakIteratorTest { /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { fBreakIterator= new CBreakIterator(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java index 34111bda563..a44e99aede0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeaderRuleTest.java @@ -37,6 +37,7 @@ public class CHeaderRuleTest extends TestCase { super(name); } + @Override protected void setUp() throws Exception { fToken = new Token(HEADER); fScanner = new RuleBasedScanner(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java index 129ad5f621d..870b06c7f4d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CHeuristicScannerTest.java @@ -48,6 +48,7 @@ public class CHeuristicScannerTest extends TestCase { /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() { if (CCorePlugin.getDefault() != null) { HashMap options= CCorePlugin.getDefaultOptions(); @@ -81,6 +82,7 @@ public class CHeuristicScannerTest extends TestCase { /* * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { fDocument.setDocumentPartitioner(ICPartitions.C_PARTITIONING, null); fPartitioner.disconnect(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java index b14c4d6aa5d..3b19a04b571 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionScanner.java @@ -43,6 +43,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa /* * @see IWordDetector#isWordStart */ + @Override public boolean isWordStart(char c) { return (c == '/'); } @@ -50,6 +51,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa /* * @see IWordDetector#isWordPart */ + @Override public boolean isWordPart(char c) { return (c == '*' || c == '/'); } @@ -74,6 +76,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa /* * @see IPredicateRule#evaluate(ICharacterScanner, boolean) */ + @Override public IToken evaluate(ICharacterScanner scanner, boolean resume) { return evaluate(scanner); } @@ -81,6 +84,7 @@ public class CPartitionScanner extends RuleBasedPartitionScanner implements ICPa /* * @see IPredicateRule#getSuccessToken() */ + @Override public IToken getSuccessToken() { return fSuccessToken; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java index 656a833102b..2db46de0a21 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CPartitionerTest.java @@ -58,6 +58,7 @@ public class CPartitionerTest extends TestCase { fDocumentPartitioningChanged= false; fDocument.addDocumentPartitioningListener(new IDocumentPartitioningListener() { + @Override public void documentPartitioningChanged(IDocument document) { fDocumentPartitioningChanged= true; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java index 28f557328f4..1e8122c061f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordFinderTest.java @@ -32,10 +32,12 @@ public class CWordFinderTest extends BaseUITestCase { return suite(CWordFinderTest.class, "_"); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java index fd727c3bcae..23d6728e827 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CWordIteratorTest.java @@ -26,6 +26,7 @@ public class CWordIteratorTest extends BreakIteratorTest { /* * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { fBreakIterator= new CWordIterator(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java index 1de7015d280..6a3a629d112 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/FoldingTest.java @@ -51,9 +51,11 @@ public class FoldingTest extends TestCase { super(offset, length); fCaptionOffset= captionOffset; } + @Override public int computeCaptionOffset(IDocument document) throws BadLocationException { return fCaptionOffset; } + @Override public IRegion[] computeProjectionRegions(IDocument document) throws BadLocationException { return new IRegion[] { this }; } @@ -189,6 +191,7 @@ public class FoldingTest extends TestCase { positions.add(pos); } Collections.sort(positions, new Comparator() { + @Override public int compare(Position p0, Position p1) { return p0.offset - p1.offset; }}); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java index 5b8ee47441d..ce0c65544fd 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/HyperlinkTest.java @@ -114,6 +114,7 @@ public class HyperlinkTest extends TestCase { IWorkingCopyManager manager = CUIPlugin.getDefault().getWorkingCopyManager(); IWorkingCopy workingCopy = manager.getWorkingCopy(editor.getEditorInput()); IStatus status= ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_IF_OPEN, null, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { return Status.OK_STATUS; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java index 66ab69c0dcf..fd6cd7e0b1d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/MarkOccurrenceTest.java @@ -137,6 +137,7 @@ public class MarkOccurrenceTest extends BaseUITestCase { fMatch= null; fSelWASTListener= new ISelectionListenerWithAST() { + @Override public void selectionChanged(IEditorPart part, ITextSelection selection, IASTTranslationUnit astRoot) { if (fMatch != null && selection != null && selection.getOffset() == fMatch.getOffset() && selection.getLength() == fMatch.getLength()) { countOccurrences(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java index 0fb106aeeeb..382eb7283f3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/NumberRuleTest.java @@ -42,6 +42,7 @@ public class NumberRuleTest extends TestCase { return new TestSuite(NumberRuleTest.class); } + @Override protected void setUp() throws Exception { super.setUp(); fScanner = new RuleBasedScanner() {}; @@ -51,6 +52,7 @@ public class NumberRuleTest extends TestCase { fDocument = new Document(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java index 7a13f282892..69e301e1b7f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PairMatcherTest.java @@ -37,6 +37,7 @@ public class PairMatcherTest extends TestCase { super(name); } + @Override protected void setUp() { Document document= new Document("xx(yy(xx)yy)xx"); String[] types= new String[] { @@ -58,6 +59,7 @@ public class PairMatcherTest extends TestCase { return new TestSuite(PairMatcherTest.class); } + @Override protected void tearDown () { fDocument= null; fPairMatcher= null; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java index c7b8aac9365..6901cb5a395 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/ShiftActionTest.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.ui.texteditor.ShiftAction; @@ -114,11 +115,11 @@ public class ShiftActionTest extends BaseUITestCase { } private void shiftLeft() throws Exception { - new ShiftAction(new EmptyBundle(), "prefix", fEditor, SourceViewer.SHIFT_LEFT).run(); + new ShiftAction(new EmptyBundle(), "prefix", fEditor, ITextOperationTarget.SHIFT_LEFT).run(); } private void shiftRight() throws Exception { - new ShiftAction(new EmptyBundle(), "prefix", fEditor, SourceViewer.SHIFT_RIGHT).run(); + new ShiftAction(new EmptyBundle(), "prefix", fEditor, ITextOperationTarget.SHIFT_RIGHT).run(); } private void selectAll() { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java index c337a1bce40..822b57ee29e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/ContentAssistTests.java @@ -89,7 +89,9 @@ public class ContentAssistTests extends BaseUITestCase { //disable the help books so we don't get proposals we weren't expecting CHelpBookDescriptor helpBooks[]; helpBooks = CHelpProviderManager.getDefault().getCHelpBookDescriptors(new ICHelpInvocationContext(){ + @Override public IProject getProject(){return project;} + @Override public ITranslationUnit getTranslationUnit(){return null;} } ); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/TestProposalFilter.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/TestProposalFilter.java index 85abbc943be..cea9f92c6f7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/TestProposalFilter.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/TestProposalFilter.java @@ -21,6 +21,7 @@ public class TestProposalFilter implements IProposalFilter { /** * This dummy filter method will return the original proposals unmodified. */ + @Override public ICCompletionProposal[] filterProposals( ICCompletionProposal[] proposals) { return proposals ; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java index 39de0686e42..de8069a6555 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionProposalsBaseTest.java @@ -45,6 +45,7 @@ public abstract class CompletionProposalsBaseTest extends AbstractContentAssistT /* * @see junit.framework.TestCase#getName() */ + @Override public String getName() { if (fFailingTest) { return "[Failing] " + super.getName(); @@ -55,6 +56,7 @@ public abstract class CompletionProposalsBaseTest extends AbstractContentAssistT /* * @see org.eclipse.cdt.core.testplugin.util.BaseTestCase#setExpectFailure(int) */ + @Override public void setExpectFailure(int bugnumber) { super.setExpectFailure(bugnumber); fFailingTest= true; @@ -74,6 +76,7 @@ public abstract class CompletionProposalsBaseTest extends AbstractContentAssistT protected abstract String getExpectedPrefix(); protected abstract String[] getExpectedResultsValues(); + @Override protected IFile setUpProjectContent(IProject project) throws FileNotFoundException { IFile headerFile = project.getFile(getHeaderFileName()); String fileName = getFileName(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java index 1fa07b283ed..dc748516941 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix.java @@ -49,6 +49,7 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -56,6 +57,7 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -63,6 +65,7 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -70,6 +73,7 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -77,12 +81,14 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -90,6 +96,7 @@ public class CompletionTest_ArgumentType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java index 155603c3ea6..55d5548fdda 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ArgumentType_Prefix2.java @@ -49,6 +49,7 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -56,6 +57,7 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -63,6 +65,7 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -70,6 +73,7 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -77,12 +81,14 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -90,6 +96,7 @@ public class CompletionTest_ArgumentType_Prefix2 extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java index 989d4db3566..8f256371f40 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_NoPrefix.java @@ -48,6 +48,7 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -55,6 +56,7 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -62,6 +64,7 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -69,6 +72,7 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -76,12 +80,14 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -89,6 +95,7 @@ public class CompletionTest_ClassReference_NoPrefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java index b3c78b0f9c4..62b7303a925 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ClassReference_Prefix.java @@ -47,6 +47,7 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; //$NON-NLS-1$ } @@ -54,6 +55,7 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -61,6 +63,7 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -68,6 +71,7 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -75,12 +79,14 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -88,6 +94,7 @@ public class CompletionTest_ClassReference_Prefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java index 1e8d50a1a30..7cb1a4ad8b0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ConstructorReference.java @@ -50,6 +50,7 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("( ") + 2; } @@ -57,6 +58,7 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -64,6 +66,7 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -71,6 +74,7 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -78,12 +82,14 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -91,6 +97,7 @@ public class CompletionTest_ConstructorReference extends CompletionProposalsBas /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java index 1474fd12ae2..c7ad5e1dc3b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_NoPrefix.java @@ -55,6 +55,7 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -62,6 +63,7 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -69,6 +71,7 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -76,6 +79,7 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -83,12 +87,14 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -96,6 +102,7 @@ public class CompletionTest_ExceptionReference_NoPrefix extends CompletionPropo /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java index 65ae8bf88d7..36ff8a9f490 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ExceptionReference_Prefix.java @@ -52,6 +52,7 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -59,6 +60,7 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -66,6 +68,7 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -73,6 +76,7 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -80,12 +84,14 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -93,6 +99,7 @@ public class CompletionTest_ExceptionReference_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java index 94ab44187ea..c5bf8c911e1 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix.java @@ -52,6 +52,7 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -59,6 +60,7 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -66,6 +68,7 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -73,6 +76,7 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -80,12 +84,14 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -93,6 +99,7 @@ public class CompletionTest_FieldType_NoPrefix extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java index 6c9d0e40c2f..51bf5615213 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_NoPrefix2.java @@ -54,6 +54,7 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 3; } @@ -61,6 +62,7 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -68,6 +70,7 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -75,6 +78,7 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -82,12 +86,14 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -95,6 +101,7 @@ public class CompletionTest_FieldType_NoPrefix2 extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java index b244071d224..42ebf009cc4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FieldType_Prefix.java @@ -48,6 +48,7 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -55,6 +56,7 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -62,6 +64,7 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -69,6 +72,7 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -76,12 +80,14 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -89,6 +95,7 @@ public class CompletionTest_FieldType_Prefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java index 1b0aec11ac0..5006e4ea148 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_FunctionReference_Prefix.java @@ -58,6 +58,7 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" x ") + 2; } @@ -65,6 +66,7 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -72,6 +74,7 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -79,6 +82,7 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -86,12 +90,14 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -99,6 +105,7 @@ public class CompletionTest_FunctionReference_Prefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java index 3e205286e54..76e930e9902 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_Prefix.java @@ -43,6 +43,7 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("ifdef D ") + 7; } @@ -50,6 +51,7 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_MacroRef_Prefix extends CompletionProposalsBaseTest /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java index c52f8780fdf..cbec4c17ae6 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix.java @@ -46,6 +46,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" c-> ") + 4; } @@ -53,6 +54,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix extends CompletionPr /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java index 3e036ebbf59..e349f687c34 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix2.java @@ -38,6 +38,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ap-> ") + 5; } @@ -45,6 +46,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -52,6 +54,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -59,6 +62,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -66,12 +70,14 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -79,6 +85,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix2 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java index c26afe5d1d9..c78121fc948 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_NoPrefix3.java @@ -37,6 +37,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("a->")+3; } @@ -44,6 +45,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -51,6 +53,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -58,6 +61,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -65,12 +69,14 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -78,6 +84,7 @@ public class CompletionTest_MemberReference_Arrow_NoPrefix3 extends CompletionP /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java index bb079c04620..abb93683c44 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix.java @@ -43,6 +43,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" c->a ") + 5; } @@ -50,6 +51,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java index 46c234ab1fa..b0099ebc723 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Arrow_Prefix2.java @@ -43,6 +43,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("->a ") + 3; } @@ -50,6 +51,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_MemberReference_Arrow_Prefix2 extends CompletionPro /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java index 7eb71798352..73818efa352 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_NoPrefix.java @@ -45,6 +45,7 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" c. ") + 3; } @@ -52,6 +53,7 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -59,6 +61,7 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -66,6 +69,7 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -73,12 +77,14 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -86,6 +92,7 @@ public class CompletionTest_MemberReference_Dot_NoPrefix extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java index e0971889d5f..c8d80c36160 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MemberReference_Dot_Prefix.java @@ -43,6 +43,7 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" c.a ") + 4; } @@ -50,6 +51,7 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_MemberReference_Dot_Prefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java index 8dbc601e889..9c08d58373b 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_NoPrefix.java @@ -46,6 +46,7 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("namespace ") + 10; } @@ -53,6 +54,7 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_NamespaceRef_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java index 162cbdc17ad..0acafa594d0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NamespaceRef_Prefix.java @@ -46,6 +46,7 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("namespace a ") + 11; } @@ -53,6 +54,7 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_NamespaceRef_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java index 996afe5801c..e4957eedebc 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_NoPrefix.java @@ -53,6 +53,7 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -60,6 +61,7 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -67,6 +69,7 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -74,6 +77,7 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -81,12 +85,14 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -94,6 +100,7 @@ public class CompletionTest_NewTypeReference_NoPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java index 3a151ddff32..5438fff83d4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_NewTypeReference_Prefix.java @@ -49,6 +49,7 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -56,6 +57,7 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -63,6 +65,7 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -70,6 +73,7 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -77,12 +81,14 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -90,6 +96,7 @@ public class CompletionTest_NewTypeReference_Prefix extends CompletionProposals /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java index bbd873638a7..dc86561249d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NoPrefix.java @@ -43,6 +43,7 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(":: ") + 2; } @@ -50,6 +51,7 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_ScopedReference_NoPrefix extends CompletionProposal /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java index 8d893bd3708..98cbb277412 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_NonCodeScope.java @@ -46,6 +46,7 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(":: ") + 2; } @@ -53,6 +54,7 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_ScopedReference_NonCodeScope extends CompletionProp /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java index 86555454348..b98d14eeaf7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_ScopedReference_Prefix.java @@ -43,6 +43,7 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("::a ") + 3; } @@ -50,6 +51,7 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -57,6 +59,7 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -64,6 +67,7 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -71,12 +75,14 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -84,6 +90,7 @@ public class CompletionTest_ScopedReference_Prefix extends CompletionProposalsB /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java index 88b6230769e..3befe8ee783 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_NoPrefix.java @@ -70,6 +70,7 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -77,6 +78,7 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -84,6 +86,7 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -91,6 +94,7 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -98,12 +102,14 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -111,6 +117,7 @@ public class CompletionTest_SingleName_Method_NoPrefix extends CompletionPropos /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java index 3686721b0e7..22d3ccf483f 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Method_Prefix.java @@ -57,6 +57,7 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -64,6 +65,7 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -71,6 +73,7 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -78,6 +81,7 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -85,12 +89,14 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -98,6 +104,7 @@ public class CompletionTest_SingleName_Method_Prefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java index a484dcce3c0..57841b55c85 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix.java @@ -42,6 +42,7 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" AM ") + 3; } @@ -49,6 +50,7 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -56,6 +58,7 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -63,6 +66,7 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -70,12 +74,14 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -83,6 +89,7 @@ public class CompletionTest_SingleName_Prefix extends CompletionProposalsBaseTe /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java index 0e525cb7f3d..39404b677aa 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_SingleName_Prefix2.java @@ -53,6 +53,7 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -60,6 +61,7 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -67,6 +69,7 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -74,6 +77,7 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -81,12 +85,14 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -94,6 +100,7 @@ public class CompletionTest_SingleName_Prefix2 extends CompletionProposalsBaseT /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java index 84f31aa519b..fd1a5977ade 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_NoPrefix.java @@ -47,6 +47,7 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" m ") + 2; } @@ -54,6 +55,7 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -61,6 +63,7 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -68,6 +71,7 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -75,12 +79,14 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -88,6 +94,7 @@ public class CompletionTest_TypeDef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java index c61a979910f..8b5ad8f55a3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeDef_Prefix.java @@ -47,6 +47,7 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" m ") + 2; } @@ -54,6 +55,7 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -61,6 +63,7 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -68,6 +71,7 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -75,12 +79,14 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -88,6 +94,7 @@ public class CompletionTest_TypeDef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java index e7dfea835b8..923086c5891 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_NoPrefix.java @@ -46,6 +46,7 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("using ") + 6; } @@ -53,6 +54,7 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_TypeRef_NoPrefix extends CompletionProposalsBaseTes /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java index 3c7309d241a..ee8e0c7efc2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_TypeRef_Prefix.java @@ -46,6 +46,7 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf("using a ") + 7; } @@ -53,6 +54,7 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -60,6 +62,7 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -67,6 +70,7 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -74,12 +78,14 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -87,6 +93,7 @@ public class CompletionTest_TypeRef_Prefix extends CompletionProposalsBaseTest{ /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java index cfe6645e3c8..87625376160 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NestedPrefix.java @@ -47,6 +47,7 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(":: ") + 2; } @@ -54,6 +55,7 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -61,6 +63,7 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -68,6 +71,7 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -75,12 +79,14 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -88,6 +94,7 @@ public class CompletionTest_VariableType_NestedPrefix extends CompletionProposa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java index 319027c1705..b2f29a1256a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_NoPrefix.java @@ -50,6 +50,7 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" ") + 2; } @@ -57,6 +58,7 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -64,6 +66,7 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -71,6 +74,7 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -78,12 +82,14 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -91,6 +97,7 @@ public class CompletionTest_VariableType_NoPrefix extends CompletionProposalsBa /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java index 863fc9d8ac3..f7f1f0e44bb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_VariableType_Prefix.java @@ -47,6 +47,7 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getCompletionPosition() */ + @Override protected int getCompletionPosition() { return getBuffer().indexOf(" a ") + 2; } @@ -54,6 +55,7 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedPrefix() */ + @Override protected String getExpectedPrefix() { return expectedPrefix; } @@ -61,6 +63,7 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getExpectedResultsValues() */ + @Override protected String[] getExpectedResultsValues() { return expectedResults; } @@ -68,6 +71,7 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileName() */ + @Override protected String getFileName() { return fileName; } @@ -75,12 +79,14 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getFileFullPath() */ + @Override protected String getFileFullPath() { return fileFullPath; } /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileFullPath() */ + @Override protected String getHeaderFileFullPath() { return headerFileFullPath; } @@ -88,6 +94,7 @@ public class CompletionTest_VariableType_Prefix extends CompletionProposalsBase /* (non-Javadoc) * @see org.eclipse.cdt.core.codeassist.tests.CompletionProposalsTest#getHeaderFileName() */ + @Override protected String getHeaderFileName() { return headerFileName; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java index dd42ee2642c..f11489adf78 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/CommentOwnerManagerTests.java @@ -320,11 +320,13 @@ public class CommentOwnerManagerTests extends BaseTestCase { class TestListener implements IDocCommentOwnershipListener { public int prjEvents, wkspcEvents; + @Override public void ownershipChanged(IResource resource, boolean submappingsRemoved, IDocCommentOwner oldOwner, IDocCommentOwner newOwner) { prjEvents++; } + @Override public void workspaceOwnershipChanged(IDocCommentOwner oldOwner, IDocCommentOwner newOwner) { wkspcEvents++; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java index f99c3551135..940e19724fe 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/doctools/TestGenericTagConfiguration.java @@ -34,6 +34,7 @@ public class TestGenericTagConfiguration extends AbstractGenericTagDocCommentVie fCommentMarkers= commentMarkers.toCharArray(); } + @Override public IAutoEditStrategy createAutoEditStrategy() { return null; } @@ -46,6 +47,7 @@ public class TestGenericTagConfiguration extends AbstractGenericTagDocCommentVie return tags; } + @Override public boolean isDocumentationComment(IDocument doc, int offset, int length) { try { if(offset+2 < doc.getLength()) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java index 8c37cd4b9e3..959e18eb4f2 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/BaseSelectionTestsIndexer.java @@ -230,7 +230,8 @@ public class BaseSelectionTestsIndexer extends BaseUITestCase { final ITextSelection textSel = (ITextSelection)sel; ITranslationUnit tu = (ITranslationUnit)editor.getInputCElement(); IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() { - public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { + @Override + public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength()); return Status.OK_STATUS; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java index 4dcd44e865c..9a1efb93186 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java @@ -270,7 +270,8 @@ public class CPPSelectionTestsNoIndexer extends BaseUITestCase { final ITextSelection textSel = (ITextSelection)sel; ITranslationUnit tu= CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()); IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() { - public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { + @Override + public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength()); return Status.OK_STATUS; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java index 484e47a5c6e..55dec936572 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsNoIndexer.java @@ -291,7 +291,8 @@ public class CSelectionTestsNoIndexer extends BaseUITestCase { final ITextSelection textSel = (ITextSelection)sel; ITranslationUnit tu = (ITranslationUnit) editor.getInputCElement(); IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, monitor, new ASTRunnable() { - public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { + @Override + public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException { result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength()); return Status.OK_STATUS; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java index 1b2c22031e1..743799c60d3 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java @@ -16,6 +16,7 @@ import junit.framework.Test; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -50,15 +51,17 @@ public class ResolveBindingTests extends BaseUITestCase { return suite(ResolveBindingTests.class); } + @Override protected void setUp() throws Exception { super.setUp(); fCProject= CProjectHelper.createCCProject("ResolveBindingTests", "bin", IPDOMManager.ID_FAST_INDEXER); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } + @Override protected void tearDown() throws Exception { if (fCProject != null) { - fCProject.getProject().delete(IProject.FORCE | IProject.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor()); + fCProject.getProject().delete(IResource.FORCE | IResource.ALWAYS_DELETE_PROJECT_CONTENT, new NullProgressMonitor()); } super.tearDown(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java index 0893fd26b0b..1ff5b37097e 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/viewsupport/AsyncViewerTest.java @@ -45,15 +45,18 @@ public class AsyncViewerTest extends BaseUITestCase { this(label, new Node[0], 0); } - public String toString() { + @Override + public String toString() { return fLabel; } - public int hashCode() { + @Override + public int hashCode() { return fLabel.hashCode(); } - public boolean equals(Object rhs) { + @Override + public boolean equals(Object rhs) { if (rhs instanceof Node) { return fLabel.equals(((Node) rhs).fLabel); } @@ -66,7 +69,8 @@ public class AsyncViewerTest extends BaseUITestCase { super(disp); } - protected Object[] asyncronouslyComputeChildren(Object parentElement, IProgressMonitor monitor) { + @Override + protected Object[] asyncronouslyComputeChildren(Object parentElement, IProgressMonitor monitor) { Node n= (Node) parentElement; try { Thread.sleep(n.fAsync); @@ -76,7 +80,8 @@ public class AsyncViewerTest extends BaseUITestCase { return n.fChildren; } - protected Object[] syncronouslyComputeChildren(Object parentElement) { + @Override + protected Object[] syncronouslyComputeChildren(Object parentElement) { Node n= (Node) parentElement; if (n.fAsync != 0) { return null; @@ -86,7 +91,8 @@ public class AsyncViewerTest extends BaseUITestCase { }; private class MyLabelProvider extends LabelProvider { - public String getText(Object element) { + @Override + public String getText(Object element) { if (element instanceof AsyncTreeWorkInProgressNode) { return "..."; } @@ -104,7 +110,8 @@ public class AsyncViewerTest extends BaseUITestCase { fUseExtendedViewer= useExtendedViewer; } - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { fContentProvider= new ContentProvider(getShell().getDisplay()); Composite comp= (Composite) super.createDialogArea(parent); @@ -117,7 +124,8 @@ public class AsyncViewerTest extends BaseUITestCase { private TestDialog fDialog; - protected void tearDown() throws Exception { + @Override + protected void tearDown() throws Exception { if (fDialog != null) { fDialog.close(); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java index ee8d70a1828..47384a4425a 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/ProjectSettingsWizardPageMock.java @@ -28,6 +28,7 @@ public class ProjectSettingsWizardPageMock implements IProjectSettingsWizardPage this.path = path; } + @Override public String getDestinationFilePath() { return path; } @@ -36,6 +37,7 @@ public class ProjectSettingsWizardPageMock implements IProjectSettingsWizardPage this.selectedConfiguration = config; } + @Override public ICConfigurationDescription getSelectedConfiguration() { return selectedConfiguration; } @@ -44,6 +46,7 @@ public class ProjectSettingsWizardPageMock implements IProjectSettingsWizardPage this.selectedSettingsProcessors = processors; } + @Override public List getSelectedSettingsProcessors() { return selectedSettingsProcessors; } @@ -52,18 +55,22 @@ public class ProjectSettingsWizardPageMock implements IProjectSettingsWizardPage this.settingsProcessors = processors; } + @Override public List getSettingsProcessors() { return settingsProcessors; } + @Override public void setDisplayedSettingsProcessors( List processors) { // do nothing } + @Override public void setMessage(String message, int flag) { // do nothing } + @Override public void showErrorDialog(String dialogTitle, String message) { // do nothing } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java index f7487c68015..69b9367fb66 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/wizards/settingswizards/SettingsImportExportTest.java @@ -83,7 +83,7 @@ public class SettingsImportExportTest extends BaseUITestCase { private static String getFilePath(String fileName) { IPath workspaceLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation(); - return workspaceLocation.toOSString() + Path.SEPARATOR + fileName; + return workspaceLocation.toOSString() + IPath.SEPARATOR + fileName; } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java index 6f1a856519e..3a7a4a4995c 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/ElementSelectionDialog.java @@ -95,6 +95,7 @@ public class ElementSelectionDialog extends TypeSelectionDialog { final Shell shell= getShell(); if (shell != null && !shell.isDisposed()) { Runnable update= new Runnable() { + @Override public void run() { if (!shell.isDisposed() && !monitor.isCanceled()) { setListElements(elements); @@ -127,6 +128,7 @@ public class ElementSelectionDialog extends TypeSelectionDialog { final Shell shell= getShell(); if (shell != null && !shell.isDisposed()) { Runnable update= new Runnable() { + @Override public void run() { if (!shell.isDisposed() && fDone) { fMonitor.done(); @@ -142,6 +144,7 @@ public class ElementSelectionDialog extends TypeSelectionDialog { final Shell shell= getShell(); if (shell != null && !shell.isDisposed()) { Runnable update= new Runnable() { + @Override public void run() { if (!shell.isDisposed() && !fDone) { fMonitor.beginTask(OpenTypeMessages.ElementSelectionDialog_UpdateElementsJob_inProgress, IProgressMonitor.UNKNOWN); @@ -153,9 +156,11 @@ public class ElementSelectionDialog extends TypeSelectionDialog { } private static final ISchedulingRule SINGLE_INSTANCE_RULE = new ISchedulingRule() { + @Override public boolean contains(ISchedulingRule rule) { return rule == this; } + @Override public boolean isConflicting(ISchedulingRule rule) { return rule == this; }}; @@ -353,7 +358,8 @@ public class ElementSelectionDialog extends TypeSelectionDialog { protected Text createFilterText(Composite parent) { final Text result = super.createFilterText(parent); Listener listener = new Listener() { - public void handleEvent(Event e) { + @Override + public void handleEvent(Event e) { scheduleUpdate(result.getText()); } }; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java index 806aee25e76..ba6d7896852 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeAction.java @@ -53,6 +53,7 @@ public class OpenTypeAction implements IWorkbenchWindowActionDelegate { * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ + @Override public void run(IAction action) { ElementSelectionDialog dialog = new ElementSelectionDialog(getShell()); configureDialog(dialog); @@ -164,6 +165,7 @@ public class OpenTypeAction implements IWorkbenchWindowActionDelegate { * * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ + @Override public void dispose() { fWorkbenchWindow= null; } @@ -173,6 +175,7 @@ public class OpenTypeAction implements IWorkbenchWindowActionDelegate { * * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void init(IWorkbenchWindow window) { fWorkbenchWindow= window; } @@ -183,6 +186,7 @@ public class OpenTypeAction implements IWorkbenchWindowActionDelegate { * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { } } diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java index d52441a03f7..24d8faf239f 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java @@ -69,6 +69,7 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { /* * @see FilteredList.FilterMatcher#setFilter(String, boolean) */ + @Override public void setFilter(String pattern, boolean ignoreCase, boolean ignoreWildCards) { // parse pattern into segments QualifiedTypeName qualifiedName = new QualifiedTypeName(pattern); @@ -123,6 +124,7 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { /* * @see FilteredList.FilterMatcher#match(Object) */ + @Override public boolean match(Object element) { if (!(element instanceof ITypeInfo)) return false; @@ -181,7 +183,8 @@ public class TypeSelectionDialog extends TwoPaneElementSelector { } private static class StringComparator implements Comparator { - public int compare(String left, String right) { + @Override + public int compare(String left, String right) { int result = left.compareToIgnoreCase(right); if (result == 0) result = left.compareTo(right); diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties index e6800126b9e..93187917aaf 100644 --- a/core/org.eclipse.cdt.ui/plugin.properties +++ b/core/org.eclipse.cdt.ui/plugin.properties @@ -193,8 +193,9 @@ CPluginBuildPreferencePage.name=Build CPluginBuildConsolePreferencePage.name=Console CPluginGlobalBuildLogPreferencePage.name=Logging CPluginFileTypesPreferencePage.name=File Types -CodeFormatterPreferencePage.name=Code Style +CodeStylePreferencePage.name=Code Style codeTemplatePreferencePage.name=Code Templates +codeFormatterPreferencePage.name=Formatter nameStylePreferencePage.name=Name Style CodeAssistPreferencePage.name=Content Assist CodeAssistAdvancedPreferencePage.name=Advanced @@ -560,9 +561,10 @@ workingSetConfigurationsExtensionPoint=Working Set Configurations # Keywords for Preferences preferenceKeywords.common=c cpp cplusplus cdt -preferenceKeywords.codestyle=profile codestyle project specific comment indentation brace white space blank line new control statement wrapping tab parenthesis bracket +preferenceKeywords.codeformatter=profile codestyle project specific comment indentation brace white space blank line new control statement wrapping tab parenthesis bracket +preferenceKeywords.codestyle=class member visibility order ordering preferenceKeywords.codetemplates=comment code constructor method file type content -preferenceKeywords.namestyle=name file getter setter +preferenceKeywords.namestyle=name file getter setter field variable preferenceKeywords.todo=case sensitive task tag todo xxx fix fixme project comments preferenceKeywords.indexer=index skip references type macro search build configuration cache memory performance diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml index 1638e390596..0ac2a70755f 100644 --- a/core/org.eclipse.cdt.ui/plugin.xml +++ b/core/org.eclipse.cdt.ui/plugin.xml @@ -1128,10 +1128,10 @@ + class="org.eclipse.cdt.internal.ui.preferences.CodeStylePreferencePage" + id="org.eclipse.cdt.ui.preferences.CodeStylePreferencePage"> @@ -1197,15 +1197,23 @@ + + + + @@ -1264,6 +1272,9 @@ + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java index 3b1f8b28796..188c3aaa7b1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java @@ -76,6 +76,7 @@ public class AddIncludesOperation implements IWorkspaceRunnable { return ResourcesPlugin.getWorkspace().getRoot(); } + @Override public void run(IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor= new NullProgressMonitor(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java index e888f1d9d35..688f95c7272 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java @@ -46,8 +46,11 @@ public class LinkedProposalModel { public Iterator getPositionGroupIterator() { if (fPositionGroups == null) { return new Iterator() { + @Override public boolean hasNext() {return false;} + @Override public LinkedProposalPositionGroup next() {return null;} + @Override public void remove() {} }; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/ExclusivePositionUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/ExclusivePositionUpdater.java index 758f6eb3f6d..1719bf000b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/ExclusivePositionUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/ExclusivePositionUpdater.java @@ -36,6 +36,7 @@ final class ExclusivePositionUpdater implements IPositionUpdater { /* * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) */ + @Override public void update(DocumentEvent event) { int eventOffset= event.getOffset(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java index d3f75f5469b..6e586874b2a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/SimplePositionTracker.java @@ -30,6 +30,7 @@ public class SimplePositionTracker extends PositionTracker implements /* * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) */ + @Override public void update(DocumentEvent event) { String text = event.getText(); int insertLen = text != null ? text.length() : 0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java index a639db045b0..c883bbb98ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java @@ -85,6 +85,7 @@ public interface ICHelpContextIds { public static final String APPEARANCE_PREFERENCE_PAGE = PREFIX + "appearance_preference_page_context"; //$NON-NLS-1$ public static final String SPELLING_CONFIGURATION_BLOCK= PREFIX + "spelling_configuration_block_context"; //$NON-NLS-1$ + public static final String CODE_STYLE_PREFERENCE_PAGE = PREFIX + "code_style_preference_context"; //$NON-NLS-1$ public static final String CODE_TEMPLATES_PREFERENCE_PAGE = PREFIX + "code_templates_preference_context"; //$NON-NLS-1$ public static final String NAME_STYLE_PREFERENCE_PAGE = PREFIX + "name_style_preference_context"; //$NON-NLS-1$ @@ -163,8 +164,6 @@ public interface ICHelpContextIds { public static final String CPROJECT_VIEW = PREFIX + "projects_view"; //$NON-NLS-1$ public static final String C_SEARCH_VIEW = PREFIX + "search_view"; //$NON-NLS-1$ - public static final String PATHENTRY_VARIABLES_PREFERENCE_PAGE= PREFIX + "pathentry_variables_preference_page_context"; //$NON-NLS-1$ - public static final String SAVE_ACTIONS_PREFERENCE_PAGE = PREFIX + "save_actions_preference_page_context"; //$NON-NLS-1$ public static final String SCALABILITY_PREFERENCE_PAGE = PREFIX + "scalability_preference_page_context"; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java index c8aef901061..fbe8d3c8488 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java @@ -118,6 +118,7 @@ public class CHContentProvider extends AsyncTreeContentProvider { ICElement element= input; if (!IndexUI.isIndexed(index, input)) { getDisplay().asyncExec(new Runnable() { + @Override public void run() { fView.reportNotIndexed(input); } @@ -126,6 +127,7 @@ public class CHContentProvider extends AsyncTreeContentProvider { element= IndexUI.attemptConvertionToHandle(index, input); final ICElement finalElement= element; getDisplay().asyncExec(new Runnable() { + @Override public void run() { fView.reportInputReplacement(input, finalElement); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java index 652484b2681..3d5715460bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java @@ -36,7 +36,8 @@ public class CHDropTargetListener implements DropTargetListener { fEnabled= val; } - public void dragEnter(DropTargetEvent event) { + @Override + public void dragEnter(DropTargetEvent event) { fInput= null; checkOperation(event); if (event.detail != DND.DROP_NONE) { @@ -69,17 +70,21 @@ public class CHDropTargetListener implements DropTargetListener { return null; } - public void dragLeave(DropTargetEvent event) { + @Override + public void dragLeave(DropTargetEvent event) { } - public void dragOperationChanged(DropTargetEvent event) { + @Override + public void dragOperationChanged(DropTargetEvent event) { checkOperation(event); } - public void dragOver(DropTargetEvent event) { + @Override + public void dragOver(DropTargetEvent event) { } - public void drop(DropTargetEvent event) { + @Override + public void drop(DropTargetEvent event) { if (fInput == null) { Display.getCurrent().beep(); } else { @@ -87,7 +92,8 @@ public class CHDropTargetListener implements DropTargetListener { } } - public void dropAccept(DropTargetEvent event) { + @Override + public void dropAccept(DropTargetEvent event) { } private void checkOperation(DropTargetEvent event) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java index 8976e9c37fb..465713bbdfc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java @@ -155,6 +155,7 @@ public class CHNode implements IAdaptable { return fFileOfReferences; } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(ICElement.class)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java index bd8af5e6a1d..12cc688466e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java @@ -14,6 +14,7 @@ import java.util.Comparator; public class CHReferenceInfo { public static final Comparator COMPARE_OFFSET = new Comparator() { + @Override public int compare(CHReferenceInfo r1, CHReferenceInfo r2) { return r1.fOffset - r2.fOffset; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java index 5fc584ed158..64cacf5b783 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenElementInCallHierarchyAction.java @@ -39,6 +39,7 @@ public class OpenElementInCallHierarchyAction implements IWorkbenchWindowActionD public OpenElementInCallHierarchyAction() { } + @Override public void run(IAction action) { ElementSelectionDialog dialog = new ElementSelectionDialog(getShell()); configureDialog(dialog); @@ -93,14 +94,17 @@ public class OpenElementInCallHierarchyAction implements IWorkbenchWindowActionD return fWorkbenchWindow.getShell(); } + @Override public void dispose() { fWorkbenchWindow= null; } + @Override public void init(IWorkbenchWindow window) { fWorkbenchWindow= window; } + @Override public void selectionChanged(IAction action, ISelection selection) { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java index fbcfeb3fd14..4a407a39a97 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java @@ -80,6 +80,7 @@ abstract class AbstractMergeViewer extends TextMergeViewer { if (fPreferenceStore == null) { fPreferenceStore= CUIPlugin.getDefault().getCombinedPreferenceStore(); fPreferenceChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { handlePropertyChange(event); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmContentViewerCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmContentViewerCreator.java index 243627ec329..0c9c251e028 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmContentViewerCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmContentViewerCreator.java @@ -24,6 +24,7 @@ public class AsmContentViewerCreator implements IViewerCreator { /* * @see org.eclipse.compare.IViewerCreator#createViewer(org.eclipse.swt.widgets.Composite, org.eclipse.compare.CompareConfiguration) */ + @Override public Viewer createViewer(Composite parent, CompareConfiguration config) { return new AsmMergeViewer(parent, SWT.NULL, config); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java index 9e24f2fb66d..d0db19fcae3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CContentViewerCreator.java @@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.Viewer; */ public class CContentViewerCreator implements IViewerCreator { + @Override public Viewer createViewer(Composite parent, CompareConfiguration mp) { return new CMergeViewer(parent, SWT.NULL, mp); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java index 434cff31082..057179e308e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CNode.java @@ -36,14 +36,17 @@ class CNode extends DocumentRangeNode implements ITypedElement { this(parent, type, id, parent.getDocument(), start, length); } + @Override public String getName() { return getId(); } + @Override public String getType() { return "c2"; //$NON-NLS-1$ } + @Override public Image getImage() { ImageDescriptor descriptor = CElementImageProvider.getImageDescriptor(getTypeCode()); return CUIPlugin.getImageDescriptorRegistry().get(descriptor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java index 8ae775f85ac..a1c7078784f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java @@ -62,6 +62,7 @@ public class CStructureCreator extends StructureCreator { public CStructureCreator() { } + @Override public String getName() { return CUIPlugin.getResourceString(NAME); } @@ -69,6 +70,7 @@ public class CStructureCreator extends StructureCreator { /* * @see IStructureCreator#getContents */ + @Override public String getContents(Object node, boolean ignoreWhitespace) { if (node instanceof IDocumentRange) { IDocumentRange documentRange= (IDocumentRange)node; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index 4b79c6a4bea..433c21f4676 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -27,7 +27,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.IDoubleClickListener; @@ -154,27 +153,33 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha private IPartListener partListener = new IPartListener() { + @Override public void partActivated(IWorkbenchPart part) { if (part instanceof IEditorPart) { editorActivated((IEditorPart) part); } } + @Override public void partBroughtToTop(IWorkbenchPart part) { } + @Override public void partClosed(IWorkbenchPart part) { } + @Override public void partDeactivated(IWorkbenchPart part) { } + @Override public void partOpened(IWorkbenchPart part) { } }; private IPropertyChangeListener workingSetListener = new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent ev) { String property = ev.getProperty(); Object newValue = ev.getNewValue(); @@ -213,6 +218,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha * * @see ISetSelectionTarget#selectReveal(ISelection) */ + @Override public void selectReveal(ISelection selection) { IStructuredSelection ssel = SelectionConverter.convertSelectionToCElements(selection, true); if (!ssel.isEmpty()) { @@ -279,6 +285,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha if (isLinkingEnabled()) { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (dragDetected == false) { // only synchronize with editor when the selection is @@ -370,6 +377,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha dragDetectListener = new Listener() { + @Override public void handleEvent(Event event) { dragDetected = true; } @@ -446,6 +454,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { CView.this.fillContextMenu(manager); } @@ -486,6 +495,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha protected void initListeners(TreeViewer viewer) { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { handleDoubleClick(event); } @@ -493,12 +503,14 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(event); } }); viewer.addOpenListener(new IOpenListener() { + @Override public void open(OpenEvent event) { handleOpen(event); } @@ -827,6 +839,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha } } + @Override public void propertyChange(PropertyChangeEvent event) { if (viewer == null) return; @@ -1063,6 +1076,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha * * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext) */ + @Override public boolean show(ShowInContext context) { ISelection selection= context.getSelection(); if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection) { @@ -1085,13 +1099,15 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha */ protected IShowInSource getShowInSource() { return new IShowInSource() { + @Override public ShowInContext getShowInContext() { return new ShowInContext(getViewer().getInput(), getViewer().getSelection()); } }; } - public String[] getShowInTargetIds() { + @Override + public String[] getShowInTargetIds() { return new String[]{IPageLayout.ID_RES_NAV}; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java index 05bfd4d81f3..cccf6199353 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewElementComparer.java @@ -18,6 +18,7 @@ import org.eclipse.cdt.core.model.IWorkingCopy; public class CViewElementComparer implements IElementComparer { + @Override public boolean equals(Object o1, Object o2) { if (o1 == o2) // this handles also the case that both are null return true; @@ -58,6 +59,7 @@ public class CViewElementComparer implements IElementComparer { return c1.equals(c2); } + @Override public int hashCode(Object o1) { return o1.hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java index 90b2dbffc25..8ad15af195b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java @@ -168,6 +168,7 @@ public class PasteAction extends SelectionListenerAction { final IResource[][] clipboardData = new IResource[1][]; shell.getDisplay().syncExec(new Runnable() { + @Override public void run() { // clipboard must have resources or files ResourceTransfer resTransfer = ResourceTransfer.getInstance(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java index d40789ba231..5384c5cc8d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java @@ -54,10 +54,12 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement //---- TransferDropTargetListener interface --------------------------------------- + @Override public Transfer getTransfer() { return LocalSelectionTransfer.getTransfer(); } + @Override public boolean isEnabled(DropTargetEvent event) { Object target= event.item != null ? event.item.getData() : null; if (target == null) { @@ -242,6 +244,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement } final ICElement[] siblings = neighbours; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { CoreModel.getDefault().getCModel().move(cElements, containers, siblings, null, false, monitor); @@ -305,6 +308,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement } final ICElement[] siblings = neighbours; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { CoreModel.getDefault().getCModel().copy(cElements, containers, siblings, null, false, monitor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java index 2ad44ec15f9..b10770a92ba 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java @@ -79,9 +79,11 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus fRenderer, fIgnoreCase); fSelectionList.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { handleDoubleClick(); } + @Override public void widgetSelected(SelectionEvent e) { verifyCurrentSelection(); } @@ -200,6 +202,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus @Override public int open() { BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { access$superOpen(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java index 9b518698ccf..e883656730e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java @@ -106,6 +106,7 @@ public class MessageLine extends CLabel { if (fErrorColor == null) { fErrorColor= new Color(getDisplay(), fErrorRGB); addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fErrorColor.dispose(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java index f2cbe9e80d7..c44eb30b404 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java @@ -65,6 +65,7 @@ public class SelectionList extends Composite { fList= new Table(this, style); fList.setLayoutData(new GridData(GridData.FILL_BOTH)); fList.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fRenderer.dispose(); } @@ -79,6 +80,7 @@ public class SelectionList extends Composite { spec.verticalAlignment= GridData.BEGINNING; fText.setLayoutData(spec); Listener l= new Listener() { + @Override public void handleEvent(Event evt) { filter(false); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java index 9a92cbdffd8..aa0088baeca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java @@ -48,36 +48,42 @@ public class StatusInfo implements IStatus { /** * @see IStatus#getChildren() */ + @Override public IStatus[] getChildren() { return new IStatus[0]; } /** * @see IStatus#getCode() */ + @Override public int getCode() { return fSeverity; } /** * @see IStatus#getException() */ + @Override public Throwable getException() { return null; } /** * @see IStatus#getMessage */ + @Override public String getMessage() { return fStatusMessage; } /** * @see IStatus#getPlugin() */ + @Override public String getPlugin() { return CUIPlugin.PLUGIN_ID; } /** * @see IStatus#getSeverity() */ + @Override public int getSeverity() { return fSeverity; } @@ -90,9 +96,11 @@ public class StatusInfo implements IStatus { /** * @see IStatus#isMultiStatus() */ + @Override public boolean isMultiStatus() { return false; } + @Override public boolean isOK() { return fSeverity == IStatus.OK; } @@ -102,6 +110,7 @@ public class StatusInfo implements IStatus { /** * @see IStatus#matches(int) */ + @Override public boolean matches(int severityMask) { return (fSeverity & severityMask) != 0; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java index fdb6e2ceb75..e87f1697354 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java @@ -56,6 +56,7 @@ public class TypedElementSelectionValidator implements ISelectionStatusValidator /* * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object) */ + @Override public IStatus validate(Object[] elements) { if (isValid(elements)) { return fgOKStatus; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java index 35ffc65d24b..a609eaa8022 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java @@ -218,6 +218,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple return fCurrCElement.getCProject(); } + @Override public IProject getProject() { return getCProject().getProject(); } @@ -255,6 +256,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple * * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#updateContainer() */ + @Override public void updateContainer() { update(); } @@ -276,6 +278,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple fBuildPathStatus.setOK(); } + @Override public Preferences getPreferences() { return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java index 3649aaccf7b..2e1f1b3a957 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java @@ -422,6 +422,7 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { * * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ + @Override public Color getForeground(Object element) { if (element instanceof CPElement) { if ( ((CPElement)element).getInherited() != null) { @@ -436,6 +437,7 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { * * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ + @Override public Color getBackground(Object element) { // TODO Auto-generated method stub return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java index 6b106db6e20..391bad74a87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java @@ -54,6 +54,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I fEntryField= new StringDialogField(); fEntryField.setLabelText(CPathEntryMessages.CPathContainerDefaultPage_path_label); fEntryField.setDialogFieldListener(new IDialogFieldListener() { + @Override public void dialogFieldChanged(DialogField field) { validatePath(); } @@ -82,6 +83,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I /* (non-Javadoc) * @see IDialogPage#createControl(Composite) */ + @Override public void createControl(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -101,6 +103,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I /* (non-Javadoc) * @see IClasspathContainerPage#finish() */ + @Override public boolean finish() { return true; } @@ -108,6 +111,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I /* (non-Javadoc) * @see IClasspathContainerPage#getSelection() */ + @Override public IContainerEntry[] getNewContainers() { return new IContainerEntry[] {CoreModel.newContainerEntry(new Path(fEntryField.getText()))}; } @@ -115,6 +119,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I /* (non-Javadoc) * @see org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension#initialize(org.eclipse.jdt.core.IJavaProject, org.eclipse.jdt.core.IClasspathEntry) */ + @Override public void initialize(ICProject project, IPathEntry[] currentEntries) { for (int i= 0; i < currentEntries.length; i++) { IPathEntry curr= currentEntries[i]; @@ -127,6 +132,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I /* (non-Javadoc) * @see IClasspathContainerPage#setSelection(IClasspathEntry) */ + @Override public void setSelection(IContainerEntry containerEntry) { if (containerEntry != null) { fUsedPaths.remove(containerEntry.getPath()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java index 4b8e20a961d..1eb7f3b4556 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java @@ -69,6 +69,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.ui.wizards.IPathEntryContainerPage#initialize(org.eclipse.cdt.core.model.ICProject, org.eclipse.cdt.core.model.IPathEntry[]) */ + @Override public void initialize(ICProject project, IPathEntry[] currentEntries) { fPage.initialize(project, currentEntries); } @@ -76,6 +77,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.ui.wizards.IPathEntryContainerPage#finish() */ + @Override public boolean finish() { return fPage.finish(); } @@ -83,6 +85,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.ui.wizards.IPathEntryContainerPage#getNewContainers() */ + @Override public IContainerEntry[] getNewContainers() { IPathEntry[] entries = fPage.getContainerEntries(); IContainerEntry[] containers = new IContainerEntry[entries.length]; @@ -93,6 +96,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.cdt.ui.wizards.IPathEntryContainerPage#setSelection(org.eclipse.cdt.core.model.IContainerEntry) */ + @Override public void setSelection(IContainerEntry containerEntry) { fPage.setSelection(containerEntry); } @@ -100,6 +104,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { fPage.createControl(parent); @@ -108,6 +113,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage() */ + @Override public boolean canFlipToNextPage() { return fPage.canFlipToNextPage(); } @@ -115,6 +121,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getName() */ + @Override public String getName() { return fPage.getName(); } @@ -122,6 +129,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getNextPage() */ + @Override public IWizardPage getNextPage() { return fPage.getNextPage(); } @@ -129,6 +137,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getPreviousPage() */ + @Override public IWizardPage getPreviousPage() { return fPage.getPreviousPage(); } @@ -136,6 +145,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#getWizard() */ + @Override public IWizard getWizard() { return fPage.getWizard(); } @@ -143,6 +153,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#isPageComplete() */ + @Override public boolean isPageComplete() { return fPage.isPageComplete(); } @@ -150,6 +161,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage) */ + @Override public void setPreviousPage(IWizardPage page) { fPage.setPreviousPage(page); } @@ -157,6 +169,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizardPage#setWizard(org.eclipse.jface.wizard.IWizard) */ + @Override public void setWizard(IWizard newWizard) { fPage.setWizard(newWizard); } @@ -164,6 +177,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { fPage.dispose(); } @@ -171,6 +185,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getControl() */ + @Override public Control getControl() { return fPage.getControl(); } @@ -178,6 +193,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getDescription() */ + @Override public String getDescription() { return fPage.getDescription(); } @@ -185,6 +201,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getErrorMessage() */ + @Override public String getErrorMessage() { return fPage.getErrorMessage(); } @@ -192,6 +209,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getImage() */ + @Override public Image getImage() { return fPage.getImage(); } @@ -199,6 +217,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getMessage() */ + @Override public String getMessage() { return fPage.getMessage(); } @@ -206,6 +225,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#getTitle() */ + @Override public String getTitle() { return fPage.getTitle(); } @@ -213,6 +233,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#performHelp() */ + @Override public void performHelp() { fPage.performHelp(); } @@ -220,6 +241,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#setDescription(java.lang.String) */ + @Override public void setDescription(String description) { fPage.setDescription(description); } @@ -227,6 +249,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#setImageDescriptor(org.eclipse.jface.resource.ImageDescriptor) */ + @Override public void setImageDescriptor(ImageDescriptor image) { fPage.setImageDescriptor(image); } @@ -234,6 +257,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#setTitle(java.lang.String) */ + @Override public void setTitle(String title) { fPage.setTitle(title); } @@ -241,6 +265,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { fPage.setVisible(visible); } @@ -275,6 +300,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { } } + @Override public IPathEntryContainerPage createPage() throws CoreException { Object elem = CoreUtility.createExtension(fConfigElement, ATT_PAGE_CLASS); if (elem instanceof IPathEntryContainerPage) { @@ -289,10 +315,12 @@ public class CPathContainerDescriptor implements IContainerDescriptor { "Invalid extension (page not of type IClasspathContainerPage): " + id, null)); //$NON-NLS-1$ } + @Override public String getName() { return fConfigElement.getAttribute(ATT_NAME); } + @Override public Image getImage() { if (pageImage == null) { String imageName = fConfigElement.getAttribute(ATT_ICON); @@ -328,6 +356,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { return fConfigElement.getAttribute(ATT_PAGE_CLASS); } + @Override public boolean canEdit(IPathEntry entry) { String id = fConfigElement.getAttribute(ATT_ID); if (entry.getEntryKind() == IPathEntry.CDT_CONTAINER) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java index 2687d72cbc0..850dafee47b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java @@ -140,22 +140,27 @@ public class CPathContainerEntryPage extends CPathBasePage { private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- + @Override public void customButtonPressed(TreeListDialogField field, int index) { containerPageCustomButtonPressed(field, index); } + @Override public void selectionChanged(TreeListDialogField field) { containerPageSelectionChanged(field); } + @Override public void doubleClicked(TreeListDialogField field) { containerPageDoubleClicked(field); } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { containerPageKeyPressed(field, event); } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement)element).getChildren(); @@ -165,6 +170,7 @@ public class CPathContainerEntryPage extends CPathBasePage { return EMPTY_ARR; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementAttribute) { return ((CPElementAttribute)element).getParent(); @@ -174,6 +180,7 @@ public class CPathContainerEntryPage extends CPathBasePage { return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { if (element instanceof CPElementGroup) { return true; @@ -186,6 +193,7 @@ public class CPathContainerEntryPage extends CPathBasePage { // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { containerPageDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java index e8447b298f0..29c2efb01de 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java @@ -95,6 +95,7 @@ public class CPathContainerSelectionPage extends WizardPage { /* (non-Javadoc) * @see IDialogPage#createControl(Composite) */ + @Override public void createControl(Composite parent) { fListViewer= new TableViewer(parent, SWT.SINGLE | SWT.BORDER); fListViewer.setLabelProvider(new CPathContainerLabelProvider()); @@ -102,11 +103,13 @@ public class CPathContainerSelectionPage extends WizardPage { fListViewer.setSorter(new CPathContainerSorter()); fListViewer.setInput(Arrays.asList(fContainers)); fListViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { validatePage(); } }); fListViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doDoubleClick(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java index 32230a36e8a..22ca29a393f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java @@ -63,6 +63,7 @@ public class CPathFilterPage extends WizardPage { validatePage(); } + @Override public void createControl(Composite parent) { Composite container = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); @@ -78,6 +79,7 @@ public class CPathFilterPage extends WizardPage { viewer.setLabelProvider(new CPElementLabelProvider(false, false)); viewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { validatePage(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index 8ec639e44c8..661b8d763d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -117,22 +117,27 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- + @Override public void customButtonPressed(TreeListDialogField field, int index) { ListCustomButtonPressed(field, index); } + @Override public void selectionChanged(TreeListDialogField field) { listPageSelectionChanged(field); } + @Override public void doubleClicked(TreeListDialogField field) { ListPageDoubleClicked(field); } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { ListPageKeyPressed(field, event); } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement)element).getChildren(); @@ -142,6 +147,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage return EMPTY_ARR; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementGroup) { return ((CPElementGroup)element).getParent(); @@ -151,6 +157,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { if (element instanceof CPElementGroup) { return true; @@ -163,6 +170,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { listPageDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java index 6a441c64cba..6f7439e97aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java @@ -164,23 +164,28 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- - public void customButtonPressed(TreeListDialogField field, int index) { + @Override + public void customButtonPressed(TreeListDialogField field, int index) { listCustomButtonPressed(field, index); } - public void selectionChanged(TreeListDialogField field) { + @Override + public void selectionChanged(TreeListDialogField field) { listPageSelectionChanged(field); } - public void doubleClicked(TreeListDialogField field) { + @Override + public void doubleClicked(TreeListDialogField field) { listPageDoubleClicked(field); } - public void keyPressed(TreeListDialogField field, KeyEvent event) { + @Override + public void keyPressed(TreeListDialogField field, KeyEvent event) { listPageKeyPressed(field, event); } - public Object[] getChildren(TreeListDialogField field, Object element) { + @Override + public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement)element).getChildren(); } else if (element instanceof CPElementGroup) { @@ -189,7 +194,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB return EMPTY_ARR; } - public Object getParent(TreeListDialogField field, Object element) { + @Override + public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementGroup) { return ((CPElementGroup)element).getParent(); } else if (element instanceof CPElement) { @@ -198,7 +204,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB return null; } - public boolean hasChildren(TreeListDialogField field, Object element) { + @Override + public boolean hasChildren(TreeListDialogField field, Object element) { if (element instanceof CPElementGroup) { return true; } @@ -210,7 +217,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB // ---------- IDialogFieldListener -------- - public void dialogFieldChanged(DialogField field) { + @Override + public void dialogFieldChanged(DialogField field) { listPageDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java index 3ce9f809c7d..34406cb3673 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java @@ -187,22 +187,27 @@ public class CPathLibraryEntryPage extends CPathBasePage { private final Object[] EMPTY_ARR= new Object[0]; // -------- IListAdapter -------- + @Override public void customButtonPressed(TreeListDialogField field, int index) { libraryPageCustomButtonPressed(field, index); } + @Override public void selectionChanged(TreeListDialogField field) { libraryPageSelectionChanged(field); } + @Override public void doubleClicked(TreeListDialogField field) { libraryPageDoubleClicked(field); } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { libraryPageKeyPressed(field, event); } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement) element).getChildren(); @@ -210,6 +215,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { return EMPTY_ARR; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementAttribute) { return ((CPElementAttribute) element).getParent(); @@ -217,6 +223,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { // return (element instanceof CPElement); return false; @@ -224,6 +231,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java index 8ec565c4794..3f08217403e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java @@ -160,22 +160,27 @@ public class CPathOutputEntryPage extends CPathBasePage { private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- + @Override public void customButtonPressed(TreeListDialogField field, int index) { outputPageCustomButtonPressed(field, index); } + @Override public void selectionChanged(TreeListDialogField field) { outputPageSelectionChanged(field); } + @Override public void doubleClicked(TreeListDialogField field) { outputPageDoubleClicked(field); } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { outputPageKeyPressed(field, event); } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement)element).getChildren(); @@ -183,6 +188,7 @@ public class CPathOutputEntryPage extends CPathBasePage { return EMPTY_ARR; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementAttribute) { return ((CPElementAttribute)element).getParent(); @@ -190,11 +196,13 @@ public class CPathOutputEntryPage extends CPathBasePage { return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { return (element instanceof CPElement); } // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { outputPageDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java index f6ea7aa3199..57441df8352 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java @@ -118,6 +118,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { if (fCurrCProject != null) { // already initialized diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java index f04683a6c6f..0c5cf9243b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java @@ -177,6 +177,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList Shell shell = getControl().getShell(); IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { fCPathsBlock.configureCProject(monitor); @@ -206,6 +207,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList * * @see IStatusChangeListener#statusChanged */ + @Override public void statusChanged(IStatus status) { setValid(!status.matches(IStatus.ERROR)); StatusUtil.applyToStatusLine(this, status); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java index 393d225fb38..8f0e19aece5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java @@ -158,22 +158,27 @@ public class CPathSourceEntryPage extends CPathBasePage { private final Object[] EMPTY_ARR = new Object[0]; // -------- IListAdapter -------- + @Override public void customButtonPressed(TreeListDialogField field, int index) { sourcePageCustomButtonPressed(field, index); } + @Override public void selectionChanged(TreeListDialogField field) { sourcePageSelectionChanged(field); } + @Override public void doubleClicked(TreeListDialogField field) { sourcePageDoubleClicked(field); } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { sourcePageKeyPressed(field, event); } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element instanceof CPElement) { return ((CPElement)element).getChildren(); @@ -181,6 +186,7 @@ public class CPathSourceEntryPage extends CPathBasePage { return EMPTY_ARR; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof CPElementAttribute) { return ((CPElementAttribute)element).getParent(); @@ -188,11 +194,13 @@ public class CPathSourceEntryPage extends CPathBasePage { return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { return (element instanceof CPElement); } // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { sourcePageDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java index 6ae5b7f470c..e8631ac6d32 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java @@ -48,6 +48,7 @@ public class CPathTabBlock extends AbstractPathOptionBlock { private class BuildPathAdapter implements IDialogFieldListener { // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { buildPathDialogFieldChanged(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java index 1016c622ad0..bb7d550cebe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java @@ -200,18 +200,22 @@ public class ExclusionPatternDialog extends StatusDialog { // -------- ExclusionPatternAdapter -------- private class ExclusionPatternAdapter implements IListAdapter, IDialogFieldListener { + @Override public void customButtonPressed(ListDialogField field, int index) { doCustomButtonPressed(field, index); } + @Override public void selectionChanged(ListDialogField field) { doSelectionChanged(field); } + @Override public void doubleClicked(ListDialogField field) { doDoubleClicked(field); } + @Override public void dialogFieldChanged(DialogField field) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java index e480033ee21..401bfc2c227 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java @@ -137,10 +137,12 @@ public class ExclusionPatternEntryDialog extends StatusDialog { // -------- IDialogFieldListener + @Override public void dialogFieldChanged(DialogField field) { doStatusLineUpdate(); } + @Override public void changeControlPressed(DialogField field) { doChangeControlPressed(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java index e7c4a3373f3..0a9805248c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java @@ -102,6 +102,7 @@ public class FolderSelectionDialog extends ElementTreeSelectionDialog implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { updateNewFolderButtonState(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java index 2cfe842d2e9..edfc05f8b18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java @@ -202,6 +202,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus Shell shell = getControl().getShell(); IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { fIncludesSymbolsBlock.configureCProject(monitor); @@ -231,6 +232,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus * * @see IStatusChangeListener#statusChanged */ + @Override public void statusChanged(IStatus status) { setValid(!status.matches(IStatus.ERROR)); StatusUtil.applyToStatusLine(this, status); @@ -254,12 +256,14 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus * * @see org.eclipse.cdt.core.resources.IPathEntryStoreListener#pathEntryStoreChanged(org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent) */ + @Override public void pathEntryStoreChanged(PathEntryStoreChangedEvent event) { if (event.hasContentChanged()) { Control control = getControl(); if (control != null && !control.isDisposed()) { control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { Control control = getControl(); if (control != null && !control.isDisposed()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java index 62c7ffe7b8c..3a19200d740 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java @@ -159,6 +159,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme BusyIndicator.showWhile(null, new Runnable() { + @Override public void run() { access$superCreate(); @@ -191,6 +192,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme fViewer.setLabelProvider(fLabelProvider); fViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { updateOKStatus(); } @@ -264,6 +266,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme } treeViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { forceExistingChecked(event); } @@ -312,6 +315,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme * * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { updateNewFolderButtonState(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java index 916241ce8c2..cbda14c4ffb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java @@ -111,6 +111,7 @@ public class NewIncludesSymbolsTabBlock extends AbstractPathOptionBlock implemen * * @see org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener#statusChanged(org.eclipse.core.runtime.IStatus) */ + @Override public void statusChanged(IStatus status) { switch (status.getSeverity()) { case IStatus.ERROR : diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java index ecb208e0f63..c56d9acb4d7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java @@ -134,6 +134,7 @@ public class NewSourceFolderDialog extends StatusDialog { // -------- IDialogFieldListener + @Override public void dialogFieldChanged(DialogField field) { doStatusLineUpdate(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java index e15bb7e7ab9..195cdf4b940 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java @@ -29,19 +29,23 @@ public class ProjectContainerDescriptor implements IContainerDescriptor { fFilterType = filterType; } + @Override public IPathEntryContainerPage createPage() throws CoreException { return new ProjectContainerPage(fFilterType); } + @Override public String getName() { return CPathEntryMessages.ProjectContainer_label; } + @Override public Image getImage() { return CUIPlugin.getDefault().getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT); } + @Override public boolean canEdit(IPathEntry entry) { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java index f8e4a656ef3..7c63eb97f26 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java @@ -61,14 +61,17 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai validatePage(); } + @Override public void initialize(ICProject project, IPathEntry[] currentEntries) { fCProject = project; } + @Override public boolean finish() { return true; } + @Override public IContainerEntry[] getNewContainers() { return new IContainerEntry[0]; } @@ -93,9 +96,11 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai } } + @Override public void setSelection(IContainerEntry containerEntry) { } + @Override public void createControl(Composite parent) { // create a composite with standard margins and spacing Composite container = new Composite(parent, SWT.NONE); @@ -113,6 +118,7 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai viewer.setLabelProvider(new WorkbenchLabelProvider()); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { validatePage(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java index 3c6ffd7274a..dfe1781376b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java @@ -219,11 +219,13 @@ public class SourceAttachmentBlock { private class SourceAttachmentAdapter implements IStringButtonAdapter, IDialogFieldListener { // -------- IStringButtonAdapter -------- + @Override public void changeControlPressed(DialogField field) { attachmentChangeControlPressed(field); } // ---------- IDialogFieldListener -------- + @Override public void dialogFieldChanged(DialogField field) { attachmentDialogFieldChanged(field); } @@ -421,6 +423,7 @@ public class SourceAttachmentBlock { public IRunnableWithProgress getRunnable(final Shell shell) { return new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException { try { attachSource(shell, monitor); @@ -472,6 +475,7 @@ public class SourceAttachmentBlock { final boolean[] result = new boolean[1]; shell.getDisplay().syncExec(new Runnable() { + @Override public void run() { String title = CPathEntryMessages.SourceAttachmentBlock_putoncpdialog_title; String message = CPathEntryMessages.SourceAttachmentBlock_putoncpdialog_message; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java index b6045767dcf..504fc0cf16a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java @@ -63,6 +63,7 @@ public class SourceAttachmentDialog extends StatusDialog { fApplyChanges= applyChanges; IStatusChangeListener listener= new IStatusChangeListener() { + @Override public void statusChanged(IStatus status) { updateStatus(status); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java index 15841b15ada..8c45f00b425 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java @@ -33,6 +33,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme /** * @see TransferDragSourceListener#getTransfer */ + @Override public Transfer getTransfer() { return LocalSelectionTransfer.getTransfer(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDropAdapter.java index 858e1c62bae..063b06854a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDropAdapter.java @@ -108,6 +108,7 @@ public class CDTViewerDropAdapter implements DropTargetListener { * . * @see DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void drop(DropTargetEvent event) { drop(fTarget, event); } @@ -141,15 +142,18 @@ public class CDTViewerDropAdapter implements DropTargetListener { public void validateDrop(Object target, DropTargetEvent event, int operation) { } + @Override public void dragEnter(DropTargetEvent event) { dragOperationChanged(event); } + @Override public void dragLeave(DropTargetEvent event) { fTarget= null; fLocation= LOCATION_NONE; } + @Override public void dragOperationChanged(DropTargetEvent event) { fRequestedOperation= event.detail; fTarget= computeTarget(event); @@ -159,6 +163,7 @@ public class CDTViewerDropAdapter implements DropTargetListener { computeFeedback(event); } + @Override public void dragOver(DropTargetEvent event) { Object oldTarget= fTarget; fTarget= computeTarget(event); @@ -175,6 +180,7 @@ public class CDTViewerDropAdapter implements DropTargetListener { computeFeedback(event); } + @Override public void dropAccept(DropTargetEvent event) { fTarget= computeTarget(event); validateDrop(event); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java index 1adb529ba0e..22c009c68e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java @@ -43,6 +43,7 @@ public class DelegatingDragAdapter implements DragSourceListener { /* non Java-doc * @see DragSourceListener */ + @Override public void dragStart(DragSourceEvent event) { fFinishListener= null; boolean saveDoit= event.doit; @@ -70,6 +71,7 @@ public class DelegatingDragAdapter implements DragSourceListener { /* non Java-doc * @see DragSourceListener */ + @Override public void dragSetData(DragSourceEvent event) { fFinishListener= getListener(event.dataType); if (fFinishListener != null) { @@ -80,6 +82,7 @@ public class DelegatingDragAdapter implements DragSourceListener { /* non Java-doc * @see DragSourceListener */ + @Override public void dragFinished(DragSourceEvent event) { try{ if (fFinishListener != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java index c2134bff9d3..646d3013a39 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDropAdapter.java @@ -46,6 +46,7 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#dragEnter(DropTargetEvent) */ + @Override public void dragEnter(DropTargetEvent event) { fOriginalDropType= event.detail; updateCurrentListener(event); @@ -58,6 +59,7 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#dragLeave(DropTargetEvent) */ + @Override public void dragLeave(final DropTargetEvent event) { setCurrentListener(null, event); } @@ -70,6 +72,7 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#dragOperationChanged(DropTargetEvent) */ + @Override public void dragOperationChanged(final DropTargetEvent event) { fOriginalDropType= event.detail; TransferDropTargetListener oldListener= getCurrentListener(); @@ -80,6 +83,7 @@ public class DelegatingDropAdapter implements DropTargetListener { // followed by a dragOperationChanged with the exact same event. if (newListener != null && newListener == oldListener) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { newListener.dragOperationChanged(event); } @@ -96,6 +100,7 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#dragOver(DropTargetEvent) */ + @Override public void dragOver(final DropTargetEvent event) { TransferDropTargetListener oldListener= getCurrentListener(); updateCurrentListener(event); @@ -106,6 +111,7 @@ public class DelegatingDropAdapter implements DropTargetListener { // followed by a dragOver with the exact same event. if (newListener != null && newListener == oldListener) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { newListener.dragOver(event); } @@ -120,10 +126,12 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#drop(DropTargetEvent) */ + @Override public void drop(final DropTargetEvent event) { updateCurrentListener(event); if (getCurrentListener() != null) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { getCurrentListener().drop(event); } @@ -138,9 +146,11 @@ public class DelegatingDropAdapter implements DropTargetListener { * @param event the drop target event * @see DropTargetListener#dropAccept(DropTargetEvent) */ + @Override public void dropAccept(final DropTargetEvent event) { if (getCurrentListener() != null) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { getCurrentListener().dropAccept(event); } @@ -204,6 +214,7 @@ public class DelegatingDropAdapter implements DropTargetListener { return false; if (fCurrentListener != null) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { fCurrentListener.dragLeave(event); } @@ -212,6 +223,7 @@ public class DelegatingDropAdapter implements DropTargetListener { fCurrentListener= listener; if (fCurrentListener != null) { SafeRunner.run(new SafeRunnable() { + @Override public void run() throws Exception { fCurrentListener.dragEnter(event); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java index 74bd99cb855..c166352c5e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java @@ -55,18 +55,22 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { Assert.isNotNull(provider); } + @Override public Transfer getTransfer() { return FileTransfer.getInstance(); } + @Override public void dragStart(DragSourceEvent event) { event.doit = !getResources().isEmpty(); } + @Override public void dragSetData(DragSourceEvent event) { event.data = getResourceLocations(getResources()); } + @Override public void dragFinished(DragSourceEvent event) { if (event.doit) { if (event.detail == DND.DROP_MOVE) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java index c897b2f7a8c..a79fa67ce57 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java @@ -36,10 +36,12 @@ public class FileTransferDropAdapter extends CDTViewerDropAdapter implements Tra //---- TransferDropTargetListener interface --------------------------------------- + @Override public Transfer getTransfer() { return FileTransfer.getInstance(); } + @Override public boolean isEnabled(DropTargetEvent event) { Object target= event.item != null ? event.item.getData() : null; if (target == null) { @@ -88,6 +90,7 @@ public class FileTransferDropAdapter extends CDTViewerDropAdapter implements Tra // Otherwise the drag source (e.g., Windows Explorer) will be blocked // while the operation executes. Fixes bug 35796. Display.getCurrent().asyncExec(new Runnable() { + @Override public void run() { getShell().forceActive(); new CopyFilesAndFoldersOperation(getShell()).copyFiles((String[]) data, target); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java index dd607c8a6a7..689a97f183b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/PluginTransferDropAdapter.java @@ -38,6 +38,7 @@ public class PluginTransferDropAdapter extends PluginDropAdapter implements /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener#getTransfer() */ + @Override public Transfer getTransfer() { return PluginTransfer.getInstance(); } @@ -46,6 +47,7 @@ public class PluginTransferDropAdapter extends PluginDropAdapter implements /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener#isEnabled(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public boolean isEnabled(DropTargetEvent event) { Object target= event.item != null ? event.item.getData() : null; if (target == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java index 8ff933aa8dd..ce129bfb5c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java @@ -53,19 +53,23 @@ public class ResourceTransferDragAdapter implements TransferDragSourceListener { Assert.isNotNull(provider); } + @Override public Transfer getTransfer() { return ResourceTransfer.getInstance(); } + @Override public void dragStart(DragSourceEvent event) { IResource[] resources = getSelectedResources(); event.doit = resources.length > 0; } + @Override public void dragSetData(DragSourceEvent event) { event.data = getSelectedResources(); } + @Override public void dragFinished(DragSourceEvent event) { if (event.doit && event.detail == DND.DROP_MOVE) { IResource[] resources = getSelectedResources(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java index 0ffa8aed7e3..c8c9025187a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java @@ -48,6 +48,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.drag.TransferDropTargetListener#getTransfer() */ + @Override public Transfer getTransfer() { return ResourceTransfer.getInstance(); } @@ -55,6 +56,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.drag.TransferDropTargetListener#isEnabled(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public boolean isEnabled(DropTargetEvent event) { Object target= event.item != null ? event.item.getData() : null; if (target == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java index a55f05a5e25..209e91e9fc4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java @@ -107,6 +107,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partActivated(IWorkbenchPartReference ref) { if (isCEditor(ref) && !isActiveEditor(ref)) activeEditorChanged(ref.getPart(true)); @@ -115,6 +116,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partBroughtToTop(IWorkbenchPartReference ref) { if (isCEditor(ref) && !isActiveEditor(ref)) activeEditorChanged(ref.getPart(true)); @@ -123,6 +125,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partClosed(IWorkbenchPartReference ref) { if (isActiveEditor(ref)) { activeEditorChanged(null); @@ -132,12 +135,14 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partDeactivated(IWorkbenchPartReference ref) { } /* * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partOpened(IWorkbenchPartReference ref) { if (isCEditor(ref) && !isActiveEditor(ref)) activeEditorChanged(ref.getPart(true)); @@ -146,12 +151,14 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partHidden(IWorkbenchPartReference ref) { } /* * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partVisible(IWorkbenchPartReference ref) { if (isCEditor(ref) && !isActiveEditor(ref)) activeEditorChanged(ref.getPart(true)); @@ -160,6 +167,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) */ + @Override public void partInputChanged(IWorkbenchPartReference ref) { if (isCEditor(ref) && isActiveEditor(ref)) activeEditorChanged(ref.getPart(true)); @@ -168,6 +176,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowActivated(IWorkbenchWindow window) { IWorkbenchPartReference ref= window.getPartService().getActivePartReference(); if (isCEditor(ref) && !isActiveEditor(ref)) @@ -177,12 +186,14 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowDeactivated(IWorkbenchWindow window) { } /* * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowClosed(IWorkbenchWindow window) { if (fActiveEditor != null && fActiveEditor.getSite() != null && window == fActiveEditor.getSite().getWorkbenchWindow()) { activeEditorChanged(null); @@ -193,6 +204,7 @@ public final class ASTProvider { /* * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) */ + @Override public void windowOpened(IWorkbenchWindow window) { window.getPartService().addPartListener(this); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java index 4c770397267..15ba197aa8f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java @@ -281,6 +281,7 @@ public class AddIncludeOnSelectionAction extends TextEditorAction { throw new RuntimeException("ambiguous input"); //$NON-NLS-1$ } runInUIThread(new Runnable() { + @Override public void run() { ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new LabelProvider()); @@ -481,12 +482,15 @@ public class AddIncludeOnSelectionAction extends TextEditorAction { private IFunctionSummary findContribution(final String name) { final IFunctionSummary[] fs = new IFunctionSummary[1]; IRunnableWithProgress op = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { ICHelpInvocationContext context = new ICHelpInvocationContext() { + @Override public IProject getProject() { return fProject; } + @Override public ITranslationUnit getTranslationUnit() { return fTu; } @@ -701,6 +705,7 @@ public class AddIncludeOnSelectionAction extends TextEditorAction { /* (non-Javadoc) * @see org.eclipse.cdt.ui.IRequiredInclude#getIncludeName() */ + @Override public String getIncludeName() { return includeName; } @@ -708,6 +713,7 @@ public class AddIncludeOnSelectionAction extends TextEditorAction { /* (non-Javadoc) * @see org.eclipse.cdt.ui.IRequiredInclude#isStandard() */ + @Override public boolean isStandard() { return isSystem; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CAnnotationIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CAnnotationIterator.java index c69ed6e9c46..213e75c8039 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CAnnotationIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CAnnotationIterator.java @@ -65,6 +65,7 @@ public class CAnnotationIterator implements Iterator { /* * @see Iterator#hasNext() */ + @Override public boolean hasNext() { return fNext != null; } @@ -72,6 +73,7 @@ public class CAnnotationIterator implements Iterator { /* * @see Iterator#next() */ + @Override public Annotation next() { try { return fNext; @@ -83,6 +85,7 @@ public class CAnnotationIterator implements Iterator { /* * @see Iterator#remove() */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java index 0d2bf364780..35c15e5bfb5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java @@ -86,6 +86,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { public void contentUpdated() { if (treeViewer != null && !treeViewer.getControl().isDisposed()) { treeViewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!treeViewer.getControl().isDisposed()) { if (fInitialDeltaPending) { @@ -245,6 +246,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /** * @see org.eclipse.cdt.core.model.IElementChangedListener#elementChanged(org.eclipse.cdt.core.model.ElementChangedEvent) */ + @Override public void elementChanged(final ElementChangedEvent e) { if (e.getType() == ElementChangedEvent.POST_SHIFT && e.getDelta() instanceof CShiftData) { contentShift((CShiftData)(e.getDelta())); @@ -334,6 +336,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /** * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String prop = event.getProperty(); if (prop.equals(PreferenceConstants.OUTLINE_GROUP_INCLUDES)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index ecb595cba81..a25c7c1fe6a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -130,6 +130,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#getArguments() */ + @Override public String[] getArguments() { return fArguments; } @@ -137,6 +138,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#getId() */ + @Override public int getId() { return fId; } @@ -144,6 +146,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#isProblem() */ + @Override public boolean isProblem() { return fIsProblem; } @@ -151,6 +154,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#hasOverlay() */ + @Override public boolean hasOverlay() { return false; } @@ -158,6 +162,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#getOverlay() */ + @Override public ICAnnotation getOverlay() { return null; } @@ -165,6 +170,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#addOverlaid(ICAnnotation) */ + @Override public void addOverlaid(ICAnnotation annotation) { if (fOverlaids == null) fOverlaids= new ArrayList(1); @@ -174,6 +180,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#removeOverlaid(ICAnnotation) */ + @Override public void removeOverlaid(ICAnnotation annotation) { if (fOverlaids != null) { fOverlaids.remove(annotation); @@ -185,6 +192,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see ICAnnotation#getOverlaidIterator() */ + @Override public Iterator getOverlaidIterator() { if (fOverlaids != null) return fOverlaids.iterator(); @@ -194,6 +202,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.cdt.internal.ui.editor.ICAnnotation#getTranslationUnit() */ + @Override public ITranslationUnit getTranslationUnit() { return fTranslationUnit; } @@ -201,6 +210,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipsecjdt.internal.ui.editor.ICAnnotation#getMarkerType() */ + @Override public String getMarkerType() { return fMarkerType; } @@ -301,6 +311,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.texteditor.IMarkerUpdater#getAttribute() */ + @Override public String[] getAttribute() { return null; } @@ -308,6 +319,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.texteditor.IMarkerUpdater#getMarkerType() */ + @Override public String getMarkerType() { return ICModelMarker.C_MODEL_PROBLEM_MARKER; } @@ -315,6 +327,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.texteditor.IMarkerUpdater#updateMarker(org.eclipse.core.resources.IMarker, org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position) */ + @Override public boolean updateMarker(IMarker marker, IDocument document, Position position) { if (position == null) { return true; @@ -430,6 +443,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestor#beginReporting() */ + @Override public void beginReporting() { ProblemRequestorState state= fProblemRequestorState.get(); if (state == null) @@ -439,6 +453,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.cdt.internal.ui.text.java.IProblemRequestorExtension#beginReportingSequence() */ + @Override public void beginReportingSequence() { ProblemRequestorState state= fProblemRequestorState.get(); if (state == null) @@ -466,6 +481,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestor#acceptProblem(IProblem) */ + @Override public void acceptProblem(IProblem problem) { if (isActive()) { ProblemRequestorState state= fProblemRequestorState.get(); @@ -477,6 +493,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestor#endReporting() */ + @Override public void endReporting() { ProblemRequestorState state= fProblemRequestorState.get(); if (state != null && !state.fInsideReportingSequence) @@ -486,6 +503,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.cdt.internal.ui.text.java.IProblemRequestorExtension#endReportingSequence() */ + @Override public void endReportingSequence() { ProblemRequestorState state= fProblemRequestorState.get(); if (state != null && state.fInsideReportingSequence) @@ -618,6 +636,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestor#isActive() */ + @Override public boolean isActive() { return fIsActive; } @@ -625,6 +644,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestorExtension#setProgressMonitor(IProgressMonitor) */ + @Override public void setProgressMonitor(IProgressMonitor monitor) { fProgressMonitor= monitor; } @@ -632,6 +652,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see IProblemRequestorExtension#setIsActive(boolean) */ + @Override public void setIsActive(boolean isActive) { if (fIsActive != isActive) { fIsActive= isActive; @@ -717,6 +738,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /** * @see IAnnotationModelListener#modelChanged(IAnnotationModel) */ + @Override public void modelChanged(IAnnotationModel model) { Object[] listeners= fListenerList.getListeners(); for (Object listener : listeners) { @@ -727,6 +749,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /** * @see IAnnotationModelListenerExtension#modelChanged(AnnotationModelEvent) */ + @Override public void modelChanged(AnnotationModelEvent event) { Object[] listeners= fListenerList.getListeners(); for (Object curr : listeners) { @@ -763,6 +786,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { setParentDocumentProvider(parentProvider); fGlobalAnnotationModelListener= new GlobalAnnotationModelListener(); fPropertyListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { if (HANDLE_TEMPORARY_PROBLEMS.equals(event.getProperty())) enableHandlingTemporaryProblems(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java index 82fcef92404..db56d21dcd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentSetupParticipant.java @@ -36,6 +36,7 @@ public class CDocumentSetupParticipant implements IDocumentSetupParticipant, IDo /* * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument) */ + @Override public void setup(IDocument document) { setup(document, null, null); } @@ -43,6 +44,7 @@ public class CDocumentSetupParticipant implements IDocumentSetupParticipant, IDo /* * @see org.eclipse.core.filebuffers.IDocumentSetupParticipantExtension#setup(org.eclipse.jface.text.IDocument, org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind) */ + @Override public void setup(IDocument document, IPath location, LocationKind locationKind) { CTextTools tools= CUIPlugin.getDefault().getTextTools(); tools.setupCDocument(document, location, locationKind); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java index 7c8e6dd6149..790df00a934 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java @@ -71,6 +71,7 @@ public class CEditorErrorTickUpdater implements IProblemChangedListener { /* (non-Javadoc) * @see IProblemChangedListener#problemsChanged(IResource[], boolean) */ + @Override public void problemsChanged(IResource[] resourcesChanged, boolean isMarkerChange) { if (!isMarkerChange) { return; @@ -108,6 +109,7 @@ public class CEditorErrorTickUpdater implements IProblemChangedListener { Shell shell= fCEditor.getEditorSite().getShell(); if (shell != null && !shell.isDisposed()) { shell.getDisplay().syncExec(new Runnable() { + @Override public void run() { fCEditor.updatedTitleImage(newImage); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlink.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlink.java index 99f17155054..f5aab842bd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlink.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlink.java @@ -39,18 +39,22 @@ public class CElementHyperlink implements IHyperlink { fOpenAction= openAction; } + @Override public IRegion getHyperlinkRegion() { return fRegion; } + @Override public void open() { fOpenAction.run(); } + @Override public String getTypeLabel() { return null; } + @Override public String getHyperlinkText() { return Action.removeMnemonics(fOpenAction.getText()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java index fe353422d33..9e9bfad9d37 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java @@ -51,6 +51,7 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector { public CElementHyperlinkDetector() { } + @Override public IHyperlink[] detectHyperlinks(final ITextViewer textViewer, final IRegion region, boolean canShowMultipleHyperlinks) { ITextEditor textEditor= (ITextEditor) getAdapter(ITextEditor.class); if (region == null || !(textEditor instanceof CEditor)) @@ -70,6 +71,7 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector { // Do not wait for AST if it's not available yet. Waiting for AST would block the UI thread // for the duration of the parsing. IStatus status= ASTProvider.getASTProvider().runOnAST(workingCopy, ASTProvider.WAIT_NO, null, new ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { if (ast == null) return Status.CANCEL_STATUS; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java index 76b42622c17..362208b2334 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java @@ -44,6 +44,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#getMessage() */ + @Override public String getMessage() { if (fIsProblemMarker) return getMarker().getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$ @@ -53,6 +54,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#isError() */ + @Override public boolean isError() { if (fIsProblemMarker) { int markerSeverity= getMarker().getAttribute(IMarker.SEVERITY, -1); @@ -64,6 +66,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#isWarning() */ + @Override public boolean isWarning() { if (fIsProblemMarker) { int markerSeverity= getMarker().getAttribute(IMarker.SEVERITY, -1); @@ -75,6 +78,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#isTemporaryProblem() */ + @Override public boolean isTemporaryProblem() { return false; } @@ -82,6 +86,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#getArguments() */ + @Override public String[] getArguments() { String [] s = {"problem", "here"}; //$NON-NLS-1$ //$NON-NLS-2$ //if (fIsProblemMarker) @@ -93,6 +98,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /** * @see IProblemAnnotation#getId() */ + @Override public int getId() { if (fIsProblemMarker) return getMarker().getAttribute(ICModelMarker.C_MODEL_PROBLEM_MARKER, -1); @@ -102,6 +108,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see org.eclipse.cdt.internal.ui.editor.IProblemAnnotation#isProblem() */ + @Override public boolean isProblem() { return fIsProblemMarker; } @@ -126,6 +133,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see ICAnnotation#hasOverlay() */ + @Override public boolean hasOverlay() { return fOverlay != null; } @@ -133,6 +141,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see org.eclipse.cdt.internal.ui.editor.ICAnnotation#getOverlay() */ + @Override public ICAnnotation getOverlay() { return fOverlay; } @@ -140,6 +149,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see ICAnnotation#addOverlaid(ICAnnotation) */ + @Override public void addOverlaid(ICAnnotation annotation) { // not supported } @@ -147,6 +157,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see ICAnnotation#removeOverlaid(ICAnnotation) */ + @Override public void removeOverlaid(ICAnnotation annotation) { // not supported } @@ -154,6 +165,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* * @see ICAnnotation#getOverlaidIterator() */ + @Override public Iterator getOverlaidIterator() { // not supported return null; @@ -162,6 +174,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot /* (non-Javadoc) * @see org.eclipse.jdt.internal.ui.javaeditor.IJavaAnnotation#getCompilationUnit() */ + @Override public ITranslationUnit getTranslationUnit() { ICElement element= CoreModel.getDefault().create(getMarker().getResource()); if (element instanceof ITranslationUnit) { @@ -170,6 +183,7 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot return null; } + @Override public String getMarkerType() { IMarker marker= getMarker(); if (marker == null || !marker.exists()) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java index 4997c8d5e86..022816a5f6c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java @@ -318,6 +318,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { String property= event.getProperty(); if (AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND.equals(property) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java index c59d2834e2f..aef2e994477 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CustomBufferFactory.java @@ -39,6 +39,7 @@ public class CustomBufferFactory implements IBufferFactory { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.IBufferFactory#createBuffer(org.eclipse.cdt.core.model.IOpenable) */ + @Override public IBuffer createBuffer(IOpenable owner) { if (owner instanceof IWorkingCopy) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java index f5f95a94238..8631997337d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java @@ -69,6 +69,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IEditorInput#exists() */ + @Override public boolean exists() { return fBinary.exists(); } @@ -76,6 +77,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IEditorInput#getImageDescriptor() */ + @Override public ImageDescriptor getImageDescriptor() { IFile file= (IFile)fBinary.getResource(); IContentType contentType= IDE.getContentType(file); @@ -86,6 +88,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IEditorInput#getName() */ + @Override public String getName() { return fBinary.getElementName(); } @@ -93,6 +96,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IEditorInput#getPersistable() */ + @Override public IPersistableElement getPersistable() { return null; } @@ -100,6 +104,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IEditorInput#getToolTipText() */ + @Override public String getToolTipText() { return fBinary.getResource().getFullPath().toString(); } @@ -107,6 +112,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.IStorageEditorInput#getStorage() */ + @Override public IStorage getStorage() throws CoreException { if (fStorage == null) { IBinaryParser.IBinaryObject object= (IBinaryParser.IBinaryObject)fBinary.getAdapter(IBinaryParser.IBinaryObject.class); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java index b1adf311104..cc499e0a64b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java @@ -66,64 +66,84 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { */ static private class NullBuffer implements IBuffer { + @Override public void addBufferChangedListener(IBufferChangedListener listener) {} + @Override public void append(char[] text) {} + @Override public void append(String text) {} + @Override public void close() {} + @Override public char getChar(int position) { return 0; } + @Override public char[] getCharacters() { return null; } + @Override public String getContents() { return null; } + @Override public int getLength() { return 0; } + @Override public IOpenable getOwner() { return null; } + @Override public String getText(int offset, int length) { return null; } + @Override public IResource getUnderlyingResource() { return null; } + @Override public boolean hasUnsavedChanges() { return false; } + @Override public boolean isClosed() { return false; } + @Override public boolean isReadOnly() { return true; } + @Override public void removeBufferChangedListener(IBufferChangedListener listener) {} + @Override public void replace(int position, int length, char[] text) {} + @Override public void replace(int position, int length, String text) {} + @Override public void save(IProgressMonitor progress, boolean force) throws CModelException {} + @Override public void setContents(char[] contents) {} + @Override public void setContents(String contents) {} } @@ -138,6 +158,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { private String fContents; + @Override public void run() { fDocument.set(fContents); } @@ -157,6 +178,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { private int fLength; private String fText; + @Override public void run() { try { fDocument.replace(fOffset, fLength, fText); @@ -267,6 +289,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /* * @see IBuffer#addBufferChangedListener(IBufferChangedListener) */ + @Override public void addBufferChangedListener(IBufferChangedListener listener) { Assert.isNotNull(listener); if (!fBufferListeners.contains(listener)) @@ -276,6 +299,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /* * @see IBuffer#removeBufferChangedListener(IBufferChangedListener) */ + @Override public void removeBufferChangedListener(IBufferChangedListener listener) { Assert.isNotNull(listener); fBufferListeners.remove(listener); @@ -285,6 +309,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#append(char[]) */ + @Override public void append(char[] text) { append(new String(text)); } @@ -292,6 +317,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#append(java.lang.String) */ + @Override public void append(String text) { if (DEBUG_LINE_DELIMITERS) { validateLineDelimiters(text); @@ -303,6 +329,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#close() */ + @Override public void close() { if (isClosed()) @@ -333,6 +360,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getChar(int) */ + @Override public char getChar(int position) { try { return fDocument.getChar(position); @@ -344,6 +372,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getCharacters() */ + @Override public char[] getCharacters() { String content= getContents(); return content == null ? null : content.toCharArray(); @@ -352,6 +381,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getContents() */ + @Override public String getContents() { return fDocument.get(); } @@ -359,6 +389,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getLength() */ + @Override public int getLength() { return fDocument.getLength(); } @@ -366,6 +397,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getOwner() */ + @Override public IOpenable getOwner() { return fOwner; } @@ -373,6 +405,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getText(int, int) */ + @Override public String getText(int offset, int length) { try { return fDocument.get(offset, length); @@ -384,6 +417,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#getUnderlyingResource() */ + @Override public IResource getUnderlyingResource() { return fFile; } @@ -391,6 +425,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#hasUnsavedChanges() */ + @Override public boolean hasUnsavedChanges() { return fTextFileBuffer != null ? fTextFileBuffer.isDirty() : false; } @@ -398,6 +433,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#isClosed() */ + @Override public boolean isClosed() { return fDocument == null; } @@ -405,6 +441,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#isReadOnly() */ + @Override public boolean isReadOnly() { IResource resource= getUnderlyingResource(); if (resource != null) { @@ -419,6 +456,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#replace(int, int, char[]) */ + @Override public void replace(int position, int length, char[] text) { replace(position, length, new String(text)); } @@ -426,6 +464,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#replace(int, int, java.lang.String) */ + @Override public void replace(int position, int length, String text) { if (DEBUG_LINE_DELIMITERS) { validateLineDelimiters(text); @@ -436,6 +475,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#save(org.eclipse.core.runtime.IProgressMonitor, boolean) */ + @Override public void save(IProgressMonitor progress, boolean force) throws CModelException { try { if (fTextFileBuffer != null) @@ -448,6 +488,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#setContents(char[]) */ + @Override public void setContents(char[] contents) { setContents(new String(contents)); } @@ -455,6 +496,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /** * @see org.eclipse.cdt.core.model.IBuffer#setContents(java.lang.String) */ + @Override public void setContents(String contents) { int oldLength= fDocument.getLength(); @@ -525,6 +567,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /* * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { // there is nothing to do here } @@ -532,6 +575,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { /* * @see IDocumentListener#documentChanged(DocumentEvent) */ + @Override public void documentChanged(DocumentEvent event) { fireBufferChanged(new BufferChangedEvent(this, event.getOffset(), event.getLength(), event.getText())); } @@ -544,6 +588,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener, IAdaptable { } } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(ITextFileBuffer.class)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EclipsePreferencesAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EclipsePreferencesAdapter.java index 3527c58a37b..f1afa44167f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EclipsePreferencesAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EclipsePreferencesAdapter.java @@ -38,9 +38,11 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void preferenceChange(final IEclipsePreferences.PreferenceChangeEvent event) { if (Display.getCurrent() == null) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { firePropertyChangeEvent(event.getKey(), event.getOldValue(), event.getNewValue()); } @@ -79,6 +81,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { if (fListeners.size() == 0) getNode().addPreferenceChangeListener(fListener); @@ -88,6 +91,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { fListeners.remove(listener); if (fListeners.size() == 0) { @@ -98,6 +102,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public boolean contains(String name) { return getNode().get(name, null) != null; } @@ -105,6 +110,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { PropertyChangeEvent event= new PropertyChangeEvent(this, name, oldValue, newValue); Object[] listeners= fListeners.getListeners(); @@ -115,6 +121,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public boolean getBoolean(String name) { return getNode().getBoolean(name, BOOLEAN_DEFAULT_DEFAULT); } @@ -122,6 +129,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public boolean getDefaultBoolean(String name) { return BOOLEAN_DEFAULT_DEFAULT; } @@ -129,6 +137,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public double getDefaultDouble(String name) { return DOUBLE_DEFAULT_DEFAULT; } @@ -136,6 +145,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public float getDefaultFloat(String name) { return FLOAT_DEFAULT_DEFAULT; } @@ -143,6 +153,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public int getDefaultInt(String name) { return INT_DEFAULT_DEFAULT; } @@ -150,6 +161,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public long getDefaultLong(String name) { return LONG_DEFAULT_DEFAULT; } @@ -157,6 +169,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public String getDefaultString(String name) { return STRING_DEFAULT_DEFAULT; } @@ -164,6 +177,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public double getDouble(String name) { return getNode().getDouble(name, DOUBLE_DEFAULT_DEFAULT); } @@ -171,6 +185,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public float getFloat(String name) { return getNode().getFloat(name, FLOAT_DEFAULT_DEFAULT); } @@ -178,6 +193,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public int getInt(String name) { return getNode().getInt(name, INT_DEFAULT_DEFAULT); } @@ -185,6 +201,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public long getLong(String name) { return getNode().getLong(name, LONG_DEFAULT_DEFAULT); } @@ -192,6 +209,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public String getString(String name) { return getNode().get(name, STRING_DEFAULT_DEFAULT); } @@ -199,6 +217,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public boolean isDefault(String name) { return false; } @@ -206,6 +225,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public boolean needsSaving() { try { return getNode().keys().length > 0; @@ -218,6 +238,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void putValue(String name, String value) { throw new UnsupportedOperationException(); } @@ -225,6 +246,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, double value) { throw new UnsupportedOperationException(); } @@ -232,6 +254,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, float value) { throw new UnsupportedOperationException(); } @@ -239,6 +262,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, int value) { throw new UnsupportedOperationException(); } @@ -246,6 +270,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, long value) { throw new UnsupportedOperationException(); } @@ -253,6 +278,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, String defaultObject) { throw new UnsupportedOperationException(); } @@ -260,6 +286,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setDefault(String name, boolean value) { throw new UnsupportedOperationException(); } @@ -267,6 +294,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setToDefault(String name) { throw new UnsupportedOperationException(); } @@ -274,6 +302,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, double value) { throw new UnsupportedOperationException(); } @@ -281,6 +310,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, float value) { throw new UnsupportedOperationException(); } @@ -288,6 +318,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, int value) { throw new UnsupportedOperationException(); } @@ -295,6 +326,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, long value) { throw new UnsupportedOperationException(); } @@ -302,6 +334,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, String value) { throw new UnsupportedOperationException(); } @@ -309,6 +342,7 @@ class EclipsePreferencesAdapter implements IPreferenceStore { /** * {@inheritDoc} */ + @Override public void setValue(String name, boolean value) { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EditorHighlightingSynchronizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EditorHighlightingSynchronizer.java index b4906f41466..b6e9edd3c6a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EditorHighlightingSynchronizer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/EditorHighlightingSynchronizer.java @@ -46,6 +46,7 @@ public class EditorHighlightingSynchronizer implements ILinkedModeListener { /* * @see org.eclipse.jface.text.link.ILinkedModeListener#left(org.eclipse.jface.text.link.LinkedModeModel, int) */ + @Override public void left(LinkedModeModel environment, int flags) { if (fWasOccurrencesOn && !isEditorDisposed()) fEditor.installOccurrencesFinder(true); @@ -58,12 +59,14 @@ public class EditorHighlightingSynchronizer implements ILinkedModeListener { /* * @see org.eclipse.jface.text.link.ILinkedModeListener#suspend(org.eclipse.jface.text.link.LinkedModeModel) */ + @Override public void suspend(LinkedModeModel environment) { } /* * @see org.eclipse.jface.text.link.ILinkedModeListener#resume(org.eclipse.jface.text.link.LinkedModeModel, int) */ + @Override public void resume(LinkedModeModel environment, int flags) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java index 861aa0a9ed4..6620b02a227 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java @@ -108,6 +108,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp if (fTranslationUnit != null) { final ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider(); result= astProvider.runOnAST(fTranslationUnit, ASTProvider.WAIT_IF_OPEN, monitor, new ASTCache.ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { reconciled(ast, true, monitor); return Status.OK_STATUS; @@ -185,18 +186,21 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp /* * @see org.eclipse.cdt.internal.ui.text.ICReconcilingListener#aboutToBeReconciled() */ + @Override public void aboutToBeReconciled() { } /* * @see org.eclipse.cdt.internal.ui.text.ICReconcilingListener#reconciled(IASTTranslationUnit, boolean, IProgressMonitor) */ + @Override public void reconciled(IASTTranslationUnit ast, final boolean force, IProgressMonitor progressMonitor) { if (progressMonitor != null && progressMonitor.isCanceled()) { return; } final List newInactiveCodePositions= collectInactiveCodePositions(ast); Runnable updater = new Runnable() { + @Override public void run() { if (fEditor != null && fLineBackgroundPainter != null && !fLineBackgroundPainter.isDisposed()) { fLineBackgroundPainter.replaceHighlightPositions(fInactiveCodePositions, newInactiveCodePositions); @@ -335,6 +339,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp /* * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { if (fEditor != null && fLineBackgroundPainter != null && !fLineBackgroundPainter.isDisposed()) { fLineBackgroundPainter.removeHighlightPositions(fInactiveCodePositions); @@ -345,6 +350,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp /* * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { fDocument= newInput; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java index 19ac337eea3..db0c8c166d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java @@ -240,6 +240,7 @@ public class OpenIncludeAction extends Action { private void findFile(IContainer parent, final IPath name, final ArrayList list) throws CoreException { parent.accept(new IResourceProxyVisitor() { + @Override public boolean visit(IResourceProxy proxy) throws CoreException { if (proxy.getType() == IResource.FILE && proxy.getName().equalsIgnoreCase(name.lastSegment())) { IPath rPath = proxy.requestResource().getLocation(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java index fd3e434c25a..5a42a7d1023 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorImageProvider.java @@ -31,6 +31,7 @@ public class OverrideIndicatorImageProvider implements /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation) */ + @Override public Image getManagedImage(Annotation annotation) { return null; } @@ -38,6 +39,7 @@ public class OverrideIndicatorImageProvider implements /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation) */ + @Override public String getImageDescriptorId(Annotation annotation) { if (!isImageProviderFor(annotation)) { return null; @@ -57,6 +59,7 @@ public class OverrideIndicatorImageProvider implements /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String) */ + @Override public ImageDescriptor getImageDescriptor(String imageDescritporId) { if (imageDescritporId.equals(OVERRIDE_IMG_DESC_ID)) { return CPluginImages.DESC_OBJS_OVERRIDES; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java index e4a39ea49c0..b183769b80a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverrideIndicatorManager.java @@ -398,9 +398,11 @@ public class OverrideIndicatorManager implements ICReconcilingListener { return null; } + @Override public void aboutToBeReconciled() { } + @Override public void reconciled(IASTTranslationUnit ast, boolean force, IProgressMonitor progressMonitor) { if (ast == null) { return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemAnnotationIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemAnnotationIterator.java index 181c418a87d..ac3d4b16089 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemAnnotationIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemAnnotationIterator.java @@ -43,6 +43,7 @@ public class ProblemAnnotationIterator implements Iterator { /* * @see Iterator#hasNext() */ + @Override public boolean hasNext() { return fNext != null; } @@ -50,6 +51,7 @@ public class ProblemAnnotationIterator implements Iterator { /* * @see Iterator#next() */ + @Override public IProblemAnnotation next() { try { return fNext; @@ -61,6 +63,7 @@ public class ProblemAnnotationIterator implements Iterator { /* * @see Iterator#remove() */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java index 8f196837588..79687057863 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SelectionHistory.java @@ -31,6 +31,7 @@ public class SelectionHistory { fEditor= editor; fHistory= new Stack(); fSelectionListener= new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { if (fSelectionChangeListenerCounter == 0) flush(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java index 6f4a8b563c0..e9f1b5e77dd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java @@ -472,6 +472,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { handlePropertyChangeEvent(event); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java index e65bdb61ba1..e41d7c46981 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingPresenter.java @@ -66,6 +66,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent) */ + @Override public void update(DocumentEvent event) { int eventOffset= event.getOffset(); @@ -343,6 +344,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, return null; Runnable runnable= new Runnable() { + @Override public void run() { updatePresentation(textPresentation, added, removed); } @@ -541,6 +543,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation) */ + @Override public void applyTextPresentation(TextPresentation textPresentation) { IRegion region= textPresentation.getExtent(); int i= computeIndexAtOffset(fPositions, region.getOffset()), n= computeIndexAtOffset(fPositions, region.getOffset() + region.getLength()); @@ -566,6 +569,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) */ + @Override public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { setCanceled(true); releaseDocument(oldInput); @@ -575,6 +579,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument) */ + @Override public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { manageDocument(newInput); } @@ -582,6 +587,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) */ + @Override public void documentAboutToBeChanged(DocumentEvent event) { setCanceled(true); } @@ -589,6 +595,7 @@ public class SemanticHighlightingPresenter implements ITextPresentationListener, /* * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) */ + @Override public void documentChanged(DocumentEvent event) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java index 14c0ff124b3..d71341b1e32 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java @@ -322,6 +322,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener { /* * @see org.eclipse.cdt.internal.ui.text.java.ICReconcilingListener#aboutToBeReconciled() */ + @Override public void aboutToBeReconciled() { // Do nothing } @@ -329,6 +330,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener { /* * @see org.eclipse.cdt.internal.ui.text.ICReconcilingListener#reconciled(IASTTranslationUnit, boolean, IProgressMonitor) */ + @Override public void reconciled(IASTTranslationUnit ast, boolean force, IProgressMonitor progressMonitor) { // ensure at most one thread can be reconciling at any time synchronized (fReconcileLock) { @@ -410,6 +412,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener { fRemovedPositions= newPositions; // positions need to be sorted by ascending offset Collections.sort(fAddedPositions, new Comparator() { + @Override public int compare(final Position p1, final Position p2) { return p1.getOffset() - p2.getOffset(); }}); @@ -523,6 +526,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener { final Job me= this; ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider(); IStatus status= astProvider.runOnAST(element, ASTProvider.WAIT_IF_OPEN, monitor, new ASTCache.ASTRunnable() { + @Override public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) { reconciled(ast, true, monitor); synchronized (fJobLock) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java index 2a1ffd0c651..1bd1bf383ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SortLinesAction.java @@ -260,14 +260,17 @@ public final class SortLinesAction extends TextEditorAction { document.get(collationLine.getOffset(), collationLine.getLength())), tabWidth); } + @Override public int compareTo(SortElement other) { return collator.compare(collationKey, other.collationKey); } + @Override public int getOffset() { return region.getOffset(); } + @Override public int getLength() { return region.getLength(); } @@ -298,6 +301,7 @@ public final class SortLinesAction extends TextEditorAction { /** * Offset of the line in the document. */ + @Override public int getOffset() { return offset; } @@ -305,6 +309,7 @@ public final class SortLinesAction extends TextEditorAction { /** * Length of the line including line delimiter. */ + @Override public int getLength() { return length; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java index 01f2908810f..278f342108c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java @@ -146,7 +146,8 @@ final class SpecificContentAssistAction extends Action implements IUpdate { /* * @see org.eclipse.ui.texteditor.IUpdate#update() */ - public void update() { + @Override + public void update() { setEnabled(computeEnablement(fEditor)); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java index 545c86eb512..f90ebb3a64c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java @@ -101,6 +101,7 @@ public final class ToggleCommentAction extends TextEditorAction { display= shell.getDisplay(); BusyIndicator.showWhile(display, new Runnable() { + @Override public void run() { fOperationTarget.doOperation(operationCode); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java index 575f5a39ec3..a45d15ce99b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java @@ -95,6 +95,7 @@ public class ToggleMarkOccurrencesAction extends TextEditorAction implements IPr /* * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(PreferenceConstants.EDITOR_MARK_OCCURRENCES)) setChecked(Boolean.valueOf(event.getNewValue().toString()).booleanValue()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java index 2c78a5ac14b..0daba51227b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java @@ -130,6 +130,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope /* * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(PreferenceConstants.EDITOR_SHOW_SEGMENTS)) synchronizeWithPreference(getTextEditor()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java index 02623ac8e1f..95d6236c1dd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/WorkingCopyManager.java @@ -55,6 +55,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.ui.IWorkingCopyManager#connect(org.eclipse.ui.IEditorInput) */ + @Override public void connect(IEditorInput input) throws CoreException { fDocumentProvider.connect(input); } @@ -62,6 +63,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.ui.IWorkingCopyManager#disconnect(org.eclipse.ui.IEditorInput) */ + @Override public void disconnect(IEditorInput input) { fDocumentProvider.disconnect(input); } @@ -69,6 +71,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.ui.IWorkingCopyManager#shutdown() */ + @Override public void shutdown() { if (!fIsShuttingDown) { fIsShuttingDown= true; @@ -87,6 +90,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.ui.IWorkingCopyManager#getWorkingCopy(org.eclipse.ui.IEditorInput) */ + @Override public IWorkingCopy getWorkingCopy(IEditorInput input) { IWorkingCopy unit= fMap == null ? null : fMap.get(input); return unit != null ? unit : fDocumentProvider.getWorkingCopy(input); @@ -95,6 +99,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.internal.ui.editor.IWorkingCopyManagerExtension#setWorkingCopy(org.eclipse.ui.IEditorInput, org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override public void setWorkingCopy(IEditorInput input, IWorkingCopy workingCopy) { if (fDocumentProvider.getDocument(input) != null) { if (fMap == null) @@ -106,6 +111,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana /* * @see org.eclipse.cdt.internal.ui.editor.IWorkingCopyManagerExtension#removeWorkingCopy(org.eclipse.ui.IEditorInput) */ + @Override public void removeWorkingCopy(IEditorInput input) { fMap.remove(input); if (fMap.isEmpty()) @@ -122,14 +128,17 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana return fBufferFactory; } + @Override public IWorkingCopy findSharedWorkingCopy(ITranslationUnit tu) { return CModelManager.getDefault().findSharedWorkingCopy(getBufferFactory(), tu); } + @Override public IWorkingCopy[] getSharedWorkingCopies() { return CModelManager.getDefault().getSharedWorkingCopies(getBufferFactory()); } + @Override public IWorkingCopy getSharedWorkingCopy(ITranslationUnit original, IProblemRequestor requestor, IProgressMonitor progressMonitor) throws CModelException { return CModelManager.getDefault().getSharedWorkingCopy(getBufferFactory(), original, requestor, progressMonitor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java index 06224924bb5..f0c22c363a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmDocumentSetupParticipant.java @@ -34,6 +34,7 @@ public class AsmDocumentSetupParticipant implements IDocumentSetupParticipant, I /* * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument) */ + @Override public void setup(IDocument document) { IDocumentPartitioner partitioner= CDTUITools.createAsmDocumentPartitioner(); if (document instanceof IDocumentExtension3) { @@ -48,6 +49,7 @@ public class AsmDocumentSetupParticipant implements IDocumentSetupParticipant, I /* * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) */ + @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { // prepared for partitioner configuration } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmLabelRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmLabelRule.java index 8881b86c14b..0dc6790ffa4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmLabelRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmLabelRule.java @@ -48,6 +48,7 @@ final class AsmLabelRule implements IRule { /* * @see IRule#evaluate */ + @Override public IToken evaluate(ICharacterScanner scanner) { int c= scanner.read(); if (fDetector.isWordStart((char) c)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java index 574799e17bc..7c0d97307ae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmReconcilingStrategy.java @@ -44,6 +44,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin /* * @see IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion) */ + @Override public void reconcile(IRegion partition) { reconcile(false); } @@ -51,6 +52,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin /* * @see IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion) */ + @Override public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { // unused - non-incremental reconciler } @@ -58,6 +60,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin /* * @see IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument) */ + @Override public void setDocument(IDocument document) { // no-op } @@ -65,6 +68,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin /* * @see IReconcilingStrategyExtension#setProgressMonitor(IProgressMonitor) */ + @Override public void setProgressMonitor(IProgressMonitor monitor) { fProgressMonitor= monitor; } @@ -72,6 +76,7 @@ public class AsmReconcilingStrategy implements IReconcilingStrategy, IReconcilin /* * @see IReconcilingStrategyExtension#initialReconcile() */ + @Override public void initialReconcile() { reconcile(true); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java index e3f0d4d9b53..be0918374fe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java @@ -78,6 +78,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { AsmTextEditor.this.selectionChanged(); } @@ -391,6 +392,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen * React to changed selection in the outline view. * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection sel = event.getSelection(); if (sel instanceof IStructuredSelection) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java index b43ba7db512..81c21dd66bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java @@ -44,7 +44,8 @@ import org.eclipse.cdt.internal.ui.text.util.CColorManager; public class AsmTextTools { private class PreferenceListener implements IPropertyChangeListener { - public void propertyChange(PropertyChangeEvent event) { + @Override + public void propertyChange(PropertyChangeEvent event) { adaptToPreferenceChange(event); } } @@ -77,6 +78,7 @@ public class AsmTextTools { fColorManager= new CColorManager(); ITokenStoreFactory factory= new ITokenStoreFactory() { + @Override public ITokenStore createTokenStore(String[] propertyColorNames) { return new TokenStore(fColorManager, fPreferenceStore, propertyColorNames); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java index b687af5ed4c..68dbaa321b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmWordDetector.java @@ -40,6 +40,7 @@ public class AsmWordDetector implements IWordDetector { /* * @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char) */ + @Override public boolean isWordStart(char c) { if(fPrefix != 0) { return (fPrefix == c); @@ -52,6 +53,7 @@ public class AsmWordDetector implements IWordDetector { /* * @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char) */ + @Override public boolean isWordPart(char c) { return Character.isJavaIdentifierPart(c); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java index c767270f25a..2afb5902155 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java @@ -192,6 +192,7 @@ public class CustomFiltersDialog extends SelectionDialog { data.heightHint= convertHeightInCharsToPixels(3); description.setLayoutData(data); fCheckBoxList.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection= event.getSelection(); if (selection instanceof IStructuredSelection) { @@ -205,6 +206,7 @@ public class CustomFiltersDialog extends SelectionDialog { /* * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged(CheckStateChangedEvent event) { Object element= event.getElement(); if (element instanceof FilterDescriptor) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java index 711c77b11d2..fec0e951555 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java @@ -118,6 +118,7 @@ public class FilterDescriptor implements Comparable { /* * @see org.eclipse.core.runtime.ISafeRunnable#run() */ + @Override public void run() throws Exception { result[0]= (ViewerFilter)fElement.createExecutableExtension(CLASS_ATTRIBUTE); } @@ -230,6 +231,7 @@ public class FilterDescriptor implements Comparable { /* * Implements a method from IComparable */ + @Override public int compareTo(FilterDescriptor o) { return Collator.getInstance().compare(getName(), (o).getName()); } @@ -248,6 +250,7 @@ public class FilterDescriptor implements Comparable { final FilterDescriptor[] desc= new FilterDescriptor[1]; SafeRunnable.run(new SafeRunnable(FilterMessages.FilterDescriptor_filterDescriptionCreationError_message) { + @Override public void run() throws Exception { desc[0]= new FilterDescriptor(element); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java index 92f44487919..8de3a05e9e8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java @@ -72,18 +72,23 @@ public class CFunctionSummary implements IFunctionSummary { fps = new FunctionPrototypeSummary(type + SP + name + LB + args + RB); } + @Override public String getDescription() { return desc; } + @Override public IRequiredInclude[] getIncludes() { return incs; } + @Override public String getName() { return name; } + @Override public String getNamespace() { return null; } + @Override public IFunctionPrototypeSummary getPrototype() { return fps; } @@ -99,9 +104,11 @@ public class CFunctionSummary implements IFunctionSummary { iname = s; std = b; } + @Override public String getIncludeName() { return iname; } + @Override public boolean isStandard() { return std; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java index 385a8e7dede..f29a537da4c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java @@ -74,10 +74,12 @@ public class CHelpBook implements ICHelpBook { } } + @Override public int getCHelpType() { return type; } + @Override public String getTitle() { return title; } @@ -155,9 +157,11 @@ public class CHelpBook implements ICHelpBook { book = _book; res = _res; } + @Override public ICHelpBook getCHelpBook() { return book; } + @Override public IHelpResource[] getHelpResources() { return res; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java index cd325f0865b..11300e10142 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpProvider.java @@ -54,11 +54,13 @@ public class CHelpProvider implements ICHelpProvider { ICHelpBook[] hbs = null; + @Override public ICHelpBook[] getCHelpBooks() { waitForDone(); return hbs; } + @Override public IFunctionSummary getFunctionInfo( ICHelpInvocationContext context, ICHelpBook[] helpBooks, @@ -73,6 +75,7 @@ public class CHelpProvider implements ICHelpProvider { return null; } + @Override public ICHelpResourceDescriptor[] getHelpResources( ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name) { @@ -90,6 +93,7 @@ public class CHelpProvider implements ICHelpProvider { return null; } + @Override public IFunctionSummary[] getMatchingFunctions( ICHelpInvocationContext context, ICHelpBook[] helpBooks, String prefix) { @@ -106,6 +110,7 @@ public class CHelpProvider implements ICHelpProvider { return null; } + @Override public void initialize() { // (new Thread() { // public void run() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java index 854f9be2422..00cdcda2356 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java @@ -26,9 +26,11 @@ public class CHelpTopic implements IHelpResource { if (title == null || title.length() == 0) title = defTitle; } + @Override public String getHref() { return href; } + @Override public String getLabel() { return title; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java index d425c2937ca..1c0ef382502 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDragSourceListener.java @@ -35,7 +35,8 @@ public class IBDragSourceListener implements DragSourceListener { fTreeViewer= viewer; } - public void dragStart(DragSourceEvent event) { + @Override + public void dragStart(DragSourceEvent event) { if (fDropTargetListener != null) { fDropTargetListener.setEnabled(false); } @@ -56,7 +57,8 @@ public class IBDragSourceListener implements DragSourceListener { fDropTargetListener= dl; } - public void dragSetData(DragSourceEvent event) { + @Override + public void dragSetData(DragSourceEvent event) { if (ResourceTransfer.getInstance().isSupportedType(event.dataType)) { event.data= getResources(); } @@ -92,7 +94,8 @@ public class IBDragSourceListener implements DragSourceListener { return files.toArray(new IFile[files.size()]); } - public void dragFinished(DragSourceEvent event) { + @Override + public void dragFinished(DragSourceEvent event) { if (fDropTargetListener != null) { fDropTargetListener.setEnabled(true); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java index db4d9451349..611ffa214c0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBDropTargetListener.java @@ -47,7 +47,8 @@ public class IBDropTargetListener implements DropTargetListener { fEnabled= val; } - public void dragEnter(DropTargetEvent event) { + @Override + public void dragEnter(DropTargetEvent event) { fTranslationUnit= null; checkOperation(event); if (event.detail != DND.DROP_NONE) { @@ -93,17 +94,21 @@ public class IBDropTargetListener implements DropTargetListener { return null; } - public void dragLeave(DropTargetEvent event) { + @Override + public void dragLeave(DropTargetEvent event) { } - public void dragOperationChanged(DropTargetEvent event) { + @Override + public void dragOperationChanged(DropTargetEvent event) { checkOperation(event); } - public void dragOver(DropTargetEvent event) { + @Override + public void dragOver(DropTargetEvent event) { } - public void drop(DropTargetEvent event) { + @Override + public void drop(DropTargetEvent event) { if (fTranslationUnit == null) { fTranslationUnit= findFirstTranslationUnit(event.data); } @@ -147,7 +152,8 @@ public class IBDropTargetListener implements DropTargetListener { return null; } - public void dropAccept(DropTargetEvent event) { + @Override + public void dropAccept(DropTargetEvent event) { } private void checkOperation(DropTargetEvent event) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java index 7e5d7c2e0d1..fbea122c68b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java @@ -54,6 +54,7 @@ public class IBHistoryDropDownAction extends Action implements IMenuCreator { setMenuCreator(this); } + @Override public void dispose() { // action is reused, can be called several times. if (fMenu != null) { @@ -62,10 +63,12 @@ public class IBHistoryDropDownAction extends Action implements IMenuCreator { } } + @Override public Menu getMenu(Menu parent) { return null; } + @Override public Menu getMenu(Control parent) { if (fMenu != null) { fMenu.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java index 2c6fca2322f..b7d6b6f38c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java @@ -54,13 +54,16 @@ public class IBHistoryListAction extends Action { }; IListAdapter adapter= new IListAdapter() { + @Override public void customButtonPressed(ListDialogField field, int index) { doCustomButtonPressed(); } + @Override public void selectionChanged(ListDialogField field) { doSelectionChanged(); } + @Override public void doubleClicked(ListDialogField field) { doDoubleClicked(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java index ed23e119577..98bf1100758 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java @@ -119,11 +119,13 @@ public class IBLabelProvider extends LabelProvider implements IColorProvider { return result; } - public Color getBackground(Object element) { + @Override + public Color getBackground(Object element) { return null; } - public Color getForeground(Object element) { + @Override + public Color getForeground(Object element) { if (element instanceof IBNode) { IBNode node= (IBNode) element; if (!node.isActiveCode()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java index 14c1938edbe..d9cd1e4675f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBNode.java @@ -157,7 +157,8 @@ public class IBNode implements IAdaptable { return fRepresentedFile.getName(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) public Object getAdapter(Class adapter) { if (fRepresentedFile != null) { if (adapter.isAssignableFrom(ITranslationUnit.class)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java index 0b2afb8482d..c64efe5c854 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java @@ -41,6 +41,7 @@ public class IBSetInputJob extends Job { if (CCorePlugin.getIndexManager().joinIndexer(IIndexManager.FOREVER, monitor)) { try { fDisplay.asyncExec(new Runnable() { + @Override public void run() { fViewPart.setInput(fInput); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java index 5ab7c835746..a1e011e4d9c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java @@ -222,6 +222,7 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget final ITranslationUnit alt= CoreModelUtil.findTranslationUnitForLocation(input.getLocation(), input.getCProject()); if (alt != null && IndexUI.isIndexed(index, alt)) { display.asyncExec(new Runnable() { + @Override public void run() { if (fTreeViewer.getInput() == input) { setInput(alt); @@ -231,6 +232,7 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget } else { final String msg = IndexUI.getFileNotIndexedMessage(input); display.asyncExec(new Runnable() { + @Override public void run() { if (fTreeViewer.getInput() == input) { setMessage(msg); @@ -391,7 +393,8 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget MenuManager manager = new MenuManager(); manager.setRemoveAllWhenShown(true); manager.addMenuListener(new IMenuListener() { - public void menuAboutToShow(IMenuManager m) { + @Override + public void menuAboutToShow(IMenuManager m) { onContextMenuAboutToShow(m); } }); @@ -416,7 +419,8 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget fTreeViewer.setLabelProvider(fLabelProvider); fTreeViewer.setAutoExpandLevel(2); fTreeViewer.addOpenListener(new IOpenListener() { - public void open(OpenEvent event) { + @Override + public void open(OpenEvent event) { onShowInclude(event.getSelection()); } }); @@ -806,11 +810,13 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget } } - public ShowInContext getShowInContext() { + @Override + public ShowInContext getShowInContext() { return new ShowInContext(null, IBConversions.nodeSelectionToRepresentedTUSelection(fTreeViewer.getSelection())); } - public boolean show(ShowInContext context) { + @Override + public boolean show(ShowInContext context) { ITranslationUnit tu= IBConversions.selectionToTU(context.getSelection()); if (tu == null) { tu= IBConversions.objectToTU(context.getInput()); @@ -824,7 +830,8 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget return true; } - public String[] getShowInTargetIds() { + @Override + public String[] getShowInTargetIds() { return new String[] { ProjectExplorer.VIEW_ID, IPageLayout.ID_PROJECT_EXPLORER diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java index fd3cb1f373b..ad4f01a3995 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java @@ -85,10 +85,12 @@ public class CountNodeAction extends IndexAction { pdom.acquireReadLock(); try { pdom.getFileIndex().accept(new IBTreeVisitor() { + @Override public int compare(long record) throws CoreException { return 0; } + @Override public boolean visit(long record) throws CoreException { if (record != 0) { PDOMFile file = PDOMFile.recreateFile(pdom, record); @@ -103,6 +105,7 @@ public class CountNodeAction extends IndexAction { } }); pdom.accept(new IPDOMVisitor() { + @Override public boolean visit(IPDOMNode node) throws CoreException { ++count[SYMBOLS]; @@ -124,6 +127,7 @@ public class CountNodeAction extends IndexAction { return true; } + @Override public void leave(IPDOMNode node) throws CoreException { } }); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java index 44720bda66a..3de37854c02 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java @@ -154,10 +154,12 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang public Children() { fNodes= new ArrayList(); } + @Override public boolean visit(IPDOMNode node) throws CoreException { fNodes.add(node); return false; } + @Override public void leave(IPDOMNode node) throws CoreException { } public IPDOMNode[] getNodes() { @@ -319,7 +321,8 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang private void hideMenuItems(IMenuManager manager) { } - public void menuAboutToShow(IMenuManager manager) { + @Override + public void menuAboutToShow(IMenuManager manager) { IndexView.this.fillContextMenu(manager); hideMenuItems(manager); } @@ -330,6 +333,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang getSite().setSelectionProvider(viewer); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(event); } @@ -365,6 +369,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { IndexView.this.fillContextMenu(manager); } @@ -390,6 +395,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang private void hookDoubleClickAction() { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { openDefinitionAction.run(); } @@ -413,6 +419,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang viewer.getControl().setFocus(); } + @Override public void handleChange(PDOM pdom, PDOM.ChangeEvent e) { requestUpdate(); } @@ -421,6 +428,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang if (!fUpdateRequested) { fUpdateRequested= true; viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { fUpdateRequested= false; if (!viewer.getControl().isDisposed()) { @@ -431,6 +439,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang } } + @Override public void elementChanged(ElementChangedEvent event) { // Only respond to post change events if (event.getType() != ElementChangedEvent.POST_CHANGE) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java index f1fa6c1b563..9bc26f32c5f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java @@ -155,6 +155,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { final IProject project = file.getProject(); fTable.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { Control oldEditor = editor.getEditor(); if (oldEditor != null) { @@ -171,6 +172,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { populateLanguages(project, file, data.configuration, data.languageId, newEditor); newEditor.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { CCombo combo = (CCombo) editor.getEditor(); int index = combo.getSelectionIndex(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingLinkListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingLinkListener.java index 6453cef6d4b..4616db092d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingLinkListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingLinkListener.java @@ -32,6 +32,7 @@ public class LanguageMappingLinkListener implements Listener { fElement = element; } + @Override public void handleEvent(Event event) { if (WORKSPACE_LINK.equals(event.text)) { PreferencesUtil.createPreferenceDialogOn(fShell, WORKSPACE_PREFERENCE_PAGE, null, null).open(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java index a4d99ca8e1b..11828e029d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java @@ -76,6 +76,7 @@ public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { fConfiguration.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); configureConfigurations(fConfiguration); fConfiguration.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { int index = fConfiguration.getSelectionIndex(); if (index <= 0) { @@ -106,6 +107,7 @@ public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { fContentType.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); fContentType.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { fSelectedContentTypeName = fContentType.getText(); fSelectedContentTypeID = fContentTypeNamesToIDsMap.get(fSelectedContentTypeName); @@ -121,6 +123,7 @@ public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { fLanguage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); fLanguage.setItems(getLanguages()); fLanguage.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { fSelectedLanguageName = fLanguage.getText(); fSelectedLanguageID = fLanguageNamesToIDsMap.get(fSelectedLanguageName); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java index 3522cd6151f..47923197afb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java @@ -80,10 +80,12 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage { fetchWorkspaceMappings(); fInheritedMappingWidget.createContents(group, null); fInheritedMappingsChangeListener = new ILanguageMappingChangeListener() { + @Override public void handleLanguageMappingChangeEvent(final ILanguageMappingChangeEvent event) { if (event.getType() == ILanguageMappingChangeEvent.TYPE_WORKSPACE) { if (ProjectLanguageMappingPropertyPage.this.isControlCreated()) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { if (!ProjectLanguageMappingPropertyPage.this.getControl().isDisposed()) { fetchWorkspaceMappings(); @@ -96,6 +98,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage { else if (event.getType() == ILanguageMappingChangeEvent.TYPE_PROJECT) { if (ProjectLanguageMappingPropertyPage.this.isControlCreated()) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { if (!ProjectLanguageMappingPropertyPage.this.getControl().isDisposed()) { fetchMappings(event.getProject()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java index f5c35b5e067..316f9dd94b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java @@ -113,6 +113,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { addButton.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false)); addButton.setText(PreferencesMessages.ProjectLanguagesPropertyPage_addMappingButton); addButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { IProject project = (IProject) getElement().getAdapter(IProject.class); ICProjectDescription description = CoreModel.getDefault().getProjectDescription(project, false); @@ -149,6 +150,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { removeButton.setText(PreferencesMessages.ProjectLanguagesPropertyPage_removeMappingButton); removeButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { TableItem[] selection = fTable.getSelection(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java index bff6cc18b52..a2d9eccd0af 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java @@ -51,6 +51,7 @@ public class WorkspaceContentTypeMappingDialog extends ContentTypeMappingDialog fContentType.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); configureContentTypes(fContentType); fContentType.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { fSelectedContentTypeName = fContentType.getText(); fSelectedContentTypeID = fContentTypeNamesToIDsMap.get(fSelectedContentTypeName); @@ -65,6 +66,7 @@ public class WorkspaceContentTypeMappingDialog extends ContentTypeMappingDialog fLanguage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); fLanguage.setItems(getLanguages()); fLanguage.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { fSelectedLanguageName = fLanguage.getText(); fSelectedLanguageID = fLanguageNamesToIDsMap.get(fSelectedLanguageName); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java index 59d8a79470c..a8164dda5cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java @@ -80,6 +80,7 @@ public class WorkspaceLanguageMappingPreferencePage extends PreferencePage imple fMappingWidget.setMappings(fMappings.getWorkspaceMappings()); } + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java index 05b069ae47c..2265e913bda 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java @@ -93,6 +93,7 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { addButton.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false)); addButton.setText(PreferencesMessages.ProjectLanguagesPropertyPage_addMappingButton); addButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { WorkspaceContentTypeMappingDialog dialog = new WorkspaceContentTypeMappingDialog(fContents.getShell()); dialog.setContentTypeFilter(fContentTypeMappings.keySet()); @@ -115,6 +116,7 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { removeButton.setText(PreferencesMessages.ProjectLanguagesPropertyPage_removeMappingButton); removeButton.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { TableItem[] selection = fTable.getSelection(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java index a9a8047eadc..46041a8c974 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java @@ -62,11 +62,13 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) */ + @Override public void init(ICommonContentExtensionSite commonContentExtensionSite) { IMemento memento= commonContentExtensionSite.getMemento(); restoreState(memento); fPropertyChangeListener= new IPropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent event) { boolean refreshViewer= false; String property= event.getProperty(); @@ -95,9 +97,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I // Note that this listener listens to CCorePlugin preferences fPreferenceChangeListener = new IPreferenceChangeListener() { + @Override public void preferenceChange(PreferenceChangeEvent event) { if (event.getKey().equals(CCorePreferenceConstants.SHOW_SOURCE_ROOTS_AT_TOP_LEVEL_OF_PROJECT)) { Display.getDefault().asyncExec(new Runnable() { + @Override public void run() { getViewer().refresh(); } @@ -127,6 +131,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) */ + @Override public void restoreState(IMemento memento) { IPreferenceStore store= PreferenceConstants.getPreferenceStore(); boolean showCUChildren= store.getBoolean(PreferenceConstants.PREF_SHOW_CU_CHILDREN); @@ -152,6 +157,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) */ + @Override public void saveState(IMemento memento) { if (memento != null) { memento.putString(PreferenceConstants.PREF_SHOW_CU_CHILDREN, String.valueOf(getProvideMembers())); @@ -249,6 +255,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedChildren(java.lang.Object, java.util.Set) */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void getPipelinedChildren(Object parent, Set currentChildren) { customizeCElements(getChildren(parent), currentChildren); @@ -257,6 +264,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedElements(java.lang.Object, java.util.Set) */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public void getPipelinedElements(Object input, Set currentElements) { // only replace plain resource elements with custom elements @@ -298,6 +306,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#getPipelinedParent(java.lang.Object, java.lang.Object) */ + @Override public Object getPipelinedParent(Object object, Object suggestedParent) { return getParent(object); } @@ -305,6 +314,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptAdd(org.eclipse.ui.navigator.PipelinedShapeModification) */ + @Override public PipelinedShapeModification interceptAdd(PipelinedShapeModification addModification) { Object parent = addModification.getParent(); if (parent instanceof ICProject) { @@ -336,6 +346,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRefresh(org.eclipse.ui.navigator.PipelinedViewerUpdate) */ + @Override public boolean interceptRefresh(PipelinedViewerUpdate refreshSynchronization) { @SuppressWarnings("unchecked") final Set refreshTargets = refreshSynchronization.getRefreshTargets(); @@ -345,6 +356,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptRemove(org.eclipse.ui.navigator.PipelinedShapeModification) */ + @Override public PipelinedShapeModification interceptRemove(PipelinedShapeModification removeModification) { @SuppressWarnings("unchecked") final Set children = removeModification.getChildren(); @@ -355,6 +367,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.ui.navigator.IPipelinedTreeContentProvider#interceptUpdate(org.eclipse.ui.navigator.PipelinedViewerUpdate) */ + @Override public boolean interceptUpdate(PipelinedViewerUpdate updateSynchronization) { @SuppressWarnings("unchecked") final Set refreshTargets = updateSynchronization.getRefreshTargets(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java index 44581220385..2826ff0c62c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java @@ -121,6 +121,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { // Otherwise the drag source (e.g., Windows Explorer) will be blocked // while the operation executes. Fixes bug 35796. Display.getCurrent().asyncExec(new Runnable() { + @Override public void run() { getShell().forceActive(); CopyFilesAndFoldersOperation op= new CopyFilesAndFoldersOperation(getShell()); @@ -374,6 +375,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { } final ICElement[] siblings = neighbours; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { CoreModel.getDefault().getCModel().copy(cElements, containers, siblings, null, false, monitor); @@ -412,6 +414,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { } final ICElement[] siblings = neighbours; IRunnableWithProgress runnable = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { CoreModel.getDefault().getCModel().move(cElements, containers, siblings, null, false, monitor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java index 1b96300bc6e..83b877d3e67 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java @@ -50,6 +50,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm /* * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) */ + @Override public void init(ICommonContentExtensionSite extensionSite) { // no-op } @@ -57,6 +58,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm /* * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) */ + @Override public void restoreState(IMemento memento) { // no-op } @@ -64,6 +66,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm /* * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) */ + @Override public void saveState(IMemento memento) { // no-op } @@ -71,6 +74,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm /* * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object) */ + @Override public String getDescription(Object element) { if (element instanceof IResource) { return ((IResource) element).getFullPath().makeRelative().toString(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java index 80aac5958b2..7cda707bbf8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLinkHelper.java @@ -38,6 +38,7 @@ public class CNavigatorLinkHelper implements ILinkHelper { /* * @see org.eclipse.ui.navigator.ILinkHelper#activateEditor(org.eclipse.ui.IWorkbenchPage, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public void activateEditor(IWorkbenchPage page, IStructuredSelection selection) { if (selection == null || selection.isEmpty()) return; @@ -55,6 +56,7 @@ public class CNavigatorLinkHelper implements ILinkHelper { /* * @see org.eclipse.ui.navigator.ILinkHelper#findSelection(org.eclipse.ui.IEditorInput) */ + @Override public IStructuredSelection findSelection(IEditorInput input) { IWorkingCopyManager mgr= CUIPlugin.getDefault().getWorkingCopyManager(); Object element= mgr.getWorkingCopy(input); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java index 2aa3322b87b..447a50882b5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java @@ -7,10 +7,9 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Sergey Prigogin, Google + * Sergey Prigogin (Google) * Anton Leherbauer (Wind River Systems) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; @@ -53,7 +52,6 @@ import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; * @since 4.0 */ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlock { - /** * Use as follows: * @@ -73,9 +71,9 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo protected final class SectionManager { /** The preference setting for keeping no section open. */ private static final String __NONE= "__none"; //$NON-NLS-1$ - private Set fSections= new HashSet(); + private final Set fSections= new HashSet(); private boolean fIsBeingManaged= false; - private ExpansionAdapter fListener= new ExpansionAdapter() { + private final ExpansionAdapter fListener= new ExpansionAdapter() { @Override public void expansionStateChanged(ExpansionEvent e) { ExpandableComposite source= (ExpandableComposite) e.getSource(); @@ -107,10 +105,12 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo } } }; + private Composite fBody; private final String fLastOpenKey; private final IPreferenceStore fDialogSettingsStore; - private ExpandableComposite fFirstChild= null; + private ExpandableComposite fFirstChild; + /** * Creates a new section manager. */ @@ -203,12 +203,15 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo } protected static final int INDENT= 20; - private OverlayPreferenceStore fStore; + private final OverlayPreferenceStore fStore; - private Map fCheckBoxes= new HashMap(); - private SelectionListener fCheckBoxListener= new SelectionListener() { + private final Map fCheckBoxes= new HashMap(); + private final SelectionListener fCheckBoxListener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + + @Override public void widgetSelected(SelectionEvent e) { Button button= (Button) e.widget; fStore.setValue(fCheckBoxes.get(button), button.getSelection()); @@ -216,16 +219,18 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo }; - private Map fTextFields= new HashMap(); - private ModifyListener fTextFieldListener= new ModifyListener() { + private final Map fTextFields= new HashMap(); + private final ModifyListener fTextFieldListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { Text text= (Text) e.widget; fStore.setValue(fTextFields.get(text), text.getText()); } }; - private ArrayList fNumberFields= new ArrayList(); - private ModifyListener fNumberFieldListener= new ModifyListener() { + private final ArrayList fNumberFields= new ArrayList(); + private final ModifyListener fNumberFieldListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { numberFieldChanged((Text) e.widget); } @@ -237,7 +242,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo * @see #createDependency(Button, Control) * @since 3.0 */ - private ArrayList fMasterSlaveListeners= new ArrayList(); + private final ArrayList fMasterSlaveListeners= new ArrayList(); private StatusInfo fStatus; private final PreferencePage fMainPage; @@ -322,8 +327,8 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo * @param isNumber true iff this text field is used to e4dit a number * @return the controls added */ - protected Control[] addLabelledTextField(Composite composite, String label, String key, int textLimit, int indentation, boolean isNumber) { - + protected Control[] addLabelledTextField(Composite composite, String label, String key, + int textLimit, int indentation, boolean isNumber) { PixelConverter pixelConverter= new PixelConverter(composite); Label labelControl= new Label(composite, SWT.NONE); @@ -356,6 +361,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo Assert.isTrue(slaves.length > 0); indent(slaves[0]); SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= master.getSelection(); for (Control slave : slaves) { @@ -363,6 +369,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo } } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); @@ -370,15 +377,15 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo } protected static void indent(Control control) { - ((GridData) control.getLayoutData()).horizontalIndent+= INDENT; + ((GridData) control.getLayoutData()).horizontalIndent += INDENT; } + @Override public void initialize() { initializeFields(); } private void initializeFields() { - Iterator iter= fCheckBoxes.keySet().iterator(); while (iter.hasNext()) { Button b= (Button) iter.next(); @@ -403,9 +410,11 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo updateStatus(new StatusInfo()); } + @Override public void performOk() { } + @Override public void performDefaults() { initializeFields(); } @@ -416,9 +425,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo return fStatus; } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose() - */ + @Override public void dispose() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java index d72b3de8eb3..ffd28820ce1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java @@ -53,6 +53,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see IWorkbenchPreferencePage#init() */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java index c531330202b..7855d8aa996 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractMixedPreferencePage.java @@ -37,9 +37,11 @@ public abstract class AbstractMixedPreferencePage extends AbstractPreferencePage private Map corePrefsCheckBoxes = new HashMap(); private SelectionListener corePrefsCheckBoxListener = new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { Button button = (Button) e.widget; corePrefsOverlayStore.setValue(corePrefsCheckBoxes.get(button), button.getSelection()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java index edd80e89c32..25cf513585d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java @@ -64,6 +64,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I protected Map fTextFields = new HashMap(); private ModifyListener fTextFieldListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { Text text = (Text) e.widget; fOverlayStore.setValue(fTextFields.get(text), text.getText()); @@ -72,6 +73,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I protected Map fComboBoxes = new HashMap(); private ModifyListener fComboBoxListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { Combo combo = (Combo) e.widget; String state = ProposalFilterPreferencesUtil.comboStateAsString(combo); @@ -82,8 +84,10 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I protected Map fCheckBoxes = new HashMap(); private SelectionListener fCheckBoxListener = new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { Button button = (Button) e.widget; fOverlayStore.setValue(fCheckBoxes.get(button), button.getSelection()); @@ -92,6 +96,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I protected ArrayList fNumberFields = new ArrayList(); private ModifyListener fNumberFieldListener = new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { numberFieldChanged((Text) e.widget); } @@ -99,8 +104,10 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I protected Map fColorButtons = new HashMap(); private SelectionListener fColorButtonListener = new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + @Override public void widgetSelected(SelectionEvent e) { ColorSelector editor = (ColorSelector) e.widget.getData(); PreferenceConverter.setValue(fOverlayStore, fColorButtons.get(editor), editor.getColorValue()); @@ -209,10 +216,12 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I boolean masterState= fOverlayStore.getBoolean(masterKey); slave.setEnabled(masterState); SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { slave.setEnabled(master.getSelection()); } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); @@ -342,6 +351,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I * * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java index bf05078e769..1b0631f3519 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java @@ -62,6 +62,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben setDescription(PreferencesMessages.AppearancePreferencePage_description); IDialogFieldListener listener= new IDialogFieldListener() { + @Override public void dialogFieldChanged(DialogField field) { doDialogFieldChanged(field); } @@ -193,6 +194,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben /* * @see IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java index 8b025ee7dc9..55874adc974 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java @@ -145,6 +145,7 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem return CUIPlugin.getDefault().getPreferenceStore().getInt(PREF_BUILDCONSOLE_LINES); } + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java index 357062e03cc..30a59cce1a5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java @@ -82,6 +82,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont String logLocation = prefs.get(BuildConsoleManager.KEY_LOG_LOCATION, consoleManager.getDefaultConsoleLogLocation(project)); logLocationText.setText(logLocation); logLocationText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { } }); @@ -146,6 +147,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont return true; } + @Override public IProject getProject(){ IProject project= null; IAdaptable elem = getElement(); @@ -161,11 +163,13 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont return (BuildConsoleManager)CUIPlugin.getDefault().getConsoleManager(); } + @Override @Deprecated public org.eclipse.core.runtime.Preferences getPreferences() { throw new UnsupportedOperationException(); } + @Override public void updateContainer() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java index f0a9430434b..a7bae5a3d80 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java @@ -87,10 +87,12 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB private class CEditorTextHoverDescriptorLabelProvider implements ITableLabelProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { switch (columnIndex) { case ENABLED_PROP: @@ -108,16 +110,20 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB return null; } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public void dispose() { } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { } } @@ -125,13 +131,16 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB private class CEditorTextHoverDescriptorContentProvider implements IStructuredContentProvider { + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // Do nothing since the viewer listens to resource deltas } + @Override public void dispose() { } + @Override public Object[] getElements(Object element) { return (Object[])element; } @@ -179,6 +188,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB * @param parent the parent composite * @return the control for the preference page */ + @Override public Control createControl(Composite parent) { ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL); @@ -221,9 +231,11 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB layouter.setLayoutData(gd); fHoverTable.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { handleHoverListSelection(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -248,6 +260,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB /* * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent) */ + @Override public void checkStateChanged(CheckStateChangedEvent event) { String id= ((CEditorTextHoverDescriptor)event.getElement()).getId(); if (id == null) @@ -277,10 +290,12 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB fModifierEditor.addKeyListener(new KeyListener() { private boolean isModifierCandidate; + @Override public void keyPressed(KeyEvent e) { isModifierCandidate= e.keyCode > 0 && e.character == 0 && e.stateMask == 0; } + @Override public void keyReleased(KeyEvent e) { if (isModifierCandidate && e.stateMask > 0 && e.stateMask == e.stateMask && e.character == 0) {// && e.time -time < 1000) { String text= fModifierEditor.getText(); @@ -315,6 +330,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB }); fModifierEditor.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { handleModifierModified(); } @@ -354,6 +370,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB /* * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#initialize() */ + @Override public void initialize() { CEditorTextHoverDescriptor[] hoverDescs= getContributedHovers(); fHoverConfigs= new HoverConfig[hoverDescs.length]; @@ -377,6 +394,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB /* * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performOk() */ + @Override public void performOk() { StringBuffer buf= new StringBuffer(); StringBuffer maskBuf= new StringBuffer(); @@ -405,6 +423,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB /* * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performDefaults() */ + @Override public void performDefaults() { restoreFromPreferences(); initializeFields(); @@ -541,6 +560,7 @@ public class CEditorHoverConfigurationBlock implements IPreferenceConfigurationB /* * @see DialogPage#dispose() */ + @Override public void dispose() { // nothing to dispose } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index cab1a4f022d..84d2f2b45a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -258,6 +258,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage { Link link = new Link(parent, SWT.NONE); link.setText(text); link.addListener (SWT.Selection, new Listener () { + @Override public void handleEvent(Event event) { String u = event.text; PreferencesUtil.createPreferenceDialogOn(getShell(), u, null, null); @@ -310,6 +311,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage { fAppearanceColorList.add(element[0]); } fAppearanceColorList.getDisplay().asyncExec(new Runnable() { + @Override public void run() { fAppearanceColorList.select(0); handleAppearanceColorListSelection(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java index 7517042c302..c2dd11442f0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java @@ -78,6 +78,7 @@ public class CFileTypeDialog extends Dialog { } fTextPattern.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { getOkayButton().setEnabled(getPatternFromControl().length() > 0); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java index 18e0fdacfe1..4b088de3f26 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java @@ -93,14 +93,17 @@ public class CFileTypesPreferenceBlock { private class AssocContentProvider implements IStructuredContentProvider { CFileTypeAssociation[] assocs; + @Override public Object[] getElements(Object inputElement) { return assocs; } + @Override public void dispose() { assocs = null; } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof CFileTypeAssociation[]) { assocs = (CFileTypeAssociation[]) newInput; @@ -111,6 +114,7 @@ public class CFileTypesPreferenceBlock { private class AssocLabelProvider implements ILabelProvider, ITableLabelProvider { private ListenerList listeners = new ListenerList(); + @Override public Image getColumnImage(Object element, int columnIndex) { if (element instanceof CFileTypeAssociation) { if (COL_PATTERN == columnIndex) { @@ -120,6 +124,7 @@ public class CFileTypesPreferenceBlock { return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (element instanceof CFileTypeAssociation) { CFileTypeAssociation assoc = (CFileTypeAssociation) element; @@ -142,27 +147,33 @@ public class CFileTypesPreferenceBlock { return element.toString(); } + @Override public void addListener(ILabelProviderListener listener) { listeners.add(listener); } + @Override public void dispose() { listeners.clear(); listeners = null; } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { listeners.remove(listener); } + @Override public Image getImage(Object element) { return getColumnImage(element, 0); } + @Override public String getText(Object element) { return getColumnText(element, 0); } @@ -251,6 +262,7 @@ public class CFileTypesPreferenceBlock { fBtnNew.setLayoutData(gridData); fBtnNew.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { handleAdd(); } @@ -266,6 +278,7 @@ public class CFileTypesPreferenceBlock { fBtnRemove.setLayoutData(gridData); fBtnRemove.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { handleRemove(); } @@ -281,6 +294,7 @@ public class CFileTypesPreferenceBlock { fAssocViewer.setInput(getCFileTypeAssociations()); fAssocViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { handleSelectionChanged(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java index 5021dcb820b..510036aa7bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java @@ -53,6 +53,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index 9e6714c56aa..a1f39654bed 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -128,6 +128,7 @@ public class CFileTypesPropertyPage extends PropertyPage { fUseWorkspace = new Button(radioPane, SWT.RADIO); fUseWorkspace.setText(PreferencesMessages.CFileTypesPropertyPage_useWorkspaceSettings); fUseWorkspace.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { if (fUseWorkspace.getSelection()) { fPrefsBlock.setInput(null); @@ -142,6 +143,7 @@ public class CFileTypesPropertyPage extends PropertyPage { fUseProject = new Button(radioPane, SWT.RADIO); fUseProject.setText(PreferencesMessages.CFileTypesPropertyPage_useProjectSettings); fUseProject.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event e) { if (fUseProject.getSelection()) { fPrefsBlock.setInput(project); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java index b356b64c437..646a86762b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java @@ -101,6 +101,7 @@ public class CParserPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { // TODO Auto-generated method stub } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java index 530d8db33f8..04973e81bda 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java @@ -106,9 +106,11 @@ public class CPluginPreferencePage extends PreferencePage implements IWorkbenchP clearButton.setText(PreferencesMessages.CPluginPreferencePage_clear_button); clearButton.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, false, false)); clearButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { OptionalMessageDialog.clearAllRememberedStates(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { OptionalMessageDialog.clearAllRememberedStates(); } @@ -188,6 +190,7 @@ public class CPluginPreferencePage extends PreferencePage implements IWorkbenchP /** * @see IWorkbenchPreferencePage#init */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java index 80212e91bb1..b510ef2ff6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CSourcePreviewerUpdater.java @@ -53,6 +53,7 @@ public class CSourcePreviewerUpdater { /* * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(PreferenceConstants.EDITOR_TEXT_FONT)) { Font font= JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT); @@ -64,6 +65,7 @@ public class CSourcePreviewerUpdater { /* * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { if (configuration.affectsTextPresentation(event)) { configuration.handlePropertyChangeEvent(event); @@ -75,6 +77,7 @@ public class CSourcePreviewerUpdater { /* * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) */ + @Override public void widgetDisposed(DisposeEvent e) { preferenceStore.removePropertyChangeListener(propertyChangeListener); JFaceResources.getFontRegistry().removeListener(fontChangeListener); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java index f7485d9bc59..bfdbdbf41f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java @@ -97,6 +97,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) return ((ModelElement) element).getImage(); @@ -106,6 +107,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { switch (columnIndex) { case 0: @@ -132,6 +134,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) return ((ModelElement) element).getImage(); @@ -141,6 +144,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { switch (columnIndex) { case 0: @@ -153,6 +157,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo } private final Comparator fCategoryComparator= new Comparator() { + @Override public int compare(ModelElement o1, ModelElement o2) { return o1.getRank() - o2.getRank(); } @@ -441,6 +446,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo keyColumn.setResizable(true); fDefaultViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { boolean checked= event.getChecked(); ModelElement element= (ModelElement) event.getElement(); @@ -536,6 +542,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo nameColumn.setWidth(minNameWidth); fSeparateViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { boolean checked= event.getChecked(); ModelElement element= (ModelElement) event.getElement(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java index 7f3a303f862..9957d22baf8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java @@ -45,12 +45,12 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc } @Override - protected String getPreferencePageID() { + protected String getPreferencePageId() { return "org.eclipse.cdt.ui.preferences.CodeAssistPreferenceAdvanced"; //$NON-NLS-1$ } @Override - protected String getPropertyPageID() { + protected String getPropertyPageId() { // no project settings supported return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java index 792ec6cd22c..b567a2ec209 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java @@ -7,13 +7,11 @@ * * Contributors: * QNX Software Systems - Initial API and implementation - * Sergey Prigogin, Google + * Sergey Prigogin (Google) * Anton Leherbauer (Wind River Systems) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; - import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.preference.IPreferencePageContainer; @@ -31,7 +29,6 @@ import org.eclipse.cdt.internal.ui.preferences.formatter.CodeFormatterConfigurat * The page to configure the code formatter options. */ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { - public static final String PREF_ID= "org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage"; //$NON-NLS-1$ public static final String PROP_ID= "org.eclipse.cdt.ui.propertyPages.CodeFormatterPreferencePage"; //$NON-NLS-1$ @@ -94,7 +91,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ @Override - protected String getPreferencePageID() { + protected String getPreferencePageId() { return PREF_ID; } @@ -102,7 +99,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ @Override - protected String getPropertyPageID() { + protected String getPropertyPageId() { return PROP_ID; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java new file mode 100644 index 00000000000..fcd29643ff2 --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStyleBlock.java @@ -0,0 +1,75 @@ +/******************************************************************************* + * Copyright (c) 2012 Google, Inc and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Sergey Prigogin (Google) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.preferences; + +import org.eclipse.core.resources.IProject; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; + +import org.eclipse.cdt.ui.PreferenceConstants; + +import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; + +/** + * Configures C Editor typing preferences. + */ +class CodeStyleBlock extends OptionsConfigurationBlock { + private static final Key CLASS_MEMBER_ASCENDING_VISIBILITY_ORDER = getCDTUIKey(PreferenceConstants.CLASS_MEMBER_ASCENDING_VISIBILITY_ORDER); + + private static Key[] getAllKeys() { + return new Key[] { + CLASS_MEMBER_ASCENDING_VISIBILITY_ORDER, + }; + } + + public CodeStyleBlock(IStatusChangeListener context, IProject project, + IWorkbenchPreferenceContainer container) { + super(context, project, getAllKeys(), container); + } + + @Override + public Control createContents(Composite parent) { + ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL); + scrolled.setExpandHorizontal(true); + scrolled.setExpandVertical(true); + + Composite control= new Composite(scrolled, SWT.NONE); + GridLayout layout= new GridLayout(); + control.setLayout(layout); + + Composite composite = addSubsection(control, PreferencesMessages.CodeStyleBlock_class_member_order); + fillClassMemberOrderSection(composite); + + scrolled.setContent(control); + final Point size= control.computeSize(SWT.DEFAULT, SWT.DEFAULT); + scrolled.setMinSize(size.x, size.y); + return scrolled; + } + + private void fillClassMemberOrderSection(Composite composite) { + GridLayout layout= new GridLayout(); + layout.numColumns= 3; + composite.setLayout(layout); + + addRadioButton(composite, PreferencesMessages.CodeStyleBlock_public_private, + CLASS_MEMBER_ASCENDING_VISIBILITY_ORDER, FALSE_TRUE, 0); + addRadioButton(composite, PreferencesMessages.CodeStyleBlock_private_public, + CLASS_MEMBER_ASCENDING_VISIBILITY_ORDER, TRUE_FALSE, 0); + } + + @Override + protected void validateSettings(Key changedKey, String oldValue, String newValue) { + } +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java new file mode 100644 index 00000000000..4239c59788c --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2012 Google, Inc and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Sergey Prigogin (Google) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.preferences; + +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; + +import org.eclipse.cdt.ui.CUIPlugin; + +import org.eclipse.cdt.internal.ui.ICHelpContextIds; + +/** + * The page for setting various code style preferences. + */ +public class CodeStylePreferencePage extends ConfigurationBlockPropertyAndPreferencePage { + public static final String PREF_ID= "org.eclipse.cdt.ui.preferences.CodeStylePreferencePage"; //$NON-NLS-1$ + public static final String PROP_ID= "org.eclipse.cdt.ui.propertyPages.CodeStylePreferencePage"; //$NON-NLS-1$ + + public CodeStylePreferencePage() { + setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); + // Only used when the page is shown programmatically. + setTitle(PreferencesMessages.CodeStylePreferencePage_title); + } + + @Override + protected String getHelpId() { + return ICHelpContextIds.CODE_STYLE_PREFERENCE_PAGE; + } + + @Override + protected OptionsConfigurationBlock createConfigurationBlock(IWorkbenchPreferenceContainer container) { + return new CodeStyleBlock(getNewStatusChangedListener(), getProject(), container); + } + + @Override + protected String getPreferencePageId() { + return PREF_ID; + } + + @Override + protected String getPropertyPageId() { + return null; + // TODO(sprigogin): Project specific settings +// return PROP_ID; + } +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java index e081001666b..efe4ccb3380 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java @@ -86,10 +86,12 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { implements ITreeListAdapter, IDialogFieldListener { private final Object[] NO_CHILDREN= new Object[0]; + @Override public void customButtonPressed(TreeListDialogField field, int index) { doButtonPressed(index, field.getSelectedElements()); } + @Override public void selectionChanged(TreeListDialogField field) { List selected= field.getSelectedElements(); field.enableButton(IDX_ADD, canAdd(selected)); @@ -100,6 +102,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { updateSourceViewerInput(selected); } + @Override public void doubleClicked(TreeListDialogField field) { List selected= field.getSelectedElements(); if (canEdit(selected)) { @@ -107,6 +110,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { } } + @Override public Object[] getChildren(TreeListDialogField field, Object element) { if (element == COMMENT_NODE || element == CODE_NODE) { return getCodeTemplatesOfCategory(element == COMMENT_NODE); @@ -118,6 +122,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { return NO_CHILDREN; } + @Override public Object getParent(TreeListDialogField field, Object element) { if (element instanceof TemplatePersistenceData) { TemplatePersistenceData data= (TemplatePersistenceData) element; @@ -134,16 +139,19 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { return null; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { return (element == COMMENT_NODE || element == CODE_NODE || element == FILE_NODE || element instanceof TemplateContextType); } + @Override public void dialogFieldChanged(DialogField field) { if (field == fGenerateComments) { setValue(PREF_GENERATE_COMMENTS, fGenerateComments.isSelected()); } } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java index e4eb29ab6df..5d39efe9e9b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java @@ -140,7 +140,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ @Override - protected String getPreferencePageID() { + protected String getPreferencePageId() { return PREF_ID; } @@ -148,7 +148,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ @Override - protected String getPropertyPageID() { + protected String getPropertyPageId() { return null; // TODO project specific settings // return PROP_ID; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java index c38206266b8..bd76b6ddec7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java @@ -59,6 +59,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo /* (non-Javadoc) * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ + @Override public String getHoverInfo(ITextViewer textViewer, IRegion subject) { try { IDocument doc= textViewer.getDocument(); @@ -84,6 +85,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo /* (non-Javadoc) * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int) */ + @Override public IRegion getHoverRegion(ITextViewer textViewer, int offset) { if (textViewer != null) { return CWordFinder.findWord(textViewer.getDocument(), offset); @@ -123,6 +125,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY); assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE); assistant.setInformationControlCreator(new IInformationControlCreator() { + @Override public IInformationControl createInformationControl(Shell parent) { return new DefaultInformationControl(parent, false); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java new file mode 100644 index 00000000000..d203c83075a --- /dev/null +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ConfigurationBlockPropertyAndPreferencePage.java @@ -0,0 +1,94 @@ +/******************************************************************************* + * Copyright (c) 2012 Google, Inc and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Sergey Prigogin (Google) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.internal.ui.preferences; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; + +import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; + +public abstract class ConfigurationBlockPropertyAndPreferencePage extends PropertyAndPreferencePage { + private OptionsConfigurationBlock fConfigurationBlock; + + public ConfigurationBlockPropertyAndPreferencePage() { + super(); + } + + protected abstract OptionsConfigurationBlock createConfigurationBlock(IWorkbenchPreferenceContainer container); + + protected abstract String getHelpId(); + + @Override + public void createControl(Composite parent) { + IWorkbenchPreferenceContainer container= (IWorkbenchPreferenceContainer) getContainer(); + fConfigurationBlock= createConfigurationBlock(container); + super.createControl(parent); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), getHelpId()); + } + + @Override + protected Control createPreferenceContent(Composite composite) { + return fConfigurationBlock.createContents(composite); + } + + @Override + protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { + super.enableProjectSpecificSettings(useProjectSpecificSettings); + if (fConfigurationBlock != null) { + fConfigurationBlock.useProjectSpecificSettings(useProjectSpecificSettings); + } + } + + @Override + public boolean performOk() { + if (fConfigurationBlock != null) { + return fConfigurationBlock.performOk(); + } + return true; + } + + @Override + protected void performDefaults() { + super.performDefaults(); + if (fConfigurationBlock != null) { + fConfigurationBlock.performDefaults(); + } + } + + @Override + public void dispose() { + if (fConfigurationBlock != null) { + fConfigurationBlock.dispose(); + } + super.dispose(); + } + + public void statusChanged(IStatus status) { + setValid(!status.matches(IStatus.ERROR)); + StatusUtil.applyToStatusLine(this, status); + } + + @Override + public void performApply() { + if (fConfigurationBlock != null) { + fConfigurationBlock.performApply(); + } + } + + @Override + protected boolean hasProjectSpecificOptions(IProject project) { + return fConfigurationBlock.hasProjectSpecificOptions(project); + } +} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java index f3402254ba9..92f354f7b51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java @@ -80,6 +80,7 @@ import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.texteditor.ITextEditorActionConstants; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.IUpdate; + import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.ICPartitions; @@ -98,9 +99,8 @@ import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor; public class EditTemplateDialog extends StatusDialog { private static class TextViewerAction extends Action implements IUpdate { - private int fOperationCode= -1; - private ITextOperationTarget fOperationTarget; + private final ITextOperationTarget fOperationTarget; /** * Creates a new action. @@ -120,6 +120,7 @@ public class EditTemplateDialog extends StatusDialog { * * @see Action#firePropertyChange(String, Object, Object) */ + @Override public void update() { // XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=206111 if (fOperationCode == ITextOperationTarget.REDO) @@ -158,8 +159,8 @@ public class EditTemplateDialog extends StatusDialog { private StatusInfo fValidationStatus; private boolean fSuppressError= true; // https://bugs.eclipse.org/bugs/show_bug.cgi?id=4354 - private Map fGlobalActions= new HashMap(10); - private List fSelectionActions = new ArrayList(3); + private final Map fGlobalActions= new HashMap(10); + private final List fSelectionActions = new ArrayList(3); private String[][] fContextTypes; private ContextTypeRegistry fContextTypeRegistry; @@ -200,6 +201,7 @@ public class EditTemplateDialog extends StatusDialog { contexts.add(0, new String[] { type.getId(), type.getName(), "" }); //$NON-NLS-1$ } Collections.sort(contexts, new Comparator() { + @Override public int compare(String[] s1, String[] s2) { return s1[1].compareTo(s2[1]); }}); @@ -213,17 +215,11 @@ public class EditTemplateDialog extends StatusDialog { fTemplateProcessor.setContextType(type); } - /* - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - */ @Override protected boolean isResizable() { return true; } - /* - * @see org.eclipse.cdt.internal.ui.dialogs.StatusDialog#create() - */ @Override public void create() { super.create(); @@ -231,9 +227,6 @@ public class EditTemplateDialog extends StatusDialog { getButton(IDialogConstants.OK_ID).setEnabled(getStatus().isOK()); } - /* - * @see Dialog#createDialogArea(Composite) - */ @Override protected Control createDialogArea(Composite ancestor) { Composite parent= new Composite(ancestor, SWT.NONE); @@ -243,6 +236,7 @@ public class EditTemplateDialog extends StatusDialog { parent.setLayoutData(new GridData(GridData.FILL_BOTH)); ModifyListener listener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { doTextWidgetChanged(e.widget); } @@ -261,10 +255,11 @@ public class EditTemplateDialog extends StatusDialog { fNameText= createText(composite); fNameText.addFocusListener(new FocusListener() { - + @Override public void focusGained(FocusEvent e) { } + @Override public void focusLost(FocusEvent e) { if (fSuppressError) { fSuppressError= false; @@ -314,11 +309,13 @@ public class EditTemplateDialog extends StatusDialog { fInsertVariableButton.setLayoutData(getButtonGridData()); fInsertVariableButton.setText(PreferencesMessages.EditTemplateDialog_insert_variable); fInsertVariableButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { fPatternEditor.getTextWidget().setFocus(); fPatternEditor.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS); } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }); @@ -444,6 +441,7 @@ public class EditTemplateDialog extends StatusDialog { control.setLayoutData(data); viewer.addTextListener(new ITextListener() { + @Override public void textChanged(TextEvent event) { if (event .getDocumentEvent() != null) doSourceChanged(event.getDocumentEvent().getDocument()); @@ -451,6 +449,7 @@ public class EditTemplateDialog extends StatusDialog { }); viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateSelectionDependentActions(); } @@ -482,6 +481,7 @@ public class EditTemplateDialog extends StatusDialog { final ArrayList handlerActivations= new ArrayList(3); final IHandlerService handlerService= (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class); getShell().addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { handlerService.deactivateHandlers(handlerActivations); } @@ -528,6 +528,7 @@ public class EditTemplateDialog extends StatusDialog { MenuManager manager= new MenuManager(null, null); manager.setRemoveAllWhenShown(true); manager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager mgr) { fillContextMenu(mgr); } @@ -552,7 +553,6 @@ public class EditTemplateDialog extends StatusDialog { menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE)); menu.appendToGroup(IContextMenuConstants.GROUP_GENERATE, fGlobalActions.get("ContentAssistProposal")); //$NON-NLS-1$ } - protected void updateSelectionDependentActions() { Iterator iterator= fSelectionActions.iterator(); @@ -567,7 +567,6 @@ public class EditTemplateDialog extends StatusDialog { } private int getIndex(String contextid) { - if (contextid == null) return -1; @@ -639,9 +638,6 @@ public class EditTemplateDialog extends StatusDialog { } } - /* - * @see org.eclipse.jface.dialogs.Dialog#getInitialSize() - */ @Override protected Point getInitialSize() { Point defaultSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true); @@ -652,9 +648,6 @@ public class EditTemplateDialog extends StatusDialog { return restoredSize; } - /* - * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() - */ @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ @@ -664,5 +657,4 @@ public class EditTemplateDialog extends StatusDialog { section= settings.addNewSection(sectionName); return section; } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java index f25c708fc47..207e35d30ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java @@ -8,12 +8,10 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.eclipse.core.runtime.Assert; @@ -59,15 +57,13 @@ import org.eclipse.cdt.internal.ui.text.folding.CFoldingStructureProviderRegistr class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { private static class ErrorPreferences implements ICFoldingPreferenceBlock { - private String fMessage; + private final String fMessage; protected ErrorPreferences(String message) { fMessage= message; } - /* - * @see org.eclipse.cdt.internal.ui.text.folding.ICFoldingPreferences#createControl(org.eclipse.swt.widgets.Group) - */ + @Override public Control createControl(Composite composite) { Composite inner= new Composite(composite, SWT.NONE); inner.setLayout(new FillLayout(SWT.VERTICAL)); @@ -78,18 +74,21 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { return inner; } + @Override public void initialize() { } + @Override public void performOk() { } + @Override public void performDefaults() { } + @Override public void dispose() { } - } /** The overlay preference store. */ @@ -101,8 +100,8 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { private ComboViewer fProviderViewer; protected Map fProviderDescriptors; private Composite fGroup; - private Map fProviderPreferences; - private Map fProviderControls; + private final Map fProviderPreferences; + private final Map fProviderControls; private StackLayout fStackLayout; @@ -138,9 +137,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { return keys; } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#createControl(org.eclipse.swt.widgets.Composite) - */ + @Override public Control createControl(Composite parent) { Composite composite= new Composite(parent, SWT.NULL); @@ -160,12 +157,14 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING); fFoldingCheckbox.setLayoutData(gd); fFoldingCheckbox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean enabled= fFoldingCheckbox.getSelection(); fStore.setValue(PreferenceConstants.EDITOR_FOLDING_ENABLED, enabled); updateCheckboxDependencies(); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } }); @@ -197,45 +196,32 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { /* list viewer */ fProviderViewer= new ComboViewer(fProviderCombo); fProviderViewer.setContentProvider(new IStructuredContentProvider() { - - /* - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ + @Override public void dispose() { } - /* - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) - */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } - /* - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ + @Override public Object[] getElements(Object inputElement) { return fProviderDescriptors.values().toArray(); } }); fProviderViewer.setLabelProvider(new LabelProvider() { - /* - * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) - */ @Override public Image getImage(Object element) { return null; } - /* - * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { return ((CFoldingStructureProviderDescriptor) element).getName(); } }); fProviderViewer.addSelectionChangedListener(new ISelectionChangedListener() { - + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection sel= (IStructuredSelection) event.getSelection(); if (!sel.isEmpty()) { @@ -309,40 +295,29 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { prefs.initialize(); } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#initialize() - */ + @Override public void initialize() { restoreFromPreferences(); } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performOk() - */ + @Override public void performOk() { - for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { - ICFoldingPreferenceBlock prefs= it.next(); + for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) { prefs.performOk(); } } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#performDefaults() - */ + @Override public void performDefaults() { restoreFromPreferences(); - for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { - ICFoldingPreferenceBlock prefs= it.next(); + for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) { prefs.performDefaults(); } } - /* - * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose() - */ + @Override public void dispose() { - for (Iterator it= fProviderPreferences.values().iterator(); it.hasNext();) { - ICFoldingPreferenceBlock prefs= it.next(); + for (ICFoldingPreferenceBlock prefs : fProviderPreferences.values()) { prefs.dispose(); } } @@ -360,4 +335,3 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { } } } - diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java index f78f6a1a3b8..998a3a59408 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java @@ -37,7 +37,7 @@ public final class FoldingPreferencePage extends AbstractConfigurationBlockPrefe */ @Override protected void setDescription() { - String description= PreferencesMessages.CEditorPreferencePage_folding_title; + String description= PreferencesMessages.FoldingPreferencePage_folding_title; setDescription(description); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java index 8bd9929096b..53ad7aaa44d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Alex Collins (Broadcom Corp.) - Initial implementation + * Alex Collins (Broadcom Corp.) - Initial implementation *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -65,6 +65,7 @@ public class GlobalBuildLogPreferencePage extends FieldEditorPreferencePage impl addField(logLocation); } + @Override public void init(IWorkbench workbench) { initDefaults(GlobalBuildConsoleManager.getBuildLogPreferenceStore()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java index bcc0da76b88..02ac62669ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java @@ -38,9 +38,9 @@ public class IndexerPreferencePage extends PreferencePage implements // bug 217860, allow to hide build configuration private static final String SHOW_BUILD_SPECIFIC_CONFIG = "show.build.specific.indexer.config"; //$NON-NLS-1$ - private IndexerBlock fOptionBlock; - private CacheSizeBlock fCacheBlock; - private IndexerStrategyBlock fStrategyBlock; + private final IndexerBlock fOptionBlock; + private final CacheSizeBlock fCacheBlock; + private final IndexerStrategyBlock fStrategyBlock; public IndexerPreferencePage(){ fOptionBlock = new IndexerBlock(); @@ -70,9 +70,11 @@ public class IndexerPreferencePage extends PreferencePage implements return composite; } + @Override public void init(IWorkbench workbench) { } + @Override public void updateContainer() { if (!fOptionBlock.isValid()) { setErrorMessage(fOptionBlock.getErrorMessage()); @@ -92,10 +94,12 @@ public class IndexerPreferencePage extends PreferencePage implements } } + @Override public IProject getProject() { return null; } + @Override @SuppressWarnings("deprecation") public org.eclipse.core.runtime.Preferences getPreferences() { throw new UnsupportedOperationException(); @@ -110,7 +114,7 @@ public class IndexerPreferencePage extends PreferencePage implements } catch (CoreException e) {} return true; } - + @Override public void performDefaults() { fOptionBlock.performDefaults(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java index 8069cb54867..b5a44cbe3a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation * Anton Leherbauer (Wind River Systems) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; @@ -44,14 +43,15 @@ import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey * @since 5.0 */ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock { - - private OverlayPreferenceStore fStore; + private final OverlayPreferenceStore fStore; - - private Map fCheckBoxes= new HashMap(); - private SelectionListener fCheckBoxListener= new SelectionListener() { + private final Map fCheckBoxes= new HashMap(); + private final SelectionListener fCheckBoxListener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) { } + + @Override public void widgetSelected(SelectionEvent e) { Button button= (Button) e.widget; fStore.setValue(fCheckBoxes.get(button), button.getSelection()); @@ -63,7 +63,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock * * @see #createDependency(Button, String, Control) */ - private ArrayList fMasterSlaveListeners= new ArrayList(); + private final ArrayList fMasterSlaveListeners= new ArrayList(); private StatusInfo fStatus; @@ -93,8 +93,8 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock * @param parent the parent composite * @return the control for the preference page */ + @Override public Control createControl(final Composite parent) { - Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); layout.numColumns= 1; @@ -166,10 +166,12 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock boolean masterState= fStore.getBoolean(masterKey); slave.setEnabled(masterState); SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { slave.setEnabled(master.getSelection()); } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); @@ -182,6 +184,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock control.setLayoutData(gridData); } + @Override public void initialize() { initializeFields(); } @@ -204,9 +207,11 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock } + @Override public void performOk() { } + @Override public void performDefaults() { restoreFromPreferences(); initializeFields(); @@ -225,6 +230,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock /* * @see org.eclipse.jdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose() */ + @Override public void dispose() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java index f31d47696dc..f8356f1405a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java @@ -440,7 +440,7 @@ public class NameStyleBlock extends OptionsConfigurationBlock { private Key prefixKey; private Key alternativePrefixKey; private Key suffixKey; - private String seedName; + private final String seedName; private Category seedNameGenerator; private NameValidator nameValidator; @@ -630,31 +630,39 @@ public class NameStyleBlock extends OptionsConfigurationBlock { private class NameStyleAdapter extends ViewerComparator implements ITreeListAdapter, IDialogFieldListener { + @Override public void selectionChanged(TreeListDialogField field) { updateConfigurationBlock(field.getSelectedElements()); } + @Override public void customButtonPressed(TreeListDialogField field, int index) { } + @Override public void doubleClicked(TreeListDialogField field) { } + @Override public Category[] getChildren(TreeListDialogField field, Object element) { return ((Category) element).getChildren(); } + @Override public Category getParent(TreeListDialogField field, Object element) { return ((Category) element).parent; } + @Override public boolean hasChildren(TreeListDialogField field, Object element) { return ((Category) element).hasChildren(); } + @Override public void dialogFieldChanged(DialogField field) { } + @Override public void keyPressed(TreeListDialogField field, KeyEvent event) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java index b501ace9195..f52398bd5b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Google, Inc and others. + * Copyright (c) 2011, 2012 Google, Inc and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,27 +10,19 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.internal.ui.ICHelpContextIds; -import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; /* * The preference page for configuring styles of names. */ -public class NameStylePreferencePage extends PropertyAndPreferencePage { +public class NameStylePreferencePage extends ConfigurationBlockPropertyAndPreferencePage { public static final String PREF_ID= "org.eclipse.cdt.ui.preferences.NameStylePreferencePage"; //$NON-NLS-1$ public static final String PROP_ID= "org.eclipse.cdt.ui.propertyPages.NameStylePreferencePage"; //$NON-NLS-1$ - private NameStyleBlock fConfigurationBlock; - public NameStylePreferencePage() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); // Only used when the page is shown programmatically. @@ -38,77 +30,22 @@ public class NameStylePreferencePage extends PropertyAndPreferencePage { } @Override - public void createControl(Composite parent) { - IWorkbenchPreferenceContainer container= (IWorkbenchPreferenceContainer) getContainer(); - fConfigurationBlock= new NameStyleBlock(getNewStatusChangedListener(), - getProject(), container); - - super.createControl(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), - ICHelpContextIds.NAME_STYLE_PREFERENCE_PAGE); + protected OptionsConfigurationBlock createConfigurationBlock(IWorkbenchPreferenceContainer container) { + return new NameStyleBlock(getNewStatusChangedListener(), getProject(), container); } @Override - protected Control createPreferenceContent(Composite composite) { - return fConfigurationBlock.createContents(composite); + protected String getHelpId() { + return ICHelpContextIds.NAME_STYLE_PREFERENCE_PAGE; } @Override - protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { - super.enableProjectSpecificSettings(useProjectSpecificSettings); - if (fConfigurationBlock != null) { - fConfigurationBlock.useProjectSpecificSettings(useProjectSpecificSettings); - } - } - - @Override - public boolean performOk() { - if (fConfigurationBlock != null) { - return fConfigurationBlock.performOk(); - } - return true; - } - - @Override - protected void performDefaults() { - super.performDefaults(); - if (fConfigurationBlock != null) { - fConfigurationBlock.performDefaults(); - } - } - - @Override - public void dispose() { - if (fConfigurationBlock != null) { - fConfigurationBlock.dispose(); - } - super.dispose(); - } - - public void statusChanged(IStatus status) { - setValid(!status.matches(IStatus.ERROR)); - StatusUtil.applyToStatusLine(this, status); - } - - @Override - public void performApply() { - if (fConfigurationBlock != null) { - fConfigurationBlock.performApply(); - } - } - - @Override - protected boolean hasProjectSpecificOptions(IProject project) { - return fConfigurationBlock.hasProjectSpecificOptions(project); - } - - @Override - protected String getPreferencePageID() { + protected String getPreferencePageId() { return PREF_ID; } @Override - protected String getPropertyPageID() { + protected String getPropertyPageId() { return null; // TODO(sprigogin): Project specific settings // return PROP_ID; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index 9bec48d4428..17a3fca734c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Anton Leherbauer (Wind River Systems) + * Sergey Prigogin (Google) *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -39,6 +40,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; @@ -62,10 +64,12 @@ import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; * an options configuration page. */ public abstract class OptionsConfigurationBlock { + protected static final String[] FALSE_TRUE = new String[] { "false", "true" }; //$NON-NLS-1$//$NON-NLS-2$ + protected static final String[] TRUE_FALSE = new String[] { "true", "false" }; //$NON-NLS-1$//$NON-NLS-2$ public static final class Key { - private String fQualifier; - private String fKey; + private final String fQualifier; + private final String fKey; public Key(String qualifier, String key) { fQualifier= qualifier; @@ -106,9 +110,6 @@ public abstract class OptionsConfigurationBlock { } } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return fQualifier + '/' + fKey; @@ -120,8 +121,8 @@ public abstract class OptionsConfigurationBlock { } protected static class ControlData { - private Key fKey; - private String[] fValues; + private final Key fKey; + private final String[] fValues; public ControlData(Key key, String[] values) { fKey= key; @@ -149,7 +150,7 @@ public abstract class OptionsConfigurationBlock { } } } - return fValues.length -1; // assume the last option is the least severe + return fValues.length - 1; // assume the last option is the least severe } } @@ -175,7 +176,7 @@ public abstract class OptionsConfigurationBlock { private Shell fShell; private final IWorkingCopyManager fManager; - private IWorkbenchPreferenceContainer fContainer; + private final IWorkbenchPreferenceContainer fContainer; private Map fDisabledProjectSettings; // null when project specific settings are turned off @@ -380,6 +381,30 @@ public abstract class OptionsConfigurationBlock { return checkBox; } + protected Button addRadioButton(Composite parent, String label, Key key, String[] values, int indent) { + ControlData data= new ControlData(key, values); + + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan= 3; + gd.horizontalIndent= indent; + + Button radioButton= new Button(parent, SWT.RADIO); + radioButton.setFont(JFaceResources.getDialogFont()); + radioButton.setText(label); + radioButton.setData(data); + radioButton.setLayoutData(gd); + radioButton.addSelectionListener(getSelectionListener()); + + makeScrollableCompositeAware(radioButton); + + String currValue= getValue(key); + radioButton.setSelection(data.getSelection(currValue) == 0); + + fCheckBoxes.add(radioButton); + + return radioButton; + } + protected Combo addComboBox(Composite parent, String label, Key key, String[] values, String[] valueLabels, int indent) { GridData gd= new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1); @@ -481,6 +506,14 @@ public abstract class OptionsConfigurationBlock { return textBox; } + protected Composite addSubsection(Composite parent, String label) { + Group group= new Group(parent, SWT.SHADOW_NONE); + group.setText(label); + GridData data= new GridData(SWT.FILL, SWT.CENTER, true, false); + group.setLayoutData(data); + return group; + } + protected ScrolledPageContent getParentScrolledComposite(Control control) { Control parent= control.getParent(); while (!(parent instanceof ScrolledPageContent) && parent != null) { @@ -556,8 +589,10 @@ public abstract class OptionsConfigurationBlock { protected SelectionListener getSelectionListener() { if (fSelectionListener == null) { fSelectionListener= new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent e) {} + @Override public void widgetSelected(SelectionEvent e) { controlChanged(e.widget); } @@ -569,6 +604,7 @@ public abstract class OptionsConfigurationBlock { protected ModifyListener getTextModifyListener() { if (fTextModifyListener == null) { fTextModifyListener= new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { textChanged((Text) e.widget); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java index e3acfd7d5b0..d13d3b4a88a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java @@ -22,7 +22,6 @@ import org.eclipse.jface.util.PropertyChangeEvent; */ public class OverlayPreferenceStore implements IPreferenceStore { - public static final class TypeDescriptor { protected TypeDescriptor() { } @@ -36,7 +35,6 @@ public class OverlayPreferenceStore implements IPreferenceStore { public static final TypeDescriptor STRING= new TypeDescriptor(); public static class OverlayKey { - TypeDescriptor fDescriptor; String fKey; @@ -47,10 +45,7 @@ public class OverlayPreferenceStore implements IPreferenceStore { } private class PropertyListener implements IPropertyChangeListener { - - /* - * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent event) { OverlayKey key= findOverlayKey(event.getProperty()); if (key != null) @@ -58,14 +53,12 @@ public class OverlayPreferenceStore implements IPreferenceStore { } } - protected IPreferenceStore fParent; protected IPreferenceStore fStore; private OverlayKey[] fOverlayKeys; private boolean fLoaded; private PropertyListener fPropertyListener; - public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) { fParent= parent; fOverlayKeys= overlayKeys; @@ -85,7 +78,6 @@ public class OverlayPreferenceStore implements IPreferenceStore { } protected void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) { - if (orgin.isDefault(key.fKey)) { if (!target.isDefault(key.fKey)) target.setToDefault(key.fKey); @@ -94,47 +86,35 @@ public class OverlayPreferenceStore implements IPreferenceStore { TypeDescriptor d= key.fDescriptor; if (BOOLEAN == d) { - boolean originValue= orgin.getBoolean(key.fKey); boolean targetValue= target.getBoolean(key.fKey); if (targetValue != originValue) target.setValue(key.fKey, originValue); - } else if (DOUBLE == d) { - double originValue= orgin.getDouble(key.fKey); double targetValue= target.getDouble(key.fKey); if (targetValue != originValue) target.setValue(key.fKey, originValue); - } else if (FLOAT == d) { - float originValue= orgin.getFloat(key.fKey); float targetValue= target.getFloat(key.fKey); if (targetValue != originValue) target.setValue(key.fKey, originValue); - } else if (INT == d) { - int originValue= orgin.getInt(key.fKey); int targetValue= target.getInt(key.fKey); if (targetValue != originValue) target.setValue(key.fKey, originValue); - } else if (LONG == d) { - long originValue= orgin.getLong(key.fKey); long targetValue= target.getLong(key.fKey); if (targetValue != originValue) target.setValue(key.fKey, originValue); - } else if (STRING == d) { - String originValue= orgin.getString(key.fKey); String targetValue= target.getString(key.fKey); if (targetValue != null && originValue != null && !targetValue.equals(originValue)) target.setValue(key.fKey, originValue); - } } @@ -146,47 +126,35 @@ public class OverlayPreferenceStore implements IPreferenceStore { private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) { TypeDescriptor d= key.fDescriptor; if (BOOLEAN == d) { - if (forceInitialization) target.setValue(key.fKey, true); target.setValue(key.fKey, orgin.getBoolean(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey)); - } else if (DOUBLE == d) { - if (forceInitialization) target.setValue(key.fKey, 1.0D); target.setValue(key.fKey, orgin.getDouble(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey)); - } else if (FLOAT == d) { - if (forceInitialization) target.setValue(key.fKey, 1.0F); target.setValue(key.fKey, orgin.getFloat(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey)); - } else if (INT == d) { - if (forceInitialization) target.setValue(key.fKey, 1); target.setValue(key.fKey, orgin.getInt(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey)); - } else if (LONG == d) { - if (forceInitialization) target.setValue(key.fKey, 1L); target.setValue(key.fKey, orgin.getLong(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey)); - } else if (STRING == d) { - if (forceInitialization) target.setValue(key.fKey, "1"); //$NON-NLS-1$ target.setValue(key.fKey, orgin.getString(key.fKey)); target.setDefault(key.fKey, orgin.getDefaultString(key.fKey)); - } } @@ -216,238 +184,174 @@ public class OverlayPreferenceStore implements IPreferenceStore { } } - /* - * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener) - */ + @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { fStore.addPropertyChangeListener(listener); } - /* - * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener) - */ + @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { fStore.removePropertyChangeListener(listener); } - /* - * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object) - */ + @Override public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) { fStore.firePropertyChangeEvent(name, oldValue, newValue); } - /* - * @see IPreferenceStore#contains(String) - */ + @Override public boolean contains(String name) { return fStore.contains(name); } - /* - * @see IPreferenceStore#getBoolean(String) - */ + @Override public boolean getBoolean(String name) { return fStore.getBoolean(name); } - /* - * @see IPreferenceStore#getDefaultBoolean(String) - */ + @Override public boolean getDefaultBoolean(String name) { return fStore.getDefaultBoolean(name); } - /* - * @see IPreferenceStore#getDefaultDouble(String) - */ + @Override public double getDefaultDouble(String name) { return fStore.getDefaultDouble(name); } - /* - * @see IPreferenceStore#getDefaultFloat(String) - */ + @Override public float getDefaultFloat(String name) { return fStore.getDefaultFloat(name); } - /* - * @see IPreferenceStore#getDefaultInt(String) - */ + @Override public int getDefaultInt(String name) { return fStore.getDefaultInt(name); } - /* - * @see IPreferenceStore#getDefaultLong(String) - */ + @Override public long getDefaultLong(String name) { return fStore.getDefaultLong(name); } - /* - * @see IPreferenceStore#getDefaultString(String) - */ + @Override public String getDefaultString(String name) { return fStore.getDefaultString(name); } - /* - * @see IPreferenceStore#getDouble(String) - */ + @Override public double getDouble(String name) { return fStore.getDouble(name); } - /* - * @see IPreferenceStore#getFloat(String) - */ + @Override public float getFloat(String name) { return fStore.getFloat(name); } - /* - * @see IPreferenceStore#getInt(String) - */ + @Override public int getInt(String name) { return fStore.getInt(name); } - /* - * @see IPreferenceStore#getLong(String) - */ + @Override public long getLong(String name) { return fStore.getLong(name); } - /* - * @see IPreferenceStore#getString(String) - */ + @Override public String getString(String name) { return fStore.getString(name); } - /* - * @see IPreferenceStore#isDefault(String) - */ + @Override public boolean isDefault(String name) { return fStore.isDefault(name); } - /* - * @see IPreferenceStore#needsSaving() - */ + @Override public boolean needsSaving() { return fStore.needsSaving(); } - /* - * @see IPreferenceStore#putValue(String, String) - */ + @Override public void putValue(String name, String value) { if (covers(name)) fStore.putValue(name, value); } - /* - * @see IPreferenceStore#setDefault(String, double) - */ + @Override public void setDefault(String name, double value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, float) - */ + @Override public void setDefault(String name, float value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, int) - */ + @Override public void setDefault(String name, int value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, long) - */ + @Override public void setDefault(String name, long value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, String) - */ + @Override public void setDefault(String name, String value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setDefault(String, boolean) - */ + @Override public void setDefault(String name, boolean value) { if (covers(name)) fStore.setDefault(name, value); } - /* - * @see IPreferenceStore#setToDefault(String) - */ + @Override public void setToDefault(String name) { fStore.setToDefault(name); } - /* - * @see IPreferenceStore#setValue(String, double) - */ + @Override public void setValue(String name, double value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, float) - */ + @Override public void setValue(String name, float value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, int) - */ + @Override public void setValue(String name, int value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, long) - */ + @Override public void setValue(String name, long value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, String) - */ + @Override public void setValue(String name, String value) { if (covers(name)) fStore.setValue(name, value); } - /* - * @see IPreferenceStore#setValue(String, boolean) - */ + @Override public void setValue(String name, boolean value) { if (covers(name)) fStore.setValue(name, value); @@ -480,6 +384,5 @@ public class OverlayPreferenceStore implements IPreferenceStore { if (fLoaded) load(); } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java deleted file mode 100644 index 1c520d468ef..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java +++ /dev/null @@ -1,576 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2008 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.preferences; - -import java.io.File; -import java.util.Set; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.IMessageProvider; -import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; - -/** - * @deprecated in CDT 8.0. This class appears to be never used. - */ -@Deprecated -public class PathEntryVariableDialog extends TitleAreaDialog { - - // UI widgets - private Button okButton; - - private Label variableNameLabel; - - private Label variableValueLabel; - - private Text variableNameField; - - private Text variableValueField; - - private Button fileButton; - - private Button folderButton; - - /** - * This dialog type: NEW_VARIABLE or - * EXISTING_VARIABLE. - */ - private int type; - - /** - * The type of variable that can be edited in this dialog. - * IResource.FILE or IResource.FOLDER - */ - private int variableType; - - /** - * The name of the variable being edited. - */ - private String variableName; - - /** - * The value of the variable being edited. - */ - private String variableValue; - - /** - * The original name of the variable being edited. It is used when testing - * if the current variable's name is already in use. - */ - private String originalName; - - /** - * Used to select the proper message depending on the current mode - * (new/existing variable). - */ - private boolean newVariable; - - /** - * Set of variable names currently in use. Used when warning the user that - * the currently selected name is already in use by another variable. - */ - private Set namesInUse; - - /** - * The current validation status. Its value can be one of the following:
    - *
  • IMessageProvider.NONE (default);
    • - *
  • IMessageProvider.WARNING;
    • - *
  • IMessageProvider.ERROR;
    • - *
- * Used when validating the user input. - */ - private int validationStatus; - - /** - * The current validation message generated by the last - * call to a validate method. - */ - private String validationMessage; - - /** - * Whether a variable name has been entered. - */ - private boolean nameEntered = false; - - /** - * Whether a variable location has been entered. - */ - private boolean locationEntered = false; - - /** - * The standard message to be shown when there are no problems being - * reported. - */ - final private String standardMessage; - - /** - * Constant for defining this dialog as intended to create a new variable - * (value = 1). - */ - public final static int NEW_VARIABLE = 1; - - /** - * Constant for defining this dialog as intended to edit an existing - * variable (value = 2). - */ - public final static int EXISTING_VARIABLE = 2; - - /** - * Constructs a dialog for editing a new/existing path variable. - * - * @param parentShell the parent shell - * @param type the dialog type: NEW_VARIABLE or - * EXISTING_VARIABLE - * @param variableType the type of variable that can be edited in - * this dialog. IResource.FILE or IResource.FOLDER - * @param namesInUse a set of variable names currently in use - */ - public PathEntryVariableDialog(Shell parentShell, int type, int variableType, Set namesInUse) { - super(parentShell); - this.type = type; - this.newVariable = type == NEW_VARIABLE; - this.variableName = ""; //$NON-NLS-1$ - this.variableValue = ""; //$NON-NLS-1$ - this.variableType = variableType; - this.namesInUse = namesInUse; - - if (newVariable) - this.standardMessage = PreferencesMessages.PathEntryVariableDialog_message_newVariable; - else - this.standardMessage = PreferencesMessages.PathEntryVariableDialog_message_existingVariable; - } - - /** - * Configures this dialog's shell, setting the shell's text. - * - * @see org.eclipse.jface.window.Window#configureShell(Shell) - */ - @Override - protected void configureShell(Shell shell) { - super.configureShell(shell); - if (newVariable) - shell.setText(PreferencesMessages.PathEntryVariableDialog_shellTitle_newVariable); - else - shell - .setText(PreferencesMessages.PathEntryVariableDialog_shellTitle_existingVariable); - } - - /** - * Creates and returns the contents of this dialog (except for the button bar). - * - * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea - */ - @Override - protected Control createDialogArea(Composite parent) { - // top level composite - Composite parentComposite = (Composite) super.createDialogArea(parent); - - // creates dialog area composite - Composite contents = createComposite(parentComposite); - - // creates and lay outs dialog area widgets - createWidgets(contents, parent.getFont()); - - // validate possibly already incorrect variable definitions - if (type == EXISTING_VARIABLE) { - nameEntered = locationEntered = true; - validateVariableValue(); - } - - return contents; - } - - /** - * Creates and configures this dialog's main composite. - * - * @param parentComposite parent's composite - * @return this dialog's main composite - */ - private Composite createComposite(Composite parentComposite) { - // creates a composite with standard margins and spacing - Composite contents = new Composite(parentComposite, SWT.NONE); - - FormLayout layout = new FormLayout(); - - layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); - layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); - - contents.setLayout(layout); - contents.setFont(parentComposite.getFont()); - - if (newVariable) - setTitle(PreferencesMessages.PathEntryVariableDialog_dialogTitle_newVariable); - else - setTitle(PreferencesMessages.PathEntryVariableDialog_dialogTitle_existingVariable); - setMessage(standardMessage); - return contents; - } - - /** - * Creates widgets for this dialog. - * - * @param parent the parent composite where to create widgets - * @param contents - */ - private void createWidgets(Composite contents, Font font) { - FormData data; - - String nameLabelText = PreferencesMessages.PathEntryVariableDialog_variableName; - String valueLabelText = PreferencesMessages.PathEntryVariableDialog_variableValue; - - // variable name label - variableNameLabel = new Label(contents, SWT.LEFT); - variableNameLabel.setText(nameLabelText); - - data = new FormData(); - variableNameLabel.setLayoutData(data); - variableNameLabel.setFont(font); - - // variable value label - variableValueLabel = new Label(contents, SWT.LEFT); - variableValueLabel.setText(valueLabelText); - - data = new FormData(); - data.top = new FormAttachment(variableNameLabel, - convertVerticalDLUsToPixels(10)); - variableValueLabel.setLayoutData(data); - variableValueLabel.setFont(font); - - // the larger label will be used in the left attachments for the fields - Label largerLabel = nameLabelText.length() > valueLabelText.length() ? variableNameLabel - : variableValueLabel; - - // variable name field - variableNameField = new Text(contents, SWT.SINGLE | SWT.BORDER); - variableNameField.setText(variableName); - - data = new FormData(); - data.width = convertWidthInCharsToPixels(50); - data.left = new FormAttachment(largerLabel, - convertHorizontalDLUsToPixels(5)); - variableNameField.setLayoutData(data); - variableNameField.setFont(font); - variableNameField.setFocus(); - - variableNameField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent event) { - variableNameModified(); - } - }); - - // variable value field - variableValueField = new Text(contents, SWT.SINGLE | SWT.BORDER); - variableValueField.setText(variableValue); - - data = new FormData(); - data.width = convertWidthInCharsToPixels(50); - data.left = new FormAttachment(largerLabel, - convertHorizontalDLUsToPixels(5)); - data.top = new FormAttachment(variableNameLabel, - convertVerticalDLUsToPixels(10)); - variableValueField.setLayoutData(data); - variableValueField.setFont(font); - - variableValueField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent event) { - variableValueModified(); - } - }); - - // select file path button - fileButton = new Button(contents, SWT.PUSH); - fileButton.setText(PreferencesMessages.PathEntryVariableDialog_file); - if ((variableType & IResource.FILE) == 0) - fileButton.setEnabled(false); - - data = setButtonFormLayoutData(fileButton); - data.top = new FormAttachment(variableNameLabel, - convertVerticalDLUsToPixels(10)); - data.left = new FormAttachment(variableValueField, - convertHorizontalDLUsToPixels(10)); - data.right = new FormAttachment(100, -5); - fileButton.setLayoutData(data); - fileButton.setFont(font); - - fileButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - selectFile(); - } - }); - - // select folder path button - folderButton = new Button(contents, SWT.PUSH); - folderButton.setText(PreferencesMessages.PathEntryVariableDialog_folder); - if ((variableType & IResource.FOLDER) == 0) - folderButton.setEnabled(false); - - data = setButtonFormLayoutData(folderButton); - data.top = new FormAttachment(variableValueLabel, - convertVerticalDLUsToPixels(10)); - data.left = new FormAttachment(variableValueField, - convertHorizontalDLUsToPixels(10)); - data.right = new FormAttachment(100, -5); - folderButton.setLayoutData(data); - folderButton.setFont(font); - - folderButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - selectFolder(); - } - }); - } - - /** - * Sets the FormData on the specified button to be one that is - * spaced for the current dialog page units. The method - * initializeDialogUnits must be called once before calling this - * method for the first time. - * - * @param button the button to set the FormData - * @return the FormData set on the specified button - */ - private FormData setButtonFormLayoutData(Button button) { - FormData data = new FormData(); - int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH); - data.width = Math.max(widthHint, button.computeSize(SWT.DEFAULT, - SWT.DEFAULT, true).x); - button.setLayoutData(data); - return data; - } - - /** - * Fires validations (variable name first) and updates enabled state for the - * "Ok" button accordingly. - */ - protected void variableNameModified() { - // updates and validates the variable name - variableName = variableNameField.getText().trim(); - validationStatus = IMessageProvider.NONE; - okButton.setEnabled(validateVariableName() && validateVariableValue()); - nameEntered = true; - } - - /** - * Fires validations (variable value first) and updates enabled state for the - * "Ok" button accordingly. - */ - protected void variableValueModified() { - // updates and validates the variable value - variableValue = variableValueField.getText().trim(); - validationStatus = IMessageProvider.NONE; - okButton.setEnabled(validateVariableValue() && validateVariableName()); - locationEntered = true; - } - - /** - * Opens a dialog where the user can select a folder path. - */ - protected void selectFolder() { - DirectoryDialog dialog = new DirectoryDialog(getShell()); - dialog.setText(PreferencesMessages.PathEntryVariableDialog_selectFolderTitle); - dialog.setMessage(PreferencesMessages.PathEntryVariableDialog_selectFolderMessage); - dialog.setFilterPath(variableValue); - String res = dialog.open(); - if (res != null) { - variableValue = new Path(res).makeAbsolute().toOSString(); - variableValueField.setText(variableValue); - } - } - - /** - * Opens a dialog where the user can select a file path. - */ - protected void selectFile() { - FileDialog dialog = new FileDialog(getShell()); - dialog.setText(PreferencesMessages.PathEntryVariableDialog_selectFileTitle); - dialog.setFilterPath(variableValue); - String res = dialog.open(); - if (res != null) { - variableValue = new Path(res).makeAbsolute().toOSString(); - variableValueField.setText(variableValue); - } - } - - /** - * Adds buttons to this dialog's button bar. - * - * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar - */ - @Override - protected void createButtonsForButtonBar(Composite parent) { - okButton = createButton(parent, IDialogConstants.OK_ID, - IDialogConstants.OK_LABEL, true); - okButton.setEnabled(type == EXISTING_VARIABLE); - - createButton(parent, IDialogConstants.CANCEL_ID, - IDialogConstants.CANCEL_LABEL, false); - } - - /** - * Validates the current variable name, and updates this dialog's message. - * - * @return true if the name is valid, false otherwise - */ - private boolean validateVariableName() { - boolean allowFinish = false; - - // if the current validationStatus is ERROR, no additional validation applies - if (validationStatus == IMessageProvider.ERROR) - return false; - - // assumes everything will be ok - String message = standardMessage; - int newValidationStatus = IMessageProvider.NONE; - - if (variableName.length() == 0) { - // the variable name is empty - if (nameEntered) { - // a name was entered before and is now empty - newValidationStatus = IMessageProvider.ERROR; - message = PreferencesMessages.PathEntryVariableDialog_variableNameEmptyMessage; - } - } else { - if (namesInUse.contains(variableName) - && !variableName.equals(originalName)) { - // the variable name is already in use - message = PreferencesMessages.PathEntryVariableDialog_variableAlreadyExistsMessage; - newValidationStatus = IMessageProvider.ERROR; - } else { - allowFinish = true; - } - } - - // overwrite the current validation status / message only if everything is ok (clearing them) - // or if we have a more serious problem than the current one - if (validationStatus == IMessageProvider.NONE - || newValidationStatus == IMessageProvider.ERROR) { - validationStatus = newValidationStatus; - validationMessage = message; - } - // only set the message here if it is not going to be set in - // validateVariableValue to avoid flashing. - if (allowFinish == false) - setMessage(validationMessage, validationStatus); - return allowFinish; - } - - /** - * Validates the current variable value, and updates this dialog's message. - * - * @return true if the value is valid, false otherwise - */ - private boolean validateVariableValue() { - boolean allowFinish = false; - - // if the current validationStatus is ERROR, no additional validation applies - if (validationStatus == IMessageProvider.ERROR) - return false; - - // assumes everything will be ok - String message = standardMessage; - int newValidationStatus = IMessageProvider.NONE; - - if (variableValue.length() == 0) { - // the variable value is empty - if (locationEntered) { - // a location value was entered before and is now empty - newValidationStatus = IMessageProvider.ERROR; - message = PreferencesMessages.PathEntryVariableDialog_variableValueEmptyMessage; - } - } else if (!Path.EMPTY.isValidPath(variableValue)) { - // the variable value is an invalid path - message = PreferencesMessages.PathEntryVariableDialog_variableValueInvalidMessage; - newValidationStatus = IMessageProvider.ERROR; - } else if (!new Path(variableValue).isAbsolute()) { - // the variable value is a relative path - message = PreferencesMessages.PathEntryVariableDialog_pathIsRelativeMessage; - newValidationStatus = IMessageProvider.ERROR; - } else if (!new File(variableValue).exists()) { - // the path does not exist (warning) - message = PreferencesMessages.PathEntryVariableDialog_pathDoesNotExistMessage; - newValidationStatus = IMessageProvider.WARNING; - allowFinish = true; - } else { - allowFinish = true; - } - - // overwrite the current validation status / message only if everything is ok (clearing them) - // or if we have a more serious problem than the current one - if (validationStatus == IMessageProvider.NONE - || newValidationStatus > validationStatus) { - validationStatus = newValidationStatus; - validationMessage = message; - } - setMessage(validationMessage, validationStatus); - return allowFinish; - } - - /** - * Returns the variable name. - * - * @return the variable name - */ - public String getVariableName() { - return variableName; - } - - /** - * Returns the variable value. - * - * @return the variable value - */ - public String getVariableValue() { - return variableValue; - } - - /** - * Sets the variable name. - * - * @param variableName the new variable name - */ - public void setVariableName(String variableName) { - this.variableName = variableName.trim(); - this.originalName = this.variableName; - } - - /** - * Sets the variable value. - * - * @param variableValue the new variable value - */ - public void setVariableValue(String variableValue) { - this.variableValue = variableValue; - } - - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java deleted file mode 100644 index 2298e730e32..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2008 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.preferences; - -import org.eclipse.core.resources.IResource; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.eclipse.ui.PlatformUI; - -import org.eclipse.cdt.internal.ui.ICHelpContextIds; - -/** - * @deprecated in CDT 8.0. This class appears to be never used. - */ -@Deprecated -public class PathEntryVariablePreferencePage extends PreferencePage -implements IWorkbenchPreferencePage { - - private Label topLabel; - - private PathEntryVariablesGroup pathEntryVariablesGroup; - - /** - * Constructs a preference page of path variables. - * Omits "Restore Defaults"/"Apply Changes" buttons. - */ - public PathEntryVariablePreferencePage() { - pathEntryVariablesGroup = new PathEntryVariablesGroup(true, IResource.FILE | IResource.FOLDER); - this.noDefaultAndApplyButton(); - } - - /** - * Resets this page's internal state and creates its UI contents. - * - * @see PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - @Override - protected Control createContents(Composite parent) { - Font font = parent.getFont(); - - PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.PATHENTRY_VARIABLES_PREFERENCE_PAGE); - - // define container & its gridding - Composite pageComponent = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.marginWidth = 0; - layout.marginHeight = 0; - pageComponent.setLayout(layout); - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - pageComponent.setLayoutData(data); - pageComponent.setFont(font); - - - topLabel = new Label(pageComponent, SWT.NONE); - topLabel.setText(PreferencesMessages.PathEntryVariablePreference_explanation); - data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - topLabel.setLayoutData(data); - topLabel.setFont(font); - - pathEntryVariablesGroup.createContents(pageComponent); - - return pageComponent; - } - - /** - * Creates a tab of one horizontal spans. - * - * @param parent the parent in which the tab should be created - */ - protected static void createSpace(Composite parent) { - Label vfiller = new Label(parent, SWT.LEFT); - GridData gridData = new GridData(); - gridData = new GridData(); - gridData.horizontalAlignment = GridData.BEGINNING; - gridData.grabExcessHorizontalSpace = false; - gridData.verticalAlignment = GridData.CENTER; - gridData.grabExcessVerticalSpace = false; - vfiller.setLayoutData(gridData); - } - - /** - * Disposes the path variables group. - * @see org.eclipse.jface.dialogs.IDialogPage#dispose() - */ - @Override - public void dispose() { - pathEntryVariablesGroup.dispose(); - super.dispose(); - } - - /** - * Empty implementation. This page does not use the workbench. - * - * @see IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - public void init(IWorkbench workbench) { - } - - /** - * Commits the temporary state to the path variable manager in response to user - * confirmation. - * - * @see PreferencePage#performOk() - */ - @Override - public boolean performOk() { - return pathEntryVariablesGroup.performOk(); - } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java deleted file mode 100644 index 9d25dcd2df5..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java +++ /dev/null @@ -1,564 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2008 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.preferences; - -import java.io.File; -import java.util.HashSet; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.Map.Entry; - -import org.eclipse.core.resources.IPathVariableManager; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.FontMetrics; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableItem; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.resources.IPathEntryVariableManager; - -import org.eclipse.cdt.internal.ui.CPluginImages; - -/** - * @deprecated in CDT 8.0. This class appears to be never used. - */ -@Deprecated -public class PathEntryVariablesGroup { - - /** - * Simple data structure that holds a path variable name/value pair. - */ - public static class PathEntryVariableElement { - public String name; - - public IPath path; - } - - // sizing constants - private static final int SIZING_SELECTION_PANE_WIDTH = 400; - - // parent shell - private Shell shell; - - private Label variableLabel; - - private Table variableTable; - - private Button addButton; - - private Button editButton; - - private Button removeButton; - - // used to compute layout sizes - private FontMetrics fontMetrics; - - // create a multi select table - private boolean multiSelect; - - // IResource.FILE and/or IResource.FOLDER - private int variableType; - - // External listener called when the table selection changes - protected Listener selectionListener; - - // temporary collection for keeping currently defined variables - private SortedMap tempPathVariables; - - // set of removed variables' names - private Set removedVariableNames; - - // reference to the workspace's path variable manager - private IPathEntryVariableManager pathEntryVariableManager; - - // file image - private final Image FILE_IMG = PlatformUI.getWorkbench().getSharedImages() - .getImage(ISharedImages.IMG_OBJ_FILE); - - // folder image - private final Image FOLDER_IMG = PlatformUI.getWorkbench() - .getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER); - - // unknown (non-existent) image. created locally, dispose locally - private Image imageUnkown; - - /** - * Creates a new PathVariablesGroup. - * - * @param multiSelect create a multi select tree - * @param variableType the type of variables that are displayed in - * the widget group. IResource.FILE and/or IResource.FOLDER - * logically ORed together. - */ - public PathEntryVariablesGroup(boolean multiSelect, int variableType) { - this.multiSelect = multiSelect; - this.variableType = variableType; - pathEntryVariableManager = CCorePlugin.getDefault().getPathEntryVariableManager(); - removedVariableNames = new HashSet(); - tempPathVariables = new TreeMap(); - // initialize internal model - initTemporaryState(); - } - - /** - * Creates a new PathVariablesGroup. - * - * @param multiSelect create a multi select tree - * @param variableType the type of variables that are displayed in - * the widget group. IResource.FILE and/or IResource.FOLDER - * logically ORed together. - * @param selectionListener listener notified when the selection changes - * in the variables list. - */ - public PathEntryVariablesGroup(boolean multiSelect, int variableType, - Listener selectionListener) { - this(multiSelect, variableType); - this.selectionListener = selectionListener; - } - - /** - * Opens a dialog for creating a new variable. - */ - protected void addNewVariable() { - // constructs a dialog for editing the new variable's current name and value - PathEntryVariableDialog dialog = new PathEntryVariableDialog(shell, - PathEntryVariableDialog.NEW_VARIABLE, variableType, tempPathVariables.keySet()); - - // opens the dialog - just returns if the user cancels it - if (dialog.open() == Window.CANCEL) - return; - - // otherwise, adds the new variable (or updates an existing one) in the - // temporary collection of currently defined variables - String newVariableName = dialog.getVariableName(); - IPath newVariableValue = new Path(dialog.getVariableValue()); - tempPathVariables.put(newVariableName, newVariableValue); - - // the UI must be updated - updateWidgetState(newVariableName); - } - - /** - * Creates the widget group. - * Callers must call dispose when the group is no - * longer needed. - * - * @param parent the widget parent - * @return container of the widgets - */ - public Control createContents(Composite parent) { - Font font = parent.getFont(); - - if (imageUnkown == null) { - ImageDescriptor descriptor = CPluginImages.DESC_OVR_WARNING; - imageUnkown = descriptor.createImage(); - } - initializeDialogUnits(parent); - shell = parent.getShell(); - - // define container & its layout - Composite pageComponent = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - layout.marginWidth = 0; - layout.marginHeight = 0; - pageComponent.setLayout(layout); - GridData data = new GridData(GridData.FILL_BOTH); - data.widthHint = SIZING_SELECTION_PANE_WIDTH; - pageComponent.setLayoutData(data); - pageComponent.setFont(font); - - // layout the table & its buttons - variableLabel = new Label(pageComponent, SWT.LEFT); - variableLabel.setText(PreferencesMessages.PathEntryVariablesBlock_variablesLabel); - data = new GridData(); - data.horizontalAlignment = GridData.FILL; - data.horizontalSpan = 2; - variableLabel.setLayoutData(data); - variableLabel.setFont(font); - - int tableStyle = SWT.BORDER | SWT.FULL_SELECTION; - if (multiSelect) { - tableStyle |= SWT.MULTI; - } - variableTable = new Table(pageComponent, tableStyle); - variableTable.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - updateEnabledState(); - if (selectionListener != null) - selectionListener.handleEvent(new Event()); - } - }); - data = new GridData(GridData.FILL_BOTH); - data.heightHint = variableTable.getItemHeight() * 7; - variableTable.setLayoutData(data); - variableTable.setFont(font); - - createButtonGroup(pageComponent); - // populate table with current internal state and set buttons' initial state - updateWidgetState(null); - - return pageComponent; - } - - /** - * Disposes the group's resources. - */ - public void dispose() { - if (imageUnkown != null) { - imageUnkown.dispose(); - imageUnkown = null; - } - } - - /** - * Opens a dialog for editing an existing variable. - * - * @see PathEntryVariableDialog - */ - protected void editSelectedVariable() { - // retrieves the name and value for the currently selected variable - TableItem item = variableTable.getItem(variableTable - .getSelectionIndex()); - String variableName = (String) item.getData(); - IPath variableValue = tempPathVariables.get(variableName); - - // constructs a dialog for editing the variable's current name and value - PathEntryVariableDialog dialog = new PathEntryVariableDialog(shell, - PathEntryVariableDialog.EXISTING_VARIABLE, variableType, tempPathVariables.keySet()); - dialog.setVariableName(variableName); - dialog.setVariableValue(variableValue.toOSString()); - - // opens the dialog - just returns if the user cancels it - if (dialog.open() == Window.CANCEL) - return; - - // the name can be changed, so we remove the current variable definition... - removedVariableNames.add(variableName); - tempPathVariables.remove(variableName); - - String newVariableName = dialog.getVariableName(); - IPath newVariableValue = new Path(dialog.getVariableValue()); - - // and add it again (maybe with a different name) - tempPathVariables.put(newVariableName, newVariableValue); - - // now we must refresh the UI state - updateWidgetState(newVariableName); - - } - - /** - * Returns the enabled state of the group's widgets. - * Returns true if called prior to calling - * createContents. - * - * @return boolean the enabled state of the group's widgets. - * true if called prior to calling createContents. - */ - public boolean getEnabled() { - if (variableTable != null && !variableTable.isDisposed()) { - return variableTable.getEnabled(); - } - return true; - } - - /** - * Returns the selected variables. - * - * @return the selected variables. Returns an empty array if - * the widget group has not been created yet by calling - * createContents - */ - public PathEntryVariableElement[] getSelection() { - if (variableTable == null) { - return new PathEntryVariableElement[0]; - } - TableItem[] items = variableTable.getSelection(); - PathEntryVariableElement[] selection = new PathEntryVariableElement[items.length]; - - for (int i = 0; i < items.length; i++) { - String name = (String) items[i].getData(); - selection[i] = new PathEntryVariableElement(); - selection[i].name = name; - selection[i].path = tempPathVariables.get(name); - } - return selection; - } - - /** - * Creates the add/edit/remove buttons - * - * @param parent the widget parent - */ - private void createButtonGroup(Composite parent) { - Font font = parent.getFont(); - Composite groupComponent = new Composite(parent, SWT.NULL); - GridLayout groupLayout = new GridLayout(); - groupLayout.marginWidth = 0; - groupLayout.marginHeight = 0; - groupComponent.setLayout(groupLayout); - GridData data = new GridData(); - data.verticalAlignment = GridData.FILL; - data.horizontalAlignment = GridData.FILL; - groupComponent.setLayoutData(data); - groupComponent.setFont(font); - - addButton = new Button(groupComponent, SWT.PUSH); - addButton.setText(PreferencesMessages.PathEntryVariablesBlock_addVariableButton); - addButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - addNewVariable(); - } - }); - addButton.setFont(font); - setButtonLayoutData(addButton); - - editButton = new Button(groupComponent, SWT.PUSH); - editButton.setText(PreferencesMessages.PathEntryVariablesBlock_editVariableButton); - editButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - editSelectedVariable(); - } - }); - editButton.setFont(font); - setButtonLayoutData(editButton); - - removeButton = new Button(groupComponent, SWT.PUSH); - removeButton.setText(PreferencesMessages.PathEntryVariablesBlock_removeVariableButton); - removeButton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - removeSelectedVariables(); - } - }); - removeButton.setFont(font); - setButtonLayoutData(removeButton); - } - - /** - * Initializes the computation of horizontal and vertical dialog units - * based on the size of current font. - *

- * This method must be called before setButtonLayoutData - * is called. - *

- * - * @param control a control from which to obtain the current font - */ - protected void initializeDialogUnits(Control control) { - // Compute and store a font metric - GC gc = new GC(control); - gc.setFont(control.getFont()); - fontMetrics = gc.getFontMetrics(); - gc.dispose(); - } - - /** - * (Re-)Initialize collections used to mantain temporary variable state. - */ - private void initTemporaryState() { - String[] varNames = pathEntryVariableManager.getVariableNames(); - - tempPathVariables.clear(); - for (String varName : varNames) { - IPath value = pathEntryVariableManager.getValue(varName); - - // the value may not exist any more - if (value != null) { - boolean isFile = value.toFile().isFile(); - if ((isFile && (variableType & IResource.FILE) != 0) - || (isFile == false && (variableType & IResource.FOLDER) != 0)) { - - tempPathVariables.put(varName, value); - } - } - } - removedVariableNames.clear(); - } - - /** - * Updates button enabled state, depending on the number of currently selected - * variables in the table. - */ - protected void updateEnabledState() { - int itemsSelectedCount = variableTable.getSelectionCount(); - editButton.setEnabled(itemsSelectedCount == 1); - removeButton.setEnabled(itemsSelectedCount > 0); - } - - /** - * Rebuilds table widget state with the current list of variables (reflecting - * any changes, additions and removals), and selects the item corresponding to - * the given variable name. If the variable name is null, the - * first item (if any) will be selected. - * - * @param selectedVarName the name for the variable to be selected (may be - * null) - * @see IPathVariableManager#getPathVariableNames() - * @see IPathVariableManager#getValue(String) - */ - private void updateVariableTable(String selectedVarName) { - variableTable.removeAll(); - int selectedVarIndex = 0; - for (String varName : tempPathVariables.keySet()) { - TableItem item = new TableItem(variableTable, SWT.NONE); - IPath value = tempPathVariables.get(varName); - File file = value.toFile(); - - item.setText(varName + " - " + value.toOSString()); //$NON-NLS-1$ - // the corresponding variable name is stored in each table widget item - item.setData(varName); - item.setImage(file.exists() ? (file.isFile() ? FILE_IMG - : FOLDER_IMG) : imageUnkown); - if (varName.equals(selectedVarName)) - selectedVarIndex = variableTable.getItemCount() - 1; - } - if (variableTable.getItemCount() > selectedVarIndex) { - variableTable.setSelection(selectedVarIndex); - if (selectionListener != null) - selectionListener.handleEvent(new Event()); - } else if (variableTable.getItemCount() == 0 - && selectionListener != null) - selectionListener.handleEvent(new Event()); - } - - /** - * Commits the temporary state to the path variable manager in response to user - * confirmation. - * - * @see IPathEntryVariableManager#setValue(String, IPath) - */ - public boolean performOk() { - try { - // first process removed variables - for (String removedVariableName : removedVariableNames) { - // only removes variables that have not been added again - if (!tempPathVariables.containsKey(removedVariableName)) - pathEntryVariableManager.setValue(removedVariableName, null); - } - - // then process the current collection of variables, adding/updating them - for (Entry entry : tempPathVariables.entrySet()) { - String variableName = entry.getKey(); - IPath variableValue = entry.getValue(); - pathEntryVariableManager.setValue(variableName, variableValue); - } - // re-initialize temporary state - initTemporaryState(); - - // performOk accepted - return true; - } catch (CoreException ce) { - ErrorDialog.openError(shell, null, null, ce.getStatus()); - } - return false; - } - - /** - * Removes the currently selected variables. - */ - protected void removeSelectedVariables() { - // remove each selected element - int[] selectedIndices = variableTable.getSelectionIndices(); - for (int selectedIndice : selectedIndices) { - TableItem selectedItem = variableTable.getItem(selectedIndice); - String varName = (String) selectedItem.getData(); - removedVariableNames.add(varName); - tempPathVariables.remove(varName); - } - updateWidgetState(null); - } - - /** - * Sets the GridData on the specified button to - * be one that is spaced for the current dialog page units. The - * method initializeDialogUnits must be called once - * before calling this method for the first time. - * - * @param button the button to set the GridData - * @return the GridData set on the specified button - */ - private GridData setButtonLayoutData(Button button) { - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - int widthHint = Dialog.convertHorizontalDLUsToPixels(fontMetrics, - IDialogConstants.BUTTON_WIDTH); - data.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, - SWT.DEFAULT, true).x); - button.setLayoutData(data); - return data; - } - - /** - * Sets the enabled state of the group's widgets. - * Does nothing if called prior to calling createContents. - * - * @param enabled the new enabled state of the group's widgets - */ - public void setEnabled(boolean enabled) { - if (variableTable != null && !variableTable.isDisposed()) { - variableLabel.setEnabled(enabled); - variableTable.setEnabled(enabled); - addButton.setEnabled(enabled); - if (enabled) - updateEnabledState(); - else { - editButton.setEnabled(enabled); - removeButton.setEnabled(enabled); - } - } - } - - /** - * Updates the widget's current state: refreshes the table with the current - * defined variables, selects the item corresponding to the given variable - * (selects the first item if null is provided) and updates - * the enabled state for the Add/Remove/Edit buttons. - * - * @param selectedVarName the name of the variable to be selected (may be null) - */ - private void updateWidgetState(String selectedVarName) { - updateVariableTable(selectedVarName); - updateEnabledState(); - } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java index bede9ca7141..edb73ab1c59 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java @@ -7,22 +7,18 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Sergey Prigogin, Google + * Sergey Prigogin (Google) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.InstanceScope; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ProjectScope; - import org.eclipse.ui.preferences.IWorkingCopyManager; - import org.osgi.service.prefs.BackingStoreException; /** @@ -57,9 +53,7 @@ public class PreferencesAccess { public void applyChanges() throws BackingStoreException { } - private static class WorkingCopyPreferencesAccess extends PreferencesAccess { - private final IWorkingCopyManager fWorkingCopyManager; private WorkingCopyPreferencesAccess(IWorkingCopyManager workingCopyManager) { @@ -85,9 +79,6 @@ public class PreferencesAccess { return getWorkingCopyScopeContext(super.getProjectScope(project)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.ui.preferences.PreferencesAccess#applyChanges() - */ @Override public void applyChanges() throws BackingStoreException { fWorkingCopyManager.applyChanges(); @@ -95,7 +86,6 @@ public class PreferencesAccess { } private static class WorkingCopyScopeContext implements IScopeContext { - private final IWorkingCopyManager fWorkingCopyManager; private final IScopeContext fOriginal; @@ -104,23 +94,17 @@ public class PreferencesAccess { fOriginal= original; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.IScopeContext#getName() - */ + @Override public String getName() { return fOriginal.getName(); } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.IScopeContext#getNode(java.lang.String) - */ + @Override public IEclipsePreferences getNode(String qualifier) { return fWorkingCopyManager.getWorkingCopy(fOriginal.getNode(qualifier)); } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation() - */ + @Override public IPath getLocation() { return fOriginal.getLocation(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java index 1e251f79c75..a4d76943d35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java @@ -151,35 +151,11 @@ public final class PreferencesMessages extends NLS { public static String BuildLogPreferencePage_LogLocation; public static String GlobalBuildLogPreferencePage_EnableLogging; public static String GlobalBuildLogPreferencePage_LogLocation; - public static String CEditorPreferencePage_folding_title; + public static String FoldingPreferencePage_folding_title; public static String FoldingConfigurationBlock_enable; public static String FoldingConfigurationBlock_combo_caption; public static String FoldingConfigurationBlock_info_no_preferences; public static String FoldingConfigurationBlock_error_not_exist; - public static String PathEntryVariablePreference_explanation; - public static String PathEntryVariableDialog_shellTitle_newVariable; - public static String PathEntryVariableDialog_shellTitle_existingVariable; - public static String PathEntryVariableDialog_dialogTitle_newVariable; - public static String PathEntryVariableDialog_dialogTitle_existingVariable; - public static String PathEntryVariableDialog_message_newVariable; - public static String PathEntryVariableDialog_message_existingVariable; - public static String PathEntryVariableDialog_variableName; - public static String PathEntryVariableDialog_variableValue; - public static String PathEntryVariableDialog_variableNameEmptyMessage; - public static String PathEntryVariableDialog_variableValueEmptyMessage; - public static String PathEntryVariableDialog_variableValueInvalidMessage; - public static String PathEntryVariableDialog_file; - public static String PathEntryVariableDialog_folder; - public static String PathEntryVariableDialog_selectFileTitle; - public static String PathEntryVariableDialog_selectFolderTitle; - public static String PathEntryVariableDialog_selectFolderMessage; - public static String PathEntryVariableDialog_variableAlreadyExistsMessage; - public static String PathEntryVariableDialog_pathIsRelativeMessage; - public static String PathEntryVariableDialog_pathDoesNotExistMessage; - public static String PathEntryVariablesBlock_variablesLabel; - public static String PathEntryVariablesBlock_addVariableButton; - public static String PathEntryVariablesBlock_editVariableButton; - public static String PathEntryVariablesBlock_removeVariableButton; public static String ProposalFilterPreferencesUtil_defaultFilterName; public static String CEditorPreferencePage_typing_tabTitle; @@ -218,6 +194,11 @@ public final class PreferencesMessages extends NLS { public static String CodeFormatterPreferencePage_title; public static String CodeFormatterPreferencePage_description; + public static String CodeStylePreferencePage_title; + public static String CodeStyleBlock_class_member_order; + public static String CodeStyleBlock_public_private; + public static String CodeStyleBlock_private_public; + public static String TodoTaskPreferencePage_title; public static String TodoTaskPreferencePage_description; public static String TodoTaskConfigurationBlock_markers_tasks_high_priority; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index 2d58dc54ac6..aa5574d29d8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -184,7 +184,7 @@ GlobalBuildLogPreferencePage_EnableLogging=Enable global build &logging GlobalBuildLogPreferencePage_LogLocation=Log &file location: #Folding -CEditorPreferencePage_folding_title= &Folding +FoldingPreferencePage_folding_title= &Folding FoldingConfigurationBlock_enable= Enable folding when &opening a new editor FoldingConfigurationBlock_combo_caption= Select folding to &use: @@ -224,9 +224,15 @@ CEditorPreferencePage_smartPaste=Adjust &indentation CEditorPreferencePage_typing_smartTab= &Tab key adjusts indentation of the current line CEditorPreferencePage_WorkspaceDefaultLabel=Workspace default: -# Code Formatting -CodeFormatterPreferencePage_title=Code Style -CodeFormatterPreferencePage_description=Sele&ct a profile: +# Code Formatter +CodeFormatterPreferencePage_title=Formatter +CodeFormatterPreferencePage_description=A&ctive profile: + +# Code Style +CodeStylePreferencePage_title=Code Style +CodeStyleBlock_class_member_order=Class member visiblity order: +CodeStyleBlock_public_private=P&ublic, protected, private +CodeStyleBlock_private_public=P&rivate, protected, public # Task tags. TodoTaskPreferencePage_title=Task Tags @@ -257,37 +263,6 @@ TodoTaskInputDialog_error_comma=Name cannot contain a comma. TodoTaskInputDialog_error_entryExists=An entry with the same name already exists. TodoTaskInputDialog_error_noSpace=Name cannot begin or end with a whitespace. -# --- Linked Resources --- -PathEntryVariablePreference_explanation = PathEntry variables. - -# The following six keys are marked as unused by the NLS search, but they are indirectly used -# and should be removed. -PathEntryVariableDialog_shellTitle_newVariable = New PathEntry Variable -PathEntryVariableDialog_shellTitle_existingVariable = Edit PathEntry Variable -PathEntryVariableDialog_dialogTitle_newVariable = Define a New PathEntry Variable -PathEntryVariableDialog_dialogTitle_existingVariable = Edit an Existing PathEntry Variable -PathEntryVariableDialog_message_newVariable = Enter a new PathEntry variable name and its associated location. -PathEntryVariableDialog_message_existingVariable = Edit PathEntry variable's name and path value. - -PathEntryVariableDialog_variableName = &Name: -PathEntryVariableDialog_variableValue = &Location: -PathEntryVariableDialog_variableNameEmptyMessage = You must provide a variable name. -PathEntryVariableDialog_variableValueEmptyMessage = You must provide a file or folder path as variable value. -PathEntryVariableDialog_variableValueInvalidMessage = The provided value is not a valid path. -PathEntryVariableDialog_file = &File... -PathEntryVariableDialog_folder = F&older... -PathEntryVariableDialog_selectFileTitle = File selection -PathEntryVariableDialog_selectFolderTitle = Folder selection -PathEntryVariableDialog_selectFolderMessage = Specify the folder to be represented by the variable. -PathEntryVariableDialog_variableAlreadyExistsMessage = This variable name is already in use. -PathEntryVariableDialog_pathIsRelativeMessage = Path must be absolute. -PathEntryVariableDialog_pathDoesNotExistMessage = Path does not exist. - -PathEntryVariablesBlock_variablesLabel = &Defined PathEntry variables: -PathEntryVariablesBlock_addVariableButton = &New... -PathEntryVariablesBlock_editVariableButton = Edi&t... -PathEntryVariablesBlock_removeVariableButton = &Remove - # Spelling SpellingPreferencePage_empty_threshold= A positive integer must be specified. SpellingPreferencePage_invalid_threshold=''{0}'' is not a valid positive integer. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java deleted file mode 100644 index 1edac3a6344..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java +++ /dev/null @@ -1,275 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2008 QnX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Qnx Software Systems - initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.preferences; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferenceConverter; -import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; -import org.eclipse.ui.texteditor.AbstractTextEditor; - -/** - * @deprecated Use {@link org.eclipse.cdt.internal.ui.editor.CSourceViewer} instead. - */ -@Deprecated -class PreviewSourceViewer extends SourceViewer implements IPropertyChangeListener { - - /** - * This viewer's foreground color. - * - * @since 3.0 - */ - private Color fForegroundColor; - - /** - * The viewer's background color. - * - * @since 3.0 - */ - private Color fBackgroundColor; - - /** - * This viewer's selection foreground color. - * - * @since 3.0 - */ - private Color fSelectionForegroundColor; - - /** - * The viewer's selection background color. - * - * @since 3.0 - */ - private Color fSelectionBackgroundColor; - - /** - * The preference store. - * - * @since 3.0 - */ - private IPreferenceStore fPreferenceStore; - - /** - * Is this source viewer configured? - * - * @since 3.0 - */ - private boolean fIsConfigured; - - public PreviewSourceViewer(Composite parent, int styles) { - super(parent, null, styles); - } - - protected void initializeViewerColors() { - if (fPreferenceStore != null) { - - StyledText styledText = getTextWidget(); - - // ----------- foreground color -------------------- - Color color = fPreferenceStore - .getBoolean(AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT) ? null - : createColor(fPreferenceStore, - AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND, - styledText.getDisplay()); - styledText.setForeground(color); - - if (fForegroundColor != null) - fForegroundColor.dispose(); - - fForegroundColor = color; - - // ---------- background color ---------------------- - color = fPreferenceStore - .getBoolean(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT) ? null - : createColor(fPreferenceStore, - AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND, - styledText.getDisplay()); - styledText.setBackground(color); - - if (fBackgroundColor != null) - fBackgroundColor.dispose(); - - fBackgroundColor = color; - - // ----------- selection foreground color -------------------- - color = fPreferenceStore - .getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR) ? null - : createColor( - fPreferenceStore, - AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_COLOR, - styledText.getDisplay()); - styledText.setSelectionForeground(color); - - if (fSelectionForegroundColor != null) - fSelectionForegroundColor.dispose(); - - fSelectionForegroundColor = color; - - // ---------- selection background color ---------------------- - color = fPreferenceStore - .getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR) ? null - : createColor( - fPreferenceStore, - AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_COLOR, - styledText.getDisplay()); - styledText.setSelectionBackground(color); - - if (fSelectionBackgroundColor != null) - fSelectionBackgroundColor.dispose(); - - fSelectionBackgroundColor = color; - } - } - - /* - * @see ISourceViewer#configure(SourceViewerConfiguration) - */ - @Override - public void configure(SourceViewerConfiguration configuration) { - - /* - * Prevent access to colors disposed in unconfigure(), see: - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=53641 - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86177 - */ - StyledText textWidget = getTextWidget(); - if (textWidget != null && !textWidget.isDisposed()) { - Color foregroundColor = textWidget.getForeground(); - if (foregroundColor != null && foregroundColor.isDisposed()) - textWidget.setForeground(null); - Color backgroundColor = textWidget.getBackground(); - if (backgroundColor != null && backgroundColor.isDisposed()) - textWidget.setBackground(null); - } - - super.configure(configuration); - - if (fPreferenceStore != null) { - fPreferenceStore.addPropertyChangeListener(this); - initializeViewerColors(); - } - - fIsConfigured = true; - } - - /* - * @see org.eclipse.jface.text.source.ISourceViewerExtension2#unconfigure() - * @since 3.0 - */ - @Override - public void unconfigure() { - if (fForegroundColor != null) { - fForegroundColor.dispose(); - fForegroundColor = null; - } - if (fBackgroundColor != null) { - fBackgroundColor.dispose(); - fBackgroundColor = null; - } - - if (fPreferenceStore != null) { - fPreferenceStore.removePropertyChangeListener(this); - } - - super.unconfigure(); - - fIsConfigured = false; - } - - /** - * Creates a color from the information stored in the given preference - * store. Returns null if there is no such information - * available. - * - * @param store - * the store to read from - * @param key - * the key used for the lookup in the preference store - * @param display - * the display used create the color - * @return the created color according to the specification in the - * preference store - * @since 3.0 - */ - private Color createColor(IPreferenceStore store, String key, - Display display) { - - RGB rgb = null; - - if (store.contains(key)) { - - if (store.isDefault(key)) - rgb = PreferenceConverter.getDefaultColor(store, key); - else - rgb = PreferenceConverter.getColor(store, key); - - if (rgb != null) - return new Color(display, rgb); - } - - return null; - } - - /** - * Sets the preference store on this viewer. - * - * @param store - * the preference store - * - * @since 3.0 - */ - public void setPreferenceStore(IPreferenceStore store) { - if (fIsConfigured && fPreferenceStore != null) { - fPreferenceStore.removePropertyChangeListener(this); - } - - fPreferenceStore = store; - - if (fIsConfigured && fPreferenceStore != null) { - fPreferenceStore.addPropertyChangeListener(this); - initializeViewerColors(); - } - } - - /* - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - String property = event.getProperty(); - if (AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND.equals(property) - || AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT - .equals(property) - || AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND - .equals(property) - || AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT - .equals(property) - || AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_COLOR - .equals(property) - || AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_FOREGROUND_DEFAULT_COLOR - .equals(property) - || AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_COLOR - .equals(property) - || AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SELECTION_BACKGROUND_DEFAULT_COLOR - .equals(property)) { - initializeViewerColors(); - } - } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java index 760a1b86481..69513c5c12f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java @@ -46,7 +46,6 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; public class ProjectSelectionDialog extends SelectionStatusDialog { - // the visual selection widget group private TableViewer fTableViewer; private Set fProjectsWithSpecifics; @@ -89,11 +88,13 @@ public class ProjectSelectionDialog extends SelectionStatusDialog { fTableViewer= new TableViewer(composite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { doSelectionChanged(((IStructuredSelection) event.getSelection()).toArray()); } }); fTableViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); } @@ -112,9 +113,11 @@ public class ProjectSelectionDialog extends SelectionStatusDialog { checkbox.setText(PreferencesMessages.ProjectSelectionDialog_filter); checkbox.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, true, false)); checkbox.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { updateFilter(((Button) e.widget).getSelection()); } + @Override public void widgetDefaultSelected(SelectionEvent e) { updateFilter(((Button) e.widget).getSelection()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java index 2bb8834c739..a7777017495 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporation - initial API and implementation - * Sergey Prigogin, Google - * Anton Leherbauer (Wind River Systems) + * IBM Corporation - initial API and implementation + * Sergey Prigogin (Google) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -54,7 +54,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.SelectionButtonDialogFie * Base for project property and preference pages */ public abstract class PropertyAndPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage { - private Control fConfigurationBlockControl; private ControlEnableState fBlockEnableState; private Link fChangeWorkspaceSettings; @@ -63,7 +62,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement private Composite fParentComposite; private IProject fProject; // project or null - private Map fData; // page data + private Map fData; // page data public static final String DATA_NO_LINK= "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$ @@ -77,11 +76,11 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement protected abstract Control createPreferenceContent(Composite composite); protected abstract boolean hasProjectSpecificOptions(IProject project); - protected abstract String getPreferencePageID(); - protected abstract String getPropertyPageID(); + protected abstract String getPreferencePageId(); + protected abstract String getPropertyPageId(); protected boolean supportsProjectSpecificOptions() { - return getPropertyPageID() != null; + return getPropertyPageId() != null; } protected boolean offerLink() { @@ -102,6 +101,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); IDialogFieldListener listener= new IDialogFieldListener() { + @Override public void dialogFieldChanged(DialogField field) { enableProjectSpecificSettings(((SelectionButtonDialogField)field).isSelected()); } @@ -162,10 +162,12 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement link.setFont(composite.getFont()); link.setText("" + text + ""); //$NON-NLS-1$//$NON-NLS-2$ link.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { doLinkActivated((Link) e.widget); } + @Override public void widgetDefaultSelected(SelectionEvent e) { doLinkActivated((Link) e.widget); } @@ -217,18 +219,17 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement } protected final void openWorkspacePreferences(Object data) { - String id= getPreferencePageID(); + String id= getPreferencePageId(); PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { id }, data).open(); } protected final void openProjectProperties(IProject project, Object data) { - String id= getPropertyPageID(); + String id= getPropertyPageId(); if (id != null) { PreferencesUtil.createPropertyDialogOn(getShell(), project, id, new String[] { id }, data).open(); } } - protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { fUseProjectSettings.setSelection(useProjectSpecificSettings); enablePreferenceContent(useProjectSpecificSettings); @@ -245,7 +246,6 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement fChangeWorkspaceSettings.setEnabled(!useProjectSettings()); } } - protected void setPreferenceContentStatus(IStatus status) { fBlockStatus= status; @@ -259,6 +259,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement */ protected IStatusChangeListener getNewStatusChangedListener() { return new IStatusChangeListener() { + @Override public void statusChanged(IStatus status) { setPreferenceContentStatus(status); } @@ -290,9 +291,6 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement } } - /* - * @see org.eclipse.jface.preference.IPreferencePage#performDefaults() - */ @Override protected void performDefaults() { if (useProjectSettings()) { @@ -306,34 +304,24 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement StatusUtil.applyToStatusLine(this, status); } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() - */ + @Override public IAdaptable getElement() { return fProject; } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable) - */ + @Override public void setElement(IAdaptable element) { fProject= (IProject) element.getAdapter(IResource.class); } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object) - */ @Override public void applyData(Object data) { if (data instanceof Map) { - fData= (Map) data; + fData= (Map) data; } if (fChangeWorkspaceSettings != null) { if (!offerLink()) { @@ -343,7 +331,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement } } - protected Map getData() { + protected Map getData() { return fData; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java index 3bb657f1709..c26dde76c76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SaveActionsPreferencePage.java @@ -51,9 +51,6 @@ public class SaveActionsPreferencePage extends AbstractPreferencePage { return keys; } - /* - * @see PreferencePage#createControl(Composite) - */ @Override public void createControl(Composite parent) { super.createControl(parent); @@ -61,14 +58,17 @@ public class SaveActionsPreferencePage extends AbstractPreferencePage { ICHelpContextIds.SAVE_ACTIONS_PREFERENCE_PAGE); } - // sets enabled flag for a control and all its sub-tree + /** + * Sets enabled flag for a control and all its sub-tree. + */ protected static void setEnabled(Control control, boolean enable) { control.setEnabled(enable); if (control instanceof Composite) { Composite composite = (Composite) control; Control[] children = composite.getChildren(); - for (Control element : children) + for (Control element : children) { setEnabled(element, enable); + } } } @@ -96,9 +96,6 @@ public class SaveActionsPreferencePage extends AbstractPreferencePage { return composite; } - /* - * @see PreferencePage#createContents(Composite) - */ @Override protected Control createContents(Composite parent) { fOverlayStore.load(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java index fe242e8720a..64477f479b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScalabilityPreferencePage.java @@ -9,10 +9,8 @@ * IBM Corporation - initial API and implementation * Anton Leherbauer (Wind River Systems) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; -import com.ibm.icu.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -40,14 +38,15 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.PlatformUI; +import com.ibm.icu.text.MessageFormat; + import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.utils.ui.controls.ControlFactory; import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.wizards.dialogfields.Separator; -public class ScalabilityPreferencePage extends PreferencePage implements - IWorkbenchPreferencePage { +public class ScalabilityPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { // Files with this number of lines will trigger scalability mode private IntegerFieldEditor fLinesToTrigger; @@ -64,14 +63,14 @@ public class ScalabilityPreferencePage extends PreferencePage implements private Button fContentAssistAutoActivation; - private Map fCheckBoxes= new HashMap(); + private final Map fCheckBoxes= new HashMap(); /** * List of master/slave listeners when there's a dependency. * * @see #createDependency(Button, String, Control) */ - private ArrayList fMasterSlaveListeners= new ArrayList(); + private final ArrayList fMasterSlaveListeners= new ArrayList(); public ScalabilityPreferencePage() { setPreferenceStore(PreferenceConstants.getPreferenceStore()); @@ -196,6 +195,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements fLinesToTrigger.load(); fLinesToTrigger.setPropertyChangeListener( new IPropertyChangeListener() { + @Override public void propertyChange( PropertyChangeEvent event ) { if ( event.getProperty().equals( FieldEditor.IS_VALID ) ) setValid( fLinesToTrigger.isValid() ); @@ -246,6 +246,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements } SelectionListener listener= new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { slave.setEnabled(!master.getSelection()); if (master.getSelection()) { @@ -253,6 +254,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements } } + @Override public void widgetDefaultSelected(SelectionEvent e) {} }; master.addSelectionListener(listener); @@ -262,6 +264,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements /* * @see IWorkbenchPreferencePage#init(IWorkbench) */ + @Override public void init(IWorkbench workbench) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java index ee241877e3a..1803b0e0213 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java @@ -7,7 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Sergey Prigogin, Google + * Sergey Prigogin (Google) * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -73,6 +73,7 @@ class SmartTypingConfigurationBlock extends AbstractConfigurationBlock { * @param parent the parent composite * @return the control for the preference page */ + @Override public Control createControl(Composite parent) { ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL); scrolled.setExpandHorizontal(true); @@ -190,10 +191,13 @@ class SmartTypingConfigurationBlock extends AbstractConfigurationBlock { String linkTooltip= PreferencesMessages.SmartTypingConfigurationBlock_tabs_message_tooltip; String text; String indentMode= CUIPlugin.getDefault().getCombinedPreferenceStore().getString(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR); - if (CCorePlugin.TAB.equals(indentMode)) - text= Messages.format(PreferencesMessages.SmartTypingConfigurationBlock_tabs_message_tab_text, Integer.toString(getTabDisplaySize())); - else - text= Messages.format(PreferencesMessages.SmartTypingConfigurationBlock_tabs_message_others_text, Integer.toString(getTabDisplaySize()), Integer.toString(getIndentSize()), getIndentMode()); + if (CCorePlugin.TAB.equals(indentMode)) { + text= Messages.format(PreferencesMessages.SmartTypingConfigurationBlock_tabs_message_tab_text, + Integer.toString(getTabDisplaySize())); + } else { + text= Messages.format(PreferencesMessages.SmartTypingConfigurationBlock_tabs_message_others_text, + Integer.toString(getTabDisplaySize()), Integer.toString(getIndentSize()), getIndentMode()); + } final Link link= new Link(composite, SWT.NONE); link.setText(text); @@ -204,13 +208,15 @@ class SmartTypingConfigurationBlock extends AbstractConfigurationBlock { link.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - PreferencesUtil.createPreferenceDialogOn(link.getShell(), "org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage", null, null); //$NON-NLS-1$ + PreferencesUtil.createPreferenceDialogOn(link.getShell(), + "org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage", null, null); //$NON-NLS-1$ } }); final IPreferenceStore combinedStore= CUIPlugin.getDefault().getCombinedPreferenceStore(); final IPropertyChangeListener propertyChangeListener= new IPropertyChangeListener() { private boolean fHasRun= false; + @Override public void propertyChange(PropertyChangeEvent event) { if (fHasRun) return; @@ -230,6 +236,7 @@ class SmartTypingConfigurationBlock extends AbstractConfigurationBlock { }; combinedStore.addPropertyChangeListener(propertyChangeListener); link.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(org.eclipse.swt.events.DisposeEvent e) { combinedStore.removePropertyChangeListener(propertyChangeListener); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java index ad3547c9d59..7cd63a3e92c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java @@ -6,57 +6,43 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM Corporatio - initial API and implementation - * Sergey Prigogin, Google + * IBM Corporation - initial API and implementation + * Sergey Prigogin (Google) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; + /** * The page for setting the editor options. */ public final class SmartTypingPreferencePage extends AbstractConfigurationBlockPreferencePage { - - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() - */ @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_TYPING_PAGE; } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() - */ @Override protected void setDescription() { String description= PreferencesMessages.CEditorPreferencePage_typing_tabTitle; setDescription(description); } - /* - * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() - */ @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } - @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } - /* - * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) - */ @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new SmartTypingConfigurationBlock(overlayPreferenceStore); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java index fd59f908d3f..93b57e3592d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java @@ -99,10 +99,12 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { */ protected static void createSelectionDependency(final Button master, final Control slave) { master.addSelectionListener(new SelectionListener() { + @Override public void widgetDefaultSelected(SelectionEvent event) { // Do nothing } + @Override public void widgetSelected(SelectionEvent event) { slave.setEnabled(master.getSelection()); } @@ -485,6 +487,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { // Redirect status messages from the field editor to the status change listener DialogPage fakePage= new DialogPage() { + @Override public void createControl(Composite c) { } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java index e9b96559e2c..5975c006cda 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingPreferenceBlock.java @@ -13,10 +13,8 @@ package org.eclipse.cdt.internal.ui.preferences; import org.eclipse.core.runtime.IStatus; - import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; - import org.eclipse.ui.texteditor.spelling.IPreferenceStatusMonitor; import org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock; @@ -31,12 +29,13 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.cdt.internal.ui.wizards.IStatusChangeListener#statusChanged(org.eclipse.core.runtime.IStatus) */ + @Override public void statusChanged(IStatus status) { } } private class StatusChangeListenerAdapter implements IStatusChangeListener { - private IPreferenceStatusMonitor fMonitor; + private final IPreferenceStatusMonitor fMonitor; private IStatus fStatus; @@ -48,6 +47,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.cdt.internal.ui.wizards.IStatusChangeListener#statusChanged(org.eclipse.core.runtime.IStatus) */ + @Override public void statusChanged(IStatus status) { fStatus= status; fMonitor.statusChanged(status); @@ -58,13 +58,14 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { } } - private SpellingConfigurationBlock fBlock= new SpellingConfigurationBlock(new NullStatusChangeListener(), null, null); + private final SpellingConfigurationBlock fBlock= new SpellingConfigurationBlock(new NullStatusChangeListener(), null, null); private SpellingPreferenceBlock.StatusChangeListenerAdapter fStatusMonitor; /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public Control createControl(Composite parent) { return fBlock.createContents(parent); } @@ -72,6 +73,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#initialize(org.eclipse.ui.texteditor.spelling.IPreferenceStatusMonitor) */ + @Override public void initialize(IPreferenceStatusMonitor statusMonitor) { fStatusMonitor= new StatusChangeListenerAdapter(statusMonitor); fBlock.fContext= fStatusMonitor; @@ -80,6 +82,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#canPerformOk() */ + @Override public boolean canPerformOk() { return fStatusMonitor == null || fStatusMonitor.getStatus() == null || !fStatusMonitor.getStatus().matches(IStatus.ERROR); } @@ -87,6 +90,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performOk() */ + @Override public void performOk() { fBlock.performOk(); } @@ -94,6 +98,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performDefaults() */ + @Override public void performDefaults() { fBlock.performDefaults(); } @@ -101,6 +106,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#performRevert() */ + @Override public void performRevert() { fBlock.performRevert(); } @@ -108,6 +114,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#dispose() */ + @Override public void dispose() { fBlock.dispose(); } @@ -115,6 +122,7 @@ public class SpellingPreferenceBlock implements ISpellingPreferenceBlock { /* * @see org.eclipse.ui.texteditor.spelling.ISpellingPreferenceBlock#setEnabled(boolean) */ + @Override public void setEnabled(boolean enabled) { fBlock.setEnabled(enabled); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java index c21e4a63d30..e5baa229c6f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation * Sergey Prigogin (Google) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; @@ -88,12 +87,14 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object element, int columnIndex) { TodoTask task = (TodoTask) element; if (columnIndex == 0) { @@ -116,6 +117,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) */ + @Override public Font getFont(Object element) { if (isDefaultTask((TodoTask) element)) { return JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT); @@ -138,8 +140,8 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { private static final int IDX_DEFAULT = 4; private IStatus fTaskTagsStatus; - private ListDialogField fTodoTasksList; - private SelectionButtonDialogField fCaseSensitiveCheckBox; + private final ListDialogField fTodoTasksList; + private final SelectionButtonDialogField fCaseSensitiveCheckBox; public TodoTaskConfigurationBlock(IStatusChangeListener context, IProject project, IWorkbenchPreferenceContainer container) { @@ -212,22 +214,26 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { return selectedElements.size() == 1 && !isDefaultTask(selectedElements.get(0)); } + @Override public void customButtonPressed(ListDialogField field, int index) { doTodoButtonPressed(index); } + @Override public void selectionChanged(ListDialogField field) { List selectedElements = field.getSelectedElements(); field.enableButton(IDX_EDIT, canEdit(selectedElements)); field.enableButton(IDX_DEFAULT, canSetToDefault(selectedElements)); } + @Override public void doubleClicked(ListDialogField field) { if (canEdit(field.getSelectedElements())) { doTodoButtonPressed(IDX_EDIT); } } + @Override public void dialogFieldChanged(DialogField field) { updateModel(field); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java index 18722bff8b0..9c12e60e321 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation * Sergey Prigogin (Google) *******************************************************************************/ - package org.eclipse.cdt.internal.ui.preferences; import java.util.ArrayList; @@ -40,15 +39,16 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField; public class TodoTaskInputDialog extends StatusDialog { private class CompilerTodoTaskInputAdapter implements IDialogFieldListener { + @Override public void dialogFieldChanged(DialogField field) { doValidation(); } } - private StringDialogField fNameDialogField; - private ComboDialogField fPriorityDialogField; + private final StringDialogField fNameDialogField; + private final ComboDialogField fPriorityDialogField; - private List fExistingNames; + private final List fExistingNames; public TodoTaskInputDialog(Shell parent, TodoTask task, List existingEntries) { super(parent); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java index 5e531edc05b..281f49bcbfc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java @@ -81,7 +81,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ @Override - protected String getPreferencePageID() { + protected String getPreferencePageId() { return PREF_ID; } @@ -89,7 +89,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ @Override - protected String getPropertyPageID() { + protected String getPropertyPageId() { // TODO: Project specific settings are not supported yet. // return PROP_ID; return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java index 18ec57843f5..66778e4fb0c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java @@ -35,10 +35,9 @@ import org.eclipse.cdt.ui.CUIPlugin; * Preference page for work in progress. */ public class WorkInProgressPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - - private List