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 592255ac337..bc4a3a3e8ca 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 @@ -211,7 +211,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType { int modifiers= 0; int kind; if (dense) { - kind= (firstByte & (ITypeMarshalBuffer.FLAG4-1))/ITypeMarshalBuffer.FLAG1; + kind= (firstByte & (ITypeMarshalBuffer.FLAG4 - 1)) / ITypeMarshalBuffer.FLAG1; } else { kind= buffer.getByte(); modifiers= buffer.getByte(); 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 338e683b912..0f2f9a6ad9f 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 @@ -796,12 +796,13 @@ public class CPPTemplates { IType[] exceptionSpecs= instantiateTypes(func.getExceptionSpecification(), tpMap, -1, within, point); if (decl instanceof ICPPFunctionTemplate) { - if (decl instanceof ICPPConstructor) + if (decl instanceof ICPPConstructor) { spec = new CPPConstructorTemplateSpecialization((ICPPConstructor) decl, owner, tpMap, type, exceptionSpecs); - else if (decl instanceof ICPPMethod) + } else if (decl instanceof ICPPMethod) { spec = new CPPMethodTemplateSpecialization((ICPPMethod) decl, owner, tpMap, type, exceptionSpecs); - else + } else { spec = new CPPFunctionTemplateSpecialization((ICPPFunctionTemplate) decl, owner, tpMap, type, exceptionSpecs); + } } else if (decl instanceof ICPPConstructor) { spec = new CPPConstructorSpecialization((ICPPConstructor) decl, owner, tpMap, type, exceptionSpecs); } else if (decl instanceof ICPPMethod) { @@ -1265,11 +1266,11 @@ public class CPPTemplates { } /** - * Checks whether a given name corresponds to a template declaration and returns the ast node for it. - * This works for the name of a template-definition and also for a name needed to qualify a member - * definition: + * Checks whether a given name corresponds to a template declaration and returns the AST node + * for it. This works for the name of a template-definition and also for a name needed to + * qualify a member definition: * 
-	 * template <typename T> void MyTemplate<T>::member() {}
+	 * template <typename T> void MyTemplate<T>::member() {}
 	 *
* @param name a name for which the corresponding template declaration is searched for. * @return the template declaration or null if name does not @@ -1614,10 +1615,11 @@ public class CPPTemplates { name = dtor.getName(); } else if (simple.getDeclarators().length == 0) { IASTDeclSpecifier spec = simple.getDeclSpecifier(); - if (spec instanceof ICPPASTCompositeTypeSpecifier) + if (spec instanceof ICPPASTCompositeTypeSpecifier) { name = ((ICPPASTCompositeTypeSpecifier) spec).getName(); - else if (spec instanceof ICPPASTElaboratedTypeSpecifier) + } else if (spec instanceof ICPPASTElaboratedTypeSpecifier) { name = ((ICPPASTElaboratedTypeSpecifier) spec).getName(); + } } } else if (nestedDecl instanceof IASTFunctionDefinition) { IASTDeclarator declarator = ((IASTFunctionDefinition) nestedDecl).getDeclarator(); @@ -1633,11 +1635,10 @@ public class CPPTemplates { if (currDecl == templateDecl) { return ns[j]; } - if (currDecl instanceof ICPPASTTemplateDeclaration) { - currDecl = ((ICPPASTTemplateDeclaration) currDecl).getDeclaration(); - } else { + if (!(currDecl instanceof ICPPASTTemplateDeclaration)) { return null; } + currDecl = ((ICPPASTTemplateDeclaration) currDecl).getDeclaration(); } } } else { @@ -2361,7 +2362,7 @@ public class CPPTemplates { public static boolean containsDependentArg(ObjectMap tpMap) { for (Object arg : tpMap.valueArray()) { - if (isDependentType((IType)arg)) + if (isDependentType((IType) arg)) return true; } return false; @@ -2395,9 +2396,9 @@ public class CPPTemplates { } } else if (!t.equals(owner)) { if (unknown instanceof ICPPUnknownClassType) { - result= new CPPUnknownClass((ICPPUnknownBinding)t, unknown.getNameCharArray()); + result= new CPPUnknownClass((ICPPUnknownBinding) t, unknown.getNameCharArray()); } else if (unknown instanceof IFunction) { - result= new CPPUnknownClass((ICPPUnknownBinding)t, unknown.getNameCharArray()); + result= new CPPUnknownClass((ICPPUnknownBinding) t, unknown.getNameCharArray()); } else { result= new CPPUnknownBinding((ICPPUnknownBinding) t, unknown.getNameCharArray()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexType.java index c037e381213..348ccf74905 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexType.java @@ -6,9 +6,8 @@ * 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.internal.core.index; import org.eclipse.cdt.core.dom.ast.IType; @@ -18,5 +17,4 @@ import org.eclipse.cdt.core.dom.ast.IType; * @since 4.0 */ public interface IIndexType extends IType { - } 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 2af5f563b82..92b9cc2a8a6 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 @@ -57,13 +57,13 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements ICPPClassSpecialization, IPDOMMemberOwner, IPDOMCPPClassType { private static final int FIRST_BASE = PDOMCPPSpecialization.RECORD_SIZE + 0; private static final int MEMBER_LIST = PDOMCPPSpecialization.RECORD_SIZE + 4; - + /** * The size in bytes of a PDOMCPPClassSpecialization record in the database. */ @SuppressWarnings("hiding") protected static final int RECORD_SIZE = PDOMCPPSpecialization.RECORD_SIZE + 8; - + private volatile ICPPClassScope fScope; private ObjectMap specializationMap; // Obtained from the synchronized PDOM cache private final ThreadLocal> fInProgress= new ThreadLocal>(); @@ -76,7 +76,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements public PDOMCPPClassSpecialization(PDOMLinkage linkage, long bindingRecord) { super(linkage, bindingRecord); } - + @Override protected int getRecordSize() { return RECORD_SIZE; @@ -91,14 +91,14 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements public ICPPClassType getSpecializedBinding() { return (ICPPClassType) super.getSpecializedBinding(); } - + @Override public IBinding specializeMember(IBinding original) { return specializeMember(original, null); } @Override - public IBinding specializeMember(IBinding original, IASTNode point) { + public IBinding specializeMember(IBinding original, IASTNode point) { if (specializationMap == null) { final Long key= record+PDOMCPPLinkage.CACHE_INSTANCE_SCOPE; Object cached= getPDOM().getCachedResult(key); @@ -124,14 +124,14 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements Set set; synchronized (specializationMap) { IBinding result= (IBinding) specializationMap.get(original); - if (result != null) + if (result != null) return result; set= fInProgress.get(); if (set == null) { set= new HashSet(); fInProgress.set(set); - } - if (!set.add(original)) + } + if (!set.add(original)) return new RecursionResolvingBinding(null, null); } IBinding newSpec= CPPTemplates.createSpecialization(this, original, point); @@ -154,7 +154,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements if (hasOwnScope()) { fScope= new PDOMCPPClassScope(this); return fScope; - } + } } catch (CoreException e) { } fScope= new PDOMCPPClassSpecializationScope(this); @@ -175,14 +175,14 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements long rec = base != null ? base.getRecord() : 0; getDB().putRecPtr(record + FIRST_BASE, rec); } - + public void addBase(PDOMCPPBase base) throws CoreException { getPDOM().removeCachedResult(record+PDOMCPPLinkage.CACHE_BASES); PDOMCPPBase firstBase = getFirstBase(); base.setNextBase(firstBase); setFirstBase(base); } - + public void removeBase(PDOMName pdomName) throws CoreException { getPDOM().removeCachedResult(record+PDOMCPPLinkage.CACHE_BASES); PDOMCPPBase base= getFirstBase(); @@ -205,7 +205,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements base.delete(); } } - + @Override public ICPPBase[] getBases() { return getBases(null); @@ -217,11 +217,11 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements if (scope instanceof ICPPClassSpecializationScope) { return ((ICPPClassSpecializationScope) scope).getBases(point); } - + // This is an explicit specialization Long key= record + PDOMCPPLinkage.CACHE_BASES; ICPPBase[] bases= (ICPPBase[]) getPDOM().getCachedResult(key); - if (bases != null) + if (bases != null) return bases; try { @@ -238,7 +238,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } return ICPPBase.EMPTY_BASE_ARRAY; } - + @Override public ICPPConstructor[] getConstructors() { return getConstructors(null); @@ -291,7 +291,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { return ((ICPPClassSpecializationScope) scope).getDeclaredFields(point); - } + } try { PDOMClassUtil.FieldCollector visitor = new PDOMClassUtil.FieldCollector(); PDOMCPPClassScope.acceptViaCache(this, visitor, false); @@ -301,18 +301,18 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return ICPPField.EMPTY_CPPFIELD_ARRAY; } } - + @Override public ICPPClassType[] getNestedClasses() { return getNestedClasses(null); } - + @Override public ICPPClassType[] getNestedClasses(IASTNode point) { IScope scope= getCompositeScope(); if (scope instanceof ICPPClassSpecializationScope) { return ((ICPPClassSpecializationScope) scope).getNestedClasses(point); - } + } try { PDOMClassUtil.NestedClassCollector visitor = new PDOMClassUtil.NestedClassCollector(); PDOMCPPClassScope.acceptViaCache(this, visitor, false); @@ -335,7 +335,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements } @Override - public ICPPMethod[] getMethods() { + public ICPPMethod[] getMethods() { return ClassTypeHelper.getMethods(this); } @@ -343,12 +343,12 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements 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); @@ -380,7 +380,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return CPPClassSpecialization.isSameClassSpecialization(this, (ICPPClassSpecialization) type); } - + @Override public Object clone() { try { @@ -406,7 +406,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements public void accept(IPDOMVisitor visitor) throws CoreException { 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/PDOMCPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java index ccde7a87f8a..c3fd0884c7a 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 @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn (Wind River Systems) - initial API and implementation + * Markus Schorn (Wind River Systems) - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.CoreException; * serves as a base for unknown types. */ class PDOMCPPUnknownBinding extends PDOMCPPBinding implements ICPPUnknownBinding { - @SuppressWarnings("hiding") protected static final int RECORD_SIZE = PDOMCPPBinding.RECORD_SIZE; 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 272deb85c00..ffa71595578 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 @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Sergey Prigogin (Google) - initial API and implementation - * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -31,7 +31,6 @@ import org.eclipse.core.runtime.CoreException; * @author Sergey Prigogin */ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICPPUnknownClassInstance, IPDOMOverloader { - private static final int ARGUMENTS = PDOMCPPUnknownClassType.RECORD_SIZE + 0; private static final int SIGNATURE_HASH = ARGUMENTS + 4; @@ -54,7 +53,6 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP db.putInt(record + SIGNATURE_HASH, sigHash != null ? sigHash.intValue() : 0); } catch (DOMException e) { } - } public PDOMCPPUnknownClassInstance(PDOMLinkage linkage, long bindingRecord) { @@ -80,7 +78,7 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP public ICPPTemplateArgument[] getArguments() { if (arguments == null) { try { - final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS); + final long rec= getPDOM().getDB().getRecPtr(record + ARGUMENTS); arguments= PDOMCPPArgumentList.getArguments(this, rec); } catch (CoreException e) { CCorePlugin.log(e); 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 32f96933696..b6e68938324 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 @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Sergey Prigogin (Google) - initial API and implementation - * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp; @@ -45,9 +45,8 @@ import org.eclipse.core.runtime.CoreException; /** * @author Sergey Prigogin */ -class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClassScope, ICPPUnknownClassType, - IPDOMMemberOwner, IIndexType, IIndexScope { - +class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding + implements ICPPClassScope, ICPPUnknownClassType, IPDOMMemberOwner, IIndexType, IIndexScope { private static final int KEY = PDOMCPPBinding.RECORD_SIZE + 0; // byte private static final int MEMBERLIST = PDOMCPPBinding.RECORD_SIZE + 4; @SuppressWarnings("hiding") @@ -59,7 +58,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass super(linkage, parent, classType); setKind(classType); - // linked list is initialized by storage being zero'd by malloc + // Linked list is initialized by storage being zero'd by malloc } public PDOMCPPUnknownClassType(PDOMLinkage linkage, long bindingRecord) { @@ -245,7 +244,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass } /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) + * @see IType#isSameType(IType) */ @Override public boolean isSameType(IType type) { @@ -263,8 +262,8 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass } if (type instanceof ICPPUnknownClassType - && type instanceof ICPPUnknownClassInstance == false - && type instanceof ICPPDeferredClassInstance == false) { + && !(type instanceof ICPPUnknownClassInstance) + && !(type instanceof ICPPDeferredClassInstance)) { ICPPUnknownClassType rhs= (ICPPUnknownClassType) type; if (CharArrayUtils.equals(getNameCharArray(), rhs.getNameCharArray())) { final IBinding lhsContainer = getOwner(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownScope.java index 84c07283f7e..77ed17ec565 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownScope.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation - * Sergey Prigogin (Google) + * Markus Schorn - initial API and implementation + * Sergey Prigogin (Google) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom.cpp;