From ed8b3356ad957115c81ff22e800924869d532638 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 1 Nov 2011 18:32:57 -0700 Subject: [PATCH] Added missing @Override annotations. --- .../core/dom/ast/IASTLiteralExpression.java | 20 ++--- .../parser/cpp/CPPASTCompoundStatement.java | 80 ++++++++++--------- 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java index bbce9799508..86e6b25e52b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java @@ -1,13 +1,13 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 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 - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2004, 2011 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 + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Doug Schaefer (IBM) - Initial API and implementation - * Markus Schorn (Wind River Systems) + * Contributors: + * Doug Schaefer (IBM) - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.core.dom.ast; @@ -18,7 +18,6 @@ package org.eclipse.cdt.core.dom.ast; * @noextend This interface is not intended to be extended by clients. */ public interface IASTLiteralExpression extends IASTExpression { - /** * An integer literal e.g. 5 */ @@ -79,6 +78,7 @@ public interface IASTLiteralExpression extends IASTExpression { * Returns the value of the literal as string. * @since 5.1 */ + @Override public String toString(); /** @@ -95,11 +95,13 @@ public interface IASTLiteralExpression extends IASTExpression { /** * @since 5.1 */ + @Override public IASTLiteralExpression copy(); /** * @since 5.3 */ + @Override public IASTLiteralExpression copy(CopyStyle style); /** 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 0ffd9be7e1f..4eb7e05307f 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 @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM - Initial API and implementation + * IBM - Initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; @@ -23,17 +23,17 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; /** * @author jcamelon */ -public class CPPASTCompoundStatement extends ASTNode implements - IASTCompoundStatement, IASTAmbiguityParent { +public class CPPASTCompoundStatement extends ASTNode + implements IASTCompoundStatement, IASTAmbiguityParent { + private IASTStatement[] statements = new IASTStatement[2]; + private ICPPScope scope; - private IASTStatement [] statements = new IASTStatement[2]; - private ICPPScope scope = null; - - - public CPPASTCompoundStatement copy() { + @Override + public CPPASTCompoundStatement copy() { return copy(CopyStyle.withoutLocations); } + @Override public CPPASTCompoundStatement copy(CopyStyle style) { CPPASTCompoundStatement copy = new CPPASTCompoundStatement(); for (IASTStatement statement : getStatements()) @@ -45,57 +45,61 @@ public class CPPASTCompoundStatement extends ASTNode implements return copy; } - public IASTStatement[] getStatements() { - if( statements == null ) return IASTStatement.EMPTY_STATEMENT_ARRAY; - return (IASTStatement[]) ArrayUtil.trim( IASTStatement.class, statements ); + @Override + public IASTStatement[] getStatements() { + if (statements == null) + return IASTStatement.EMPTY_STATEMENT_ARRAY; + return (IASTStatement[]) 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 = (IASTStatement[]) ArrayUtil.append(IASTStatement.class, statements, statement); if (statement != null) { statement.setParent(this); statement.setPropertyInParent(NESTED_STATEMENT); } } - public IScope getScope() { - if( scope == null ) - scope = new CPPBlockScope( this ); + @Override + public IScope getScope() { + if (scope == null) + scope = new CPPBlockScope(this); return scope; } @Override - public boolean accept( ASTVisitor action ){ - if( action.shouldVisitStatements ){ - switch( action.visit( this ) ){ - case ASTVisitor.PROCESS_ABORT : return false; - case ASTVisitor.PROCESS_SKIP : return true; - default : break; + public boolean accept(ASTVisitor action) { + if (action.shouldVisitStatements) { + switch (action.visit(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } - IASTStatement [] s = getStatements(); - for ( int i = 0; i < s.length; i++ ) { - if( !s[i].accept( action ) ) return false; + IASTStatement[] s = getStatements(); + for (int i = 0; i < s.length; i++) { + if (!s[i].accept(action)) + return false; } - if( action.shouldVisitStatements ){ - switch( action.leave( this ) ){ - case ASTVisitor.PROCESS_ABORT : return false; - case ASTVisitor.PROCESS_SKIP : return true; - default : break; + if (action.shouldVisitStatements) { + switch (action.leave(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } return true; } - public void replace(IASTNode child, IASTNode other) { - if( statements == null ) return; - for( int i = 0; i < statements.length; ++i ) - { - if( statements[i] == child ) - { - other.setParent( statements[i].getParent() ); - other.setPropertyInParent( statements[i].getPropertyInParent() ); + @Override + public void replace(IASTNode child, IASTNode other) { + if (statements == null) return; + for (int i = 0; i < statements.length; ++i) { + if (statements[i] == child) { + other.setParent(statements[i].getParent()); + other.setPropertyInParent(statements[i].getPropertyInParent()); statements[i] = (IASTStatement) other; } }