diff --git a/core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.core.prefs index ceb4ffa42ce..a8437783b7d 100644 --- a/core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.core.prefs +++ b/core/org.eclipse.cdt.core/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,81 @@ -#Fri Dec 28 14:46:56 EST 2007 +#Wed Apr 09 13:24:35 CEST 2008 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 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.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=error +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=warning +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.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +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=warning +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=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +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 diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java index ba1d6e45bfe..d8adbd220f1 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/AllTypesCache.java @@ -53,6 +53,7 @@ public class AllTypesCache { IIndexBinding[] all = index.findBindings(Pattern.compile(".*"), false, new IndexFilter() { //$NON-NLS-1$ + @Override public boolean acceptBinding(IBinding binding) { return IndexModelUtil.bindingHasCElementType(binding, kinds); }}, 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 84c4b10000b..b4e42044e18 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 @@ -283,6 +283,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return (val.getSeverity() != IStatus.ERROR); } + @Override public int hashCode() { if (fHashCode == 0) { fHashCode = HASH_INIT; @@ -293,6 +294,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return fHashCode; } + @Override public String toString() { return getFullyQualifiedName(); } @@ -345,6 +347,7 @@ public class QualifiedTypeName implements IQualifiedTypeName { return result; } + @Override public boolean equals(Object obj) { if (obj == 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 af0b38eb273..c308dcc7ba9 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 @@ -207,6 +207,7 @@ public class TypeInfo implements ITypeInfo return null; } + @Override public String toString() { return fQualifiedName.toString(); } @@ -225,6 +226,7 @@ public class TypeInfo implements ITypeInfo return false; } + @Override public int hashCode() { int hashCode = fQualifiedName.hashCode() + fElementType; ICProject project = getEnclosingProject(); @@ -233,6 +235,7 @@ public class TypeInfo implements ITypeInfo return hashCode; } + @Override public boolean equals(Object obj) { if (obj == this) { return true; 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 b0003d4c324..52912f07fc3 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 @@ -213,6 +213,7 @@ public class TypeReference implements ITypeReference { return path; } + @Override public String toString() { IPath path = getLocation(); if (path != null) { @@ -224,10 +225,12 @@ public class TypeReference implements ITypeReference { return ""; //$NON-NLS-1$ } + @Override public int hashCode() { return toString().hashCode(); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/UnknownTypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/UnknownTypeInfo.java index f78b19c7c59..cc1ba924bd1 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/UnknownTypeInfo.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/UnknownTypeInfo.java @@ -25,10 +25,12 @@ public class UnknownTypeInfo extends TypeInfo { super(0, typeName); } + @Override public boolean isUndefinedType() { return true; } + @Override public boolean canSubstituteFor(ITypeInfo info) { int compareType = info.getCElementType(); if (fElementType == 0 || compareType == 0 || fElementType == compareType) { diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/IndexTypeReference.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/IndexTypeReference.java index b950740a020..41a6c231a29 100644 --- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/IndexTypeReference.java +++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/IndexTypeReference.java @@ -93,6 +93,7 @@ public class IndexTypeReference extends TypeReference { /* * @see org.eclipse.cdt.core.browser.ITypeReference#getCElements() */ + @Override public ICElement[] getCElements() { if (fCElement != null) { return new ICElement[] { fCElement }; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CModelException.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CModelException.java index 209fb01de62..d192f10d8e3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CModelException.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CModelException.java @@ -107,6 +107,7 @@ public class CModelException extends CoreException { * Returns a printable representation of this exception suitable for debugging * purposes only. */ + @Override public String toString() { StringBuffer buffer= new StringBuffer(); buffer.append("C Model Exception: "); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java index 25f7668de03..b9d18cb7a6a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ElementChangedEvent.java @@ -61,6 +61,7 @@ public class ElementChangedEvent extends EventObject { * @since 2.0 * @deprecated - no longer used, such deltas are now notified during POST_CHANGE */ + @Deprecated public static final int PRE_AUTO_BUILD = 2; /** * Event type constant (bit mask) indicating an after-the-fact diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java index ea2348481d5..bc91591a146 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java @@ -240,47 +240,55 @@ public interface ICElement extends IAdaptable { * Modifier indicating a class constructor * @deprecated use {@link IMethodDeclaration#isConstructor()} */ + @Deprecated static final int C_CLASS_CTOR = 0x100; /** * Modifier indicating a class destructor * @deprecated use {@link IMethodDeclaration#isDestructor()} */ + @Deprecated static final int C_CLASS_DTOR = 0x200; /** * Modifier indicating a static storage attribute * @deprecated use {@link IDeclaration#isStatic()} */ + @Deprecated static final int C_STORAGE_STATIC = 0x400; /** * Modifier indicating an extern storage attribute * @deprecated not used anymore */ + @Deprecated static final int C_STORAGE_EXTERN = 0x800; /** * Modifier indicating a private class * @deprecated use {@link IMember#getVisibility()} */ + @Deprecated static final int CPP_PRIVATE = 0x1000; /** * Modifier indicating a public class * @deprecated use {@link IMember#getVisibility()} */ + @Deprecated static final int CPP_PUBLIC = 0x2000; /** * Modifier indicating a protected class * @deprecated use {@link IMember#getVisibility()} */ + @Deprecated static final int CPP_PROTECTED = 0x4000; /** * Modifier indicating a friend class * @deprecated use {@link IMethodDeclaration#isFriend()} */ + @Deprecated static final int CPP_FRIEND = 0x8000; /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IEnumeration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IEnumeration.java index 44ac69481e4..ae8c00bb4ea 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IEnumeration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IEnumeration.java @@ -21,5 +21,6 @@ public interface IEnumeration extends IParent, IDeclaration { * @throws CModelException * @deprecated */ + @Deprecated String getTypeName() throws CModelException; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java index 4f97f914e2e..4c92dc1ff4d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java @@ -41,5 +41,6 @@ public interface IStructureDeclaration extends IDeclaration { * Return "class", "struct", "union" * @deprecated use isUnion(), isClass(), isStruct() */ + @Deprecated String getTypeName() throws CModelException; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java index f8d677128f8..fa2eba2eb81 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java @@ -425,6 +425,7 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource * @deprecated this is currently only used by the core tests. It should * be removed from the interface. */ + @Deprecated Map parse(); /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java index 05d009c7e15..07b0cf55e2b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageManager.java @@ -225,6 +225,7 @@ public class LanguageManager { /** * @deprecated use getRegisteredContentTypes() instead. */ + @Deprecated public ArrayList/**/ getAllContentTypes() { ArrayList/**/ allTypes = new ArrayList(); allTypes.add(CCorePlugin.CONTENT_TYPE_ASMSOURCE); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/MultiLanguageSetting.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/MultiLanguageSetting.java index 6e35af48689..4dc59a94da1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/MultiLanguageSetting.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/MultiLanguageSetting.java @@ -196,6 +196,7 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return true; } + @Override public Object[] getItems() { return items; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java index 2a22b5a627c..466ceedcf84 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACExclusionFilterEntry.java @@ -36,6 +36,7 @@ public abstract class ACExclusionFilterEntry extends ACPathEntry implements ICEx this.exclusionPatterns = exclusionPatterns != null ? (IPath[])exclusionPatterns.clone() : new IPath[0]; } + @Override protected final boolean isFile() { return false; } @@ -67,6 +68,7 @@ public abstract class ACExclusionFilterEntry extends ACPathEntry implements ICEx return this.fullCharExclusionPatterns; } + @Override public boolean equals(Object other) { if(!super.equals(other)) return false; @@ -75,10 +77,12 @@ public abstract class ACExclusionFilterEntry extends ACPathEntry implements ICEx return Arrays.equals(exclusionPatterns, otherEntry.exclusionPatterns); } + @Override public int hashCode() { return super.hashCode() + exclusionPatterns.hashCode(); } + @Override public boolean equalsByContents(ICSettingEntry entry) { if(!super.equalsByContents(entry)) return false; @@ -87,6 +91,7 @@ public abstract class ACExclusionFilterEntry extends ACPathEntry implements ICEx return Arrays.equals(exclusionPatterns, otherEntry.exclusionPatterns); } + @Override protected String contentsToString() { String result = super.contentsToString(); if(exclusionPatterns.length != 0){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACPathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACPathEntry.java index fa75e5a890e..5e887fdf65a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACPathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACPathEntry.java @@ -85,6 +85,7 @@ public abstract class ACPathEntry extends ACSettingEntry return checkFlags(VALUE_WORKSPACE_PATH); } + @Override protected String contentsToString() { return fName; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java index 0d561fb72ac..3be3ed36c09 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ACSettingEntry.java @@ -49,6 +49,7 @@ public abstract class ACSettingEntry implements ICSettingEntry { return checkFlags(RESOLVED); } + @Override public boolean equals(Object other){ if(other == this) return true; @@ -70,6 +71,7 @@ public abstract class ACSettingEntry implements ICSettingEntry { return true; } + @Override public int hashCode(){ return getKind() + fFlags + fName.hashCode(); } @@ -116,6 +118,7 @@ public abstract class ACSettingEntry implements ICSettingEntry { return codeForNameKey(); } + @Override public final String toString(){ StringBuffer buf = new StringBuffer(); buf.append('[').append(LanguageSettingEntriesSerializer.kindToString(getKind())).append(']').append(' '); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludeFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludeFileEntry.java index cc043de9e3d..45ea25e7537 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludeFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludeFileEntry.java @@ -32,6 +32,7 @@ public final class CIncludeFileEntry extends ACPathEntry implements return INCLUDE_FILE; } + @Override public final boolean isFile() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludePathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludePathEntry.java index 0a8393df56e..9e18f7fe065 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludePathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CIncludePathEntry.java @@ -35,6 +35,7 @@ public final class CIncludePathEntry extends ACPathEntry implements ICIncludePat return INCLUDE_PATH; } + @Override public final boolean isFile() { return false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java index 2844939a4a0..9ebe581e650 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryFileEntry.java @@ -75,6 +75,7 @@ public final class CLibraryFileEntry extends ACPathEntry implements return LIBRARY_FILE; } + @Override public final boolean isFile() { return true; } @@ -91,6 +92,7 @@ public final class CLibraryFileEntry extends ACPathEntry implements return fSourceAttachmentRootPath; } + @Override public boolean equals(Object other) { if(other == this) return true; @@ -101,6 +103,7 @@ public final class CLibraryFileEntry extends ACPathEntry implements return sourceAttachmentSettingsEqual((CLibraryFileEntry)other); } + @Override public boolean equalsByContents(ICSettingEntry entry) { if(entry == this) return true; @@ -121,6 +124,7 @@ public final class CLibraryFileEntry extends ACPathEntry implements return true; } + @Override protected String contentsToString() { String result = super.contentsToString(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryPathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryPathEntry.java index 11d2a298dfe..43c09111829 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryPathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CLibraryPathEntry.java @@ -32,6 +32,7 @@ public final class CLibraryPathEntry extends ACPathEntry implements return LIBRARY_PATH; } + @Override public final boolean isFile() { return false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroEntry.java index 1fd22300015..58237513640 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroEntry.java @@ -22,6 +22,7 @@ public final class CMacroEntry extends ACSettingEntry implements ICMacroEntry{ fValue = ""; //$NON-NLS-1$ } + @Override public String getValue() { return fValue; } @@ -30,16 +31,19 @@ public final class CMacroEntry extends ACSettingEntry implements ICMacroEntry{ return MACRO; } + @Override public boolean equals(Object other) { if(!super.equals(other)) return false; return fValue.equals(((CMacroEntry)other).fValue); } + @Override public int hashCode() { return super.hashCode() + fValue.hashCode(); } + @Override public boolean equalsByContents(ICSettingEntry entry) { if(!super.equalsByContents(entry)) return false; @@ -47,6 +51,7 @@ public final class CMacroEntry extends ACSettingEntry implements ICMacroEntry{ return fValue.equals(((CMacroEntry)entry).fValue); } + @Override protected String contentsToString() { return new StringBuffer().append(fName).append('=').append(fValue).toString(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroFileEntry.java index 26502857845..f123de09362 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/CMacroFileEntry.java @@ -32,6 +32,7 @@ public final class CMacroFileEntry extends ACPathEntry implements return MACRO_FILE; } + @Override public final boolean isFile() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CBuildData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CBuildData.java index 7d48c5575a8..19fbf6d362e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CBuildData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CBuildData.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingBase; import org.eclipse.core.runtime.IPath; public abstract class CBuildData extends CDataObject { + @Override public final int getType() { return ICSettingBase.SETTING_BUILD; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CConfigurationData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CConfigurationData.java index e5083dbabf7..c3601c172df 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CConfigurationData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CConfigurationData.java @@ -22,6 +22,7 @@ public abstract class CConfigurationData extends CDataObject { protected CConfigurationData() { } + @Override public final int getType(){ return SETTING_CONFIGURATION; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFileData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFileData.java index c1534424de7..b8f452fb59b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFileData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFileData.java @@ -18,6 +18,7 @@ public abstract class CFileData extends CResourceData { } + @Override public final int getType(){ return ICSettingBase.SETTING_FILE; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFolderData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFolderData.java index 873efa99547..3564299c398 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFolderData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CFolderData.java @@ -18,6 +18,7 @@ public abstract class CFolderData extends CResourceData { } + @Override public final int getType(){ return ICSettingBase.SETTING_FOLDER; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CLanguageData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CLanguageData.java index eb62e609350..22a660f9b35 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CLanguageData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CLanguageData.java @@ -21,6 +21,7 @@ public abstract class CLanguageData extends CDataObject { // public abstract CDataObject getChildById(String id); + @Override public final int getType() { return SETTING_LANGUAGE; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CTargetPlatformData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CTargetPlatformData.java index f83c73e0481..527892b8a62 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CTargetPlatformData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CTargetPlatformData.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.core.settings.model.extension; import org.eclipse.cdt.core.settings.model.ICSettingBase; public abstract class CTargetPlatformData extends CDataObject { + @Override public final int getType(){ return ICSettingBase.SETTING_TARGET_PLATFORM; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultBuildData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultBuildData.java index 28d0c2eae9a..db61e5a0004 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultBuildData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultBuildData.java @@ -57,22 +57,26 @@ public class CDefaultBuildData extends CBuildData { } } + @Override public IPath getBuilderCWD() { return fCWD; } + @Override public String[] getErrorParserIDs() { if(fErrorParserIDs != null && fErrorParserIDs.length != 0) return (String[])fErrorParserIDs.clone(); return EMPTY_STRING_ARRAY; } + @Override public ICOutputEntry[] getOutputDirectories() { if(fOutputEntries != null && fOutputEntries.length != 0) return (ICOutputEntry[])fOutputEntries.clone(); return EMPTY_OUTPUT_ENTRIES_ARRAY; } + @Override public void setBuilderCWD(IPath path) { if(CDataUtil.objectsEqual(path, fCWD)) return; @@ -82,6 +86,7 @@ public class CDefaultBuildData extends CBuildData { setModified(true); } + @Override public void setErrorParserIDs(String[] ids) { if(Arrays.equals(ids, fErrorParserIDs)) return; @@ -93,6 +98,7 @@ public class CDefaultBuildData extends CBuildData { setModified(true); } + @Override public void setOutputDirectories(ICOutputEntry[] entries) { if(Arrays.equals(entries, fOutputEntries)) return; @@ -105,18 +111,22 @@ public class CDefaultBuildData extends CBuildData { setModified(true); } + @Override public String getId() { return fId; } + @Override public String getName() { return fName; } + @Override public boolean isValid() { return getId() != null; } + @Override public IEnvironmentContributor getBuildEnvironmentContributor() { // TODO Auto-generated method stub return null; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationData.java index 5ba364d4020..b1922b0e107 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationData.java @@ -153,6 +153,7 @@ public class CDefaultConfigurationData extends CConfigurationData { return fFactory.createBuildData(this, data, null, data != null ? data.getName() : null, clone); } + @Override public CFolderData createFolderData(IPath path, CFolderData base) throws CoreException{ CFolderData data = copyFolderData(path, base, false); addRcData(data); @@ -162,6 +163,7 @@ public class CDefaultConfigurationData extends CConfigurationData { return data; } + @Override public CFileData createFileData(IPath path, CFileData base) throws CoreException{ CFileData data = copyFileData(path, base, false); addRcData(data); @@ -171,6 +173,7 @@ public class CDefaultConfigurationData extends CConfigurationData { return data; } + @Override public CFileData createFileData(IPath path, CFolderData base, CLanguageData langData) throws CoreException{ CFileData data = copyFileData(path, base, langData); addRcData(data); @@ -180,10 +183,12 @@ public class CDefaultConfigurationData extends CConfigurationData { return data; } + @Override public String getDescription() { return fDescription; } + @Override public void setDescription(String description) { if(CDataUtil.objectsEqual(description, fDescription)) return; @@ -192,10 +197,12 @@ public class CDefaultConfigurationData extends CConfigurationData { setModified(true); } + @Override public CResourceData[] getResourceDatas() { return (CResourceData[])fResourceDataMap.values().toArray(new CResourceData[fResourceDataMap.size()]); } + @Override public CFolderData getRootFolderData() { return fRootFolderData; } @@ -207,6 +214,7 @@ public class CDefaultConfigurationData extends CConfigurationData { return fRootFolderData; } + @Override public void removeResourceData(CResourceData data) throws CoreException { if(data == getResourceData(data.getPath())){ IPath path = standardizePath(data.getPath()); @@ -221,10 +229,12 @@ public class CDefaultConfigurationData extends CConfigurationData { return (CResourceData)fResourceDataMap.get(path); } + @Override public String getName() { return fName; } + @Override public void setName(String name) { if(CDataUtil.objectsEqual(name, fName)) return; @@ -232,22 +242,27 @@ public class CDefaultConfigurationData extends CConfigurationData { setModified(true); } + @Override public String getId() { return fId; } + @Override public boolean isValid() { return getId() != null; } + @Override public CTargetPlatformData getTargetPlatformData() { return fTargetPlatformData; } + @Override public ICSourceEntry[] getSourceEntries() { return fSourceEntries != null ? (ICSourceEntry[])fSourceEntries.clone() : null; } + @Override public void setSourceEntries(ICSourceEntry[] entries) { if(Arrays.equals(entries, fSourceEntries)) return; @@ -256,6 +271,7 @@ public class CDefaultConfigurationData extends CConfigurationData { setModified(true); } + @Override public CBuildData getBuildData() { return fBuildData; } @@ -283,6 +299,7 @@ public class CDefaultConfigurationData extends CConfigurationData { return fBuildData; } + @Override public ICdtVariablesContributor getBuildVariablesContributor() { // TODO Auto-generated method stub return null; @@ -312,6 +329,7 @@ public class CDefaultConfigurationData extends CConfigurationData { } } + @Override public CConfigurationStatus getStatus() { return fStatus; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationDataProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationDataProvider.java index ed64f76f234..fe4aad75366 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationDataProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultConfigurationDataProvider.java @@ -23,6 +23,7 @@ public class CDefaultConfigurationDataProvider extends CConfigurationDataProvider { private static final String DEFAULT_STORAGE_ID = "defaultConfigurationDataProvider"; //$NON-NLS-1$ + @Override public CConfigurationData applyConfiguration( ICConfigurationDescription des, ICConfigurationDescription baseDescription, @@ -35,6 +36,7 @@ public class CDefaultConfigurationDataProvider extends return base; } + @Override public CConfigurationData createConfiguration( ICConfigurationDescription des, ICConfigurationDescription baseDescription, @@ -45,6 +47,7 @@ public class CDefaultConfigurationDataProvider extends return factory.createConfigurationdata(des.getId(), des.getName(), base, clone); } + @Override public CConfigurationData loadConfiguration(ICConfigurationDescription des, IProgressMonitor monitor) throws CoreException { @@ -65,6 +68,7 @@ public class CDefaultConfigurationDataProvider extends return null; } + @Override public void removeConfiguration(ICConfigurationDescription des, CConfigurationData data, IProgressMonitor monitor) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFileData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFileData.java index b9a5799da40..8bc4fb3eec3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFileData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFileData.java @@ -71,6 +71,7 @@ public class CDefaultFileData extends CFileData { } + @Override public IPath getPath() { return fPath; } @@ -86,10 +87,12 @@ public class CDefaultFileData extends CFileData { // fIsExcluded = excluded; // } + @Override public void setPath(IPath path) { fPath = path; } + @Override public String getName() { return fName; } @@ -98,14 +101,17 @@ public class CDefaultFileData extends CFileData { fName = name; } + @Override public String getId() { return fId; } + @Override public boolean isValid() { return getId() != null; } + @Override public CLanguageData getLanguageData() { return fLanguageData; } @@ -124,6 +130,7 @@ public class CDefaultFileData extends CFileData { fFactory.setModified(fLanguageData, false); } + @Override public boolean hasCustomSettings() { return false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFolderData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFolderData.java index 744bbfa7e66..f2818850f5a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFolderData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultFolderData.java @@ -64,10 +64,12 @@ public class CDefaultFolderData extends CFolderData { return fFactory.createLanguageData(fCfg, this, base, null, clone); } + @Override public CLanguageData[] getLanguageDatas() { return (CLanguageData[])fLanguageDatas.toArray(new CLanguageData[fLanguageDatas.size()]); } + @Override public IPath getPath() { return fPath; } @@ -84,6 +86,7 @@ public class CDefaultFolderData extends CFolderData { // setModified(true); // } + @Override public void setPath(IPath path) { if(CDataUtil.objectsEqual(path, fPath)) return; @@ -92,14 +95,17 @@ public class CDefaultFolderData extends CFolderData { setModified(true); } + @Override public String getName() { return fName; } + @Override public String getId() { return fId; } + @Override public boolean isValid() { return getId() != null; } @@ -114,6 +120,7 @@ public class CDefaultFolderData extends CFolderData { // return fFactory.createLanguageData(fCfg, this, null, null, languageId, extensions, false); // } + @Override public CLanguageData createLanguageDataForContentTypes(String languageId, String[] typesIds) { throw new UnsupportedOperationException(); @@ -125,6 +132,7 @@ public class CDefaultFolderData extends CFolderData { // return data; } + @Override public CLanguageData createLanguageDataForExtensions(String languageId, String[] extensions) { throw new UnsupportedOperationException(); @@ -161,6 +169,7 @@ public class CDefaultFolderData extends CFolderData { } + @Override public boolean hasCustomSettings() { return false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultLanguageData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultLanguageData.java index cf37bb8b0ba..13606a80e37 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultLanguageData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultLanguageData.java @@ -105,22 +105,27 @@ public class CDefaultLanguageData extends CLanguageData { return new EntryStore(true); } + @Override public String getName() { return fName; } + @Override public String getId() { return fId; } + @Override public boolean isValid() { return getId() != null; } + @Override public String getLanguageId() { return fLanguageId; } + @Override public void setLanguageId(String id) { if(CDataUtil.objectsEqual(id, fLanguageId)) return; @@ -169,22 +174,26 @@ public class CDefaultLanguageData extends CLanguageData { } */ + @Override public String[] getSourceContentTypeIds() { if(fSourceContentTypeIds != null) return fSourceContentTypeIds; return EMPTY_STRING_ARRAY; } + @Override public String[] getSourceExtensions() { if(fSourceExts != null) return fSourceExts; return EMPTY_STRING_ARRAY; } + @Override public int getSupportedEntryKinds() { return fSupportedKinds; } + @Override public void setEntries(int kind, ICLanguageSettingEntry entries[]) { entries = processStoredEntries(entries, OP_SET); fStore.storeEntries(kind, entries); @@ -192,10 +201,12 @@ public class CDefaultLanguageData extends CLanguageData { setModified(true); } + @Override public ICLanguageSettingEntry[] getEntries(int kind) { return fStore.getEntries(kind); } + @Override public void setSourceContentTypeIds(String[] ids) { if(Arrays.equals(ids, fSourceContentTypeIds)) return; @@ -206,6 +217,7 @@ public class CDefaultLanguageData extends CLanguageData { setModified(true); } + @Override public void setSourceExtensions(String[] exts) { if(Arrays.equals(exts, fSourceExts)) return; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultTargetPlatformData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultTargetPlatformData.java index 4eb94528885..d81bf59efa5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultTargetPlatformData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/CDefaultTargetPlatformData.java @@ -52,12 +52,14 @@ public class CDefaultTargetPlatformData extends CTargetPlatformData { } } + @Override public String[] getBinaryParserIds() { if(fBinaryParserIds != null) return (String[])fBinaryParserIds.clone(); return new String[0]; } + @Override public void setBinaryParserIds(String[] ids) { if(Arrays.equals(ids, fBinaryParserIds)) return; @@ -70,14 +72,17 @@ public class CDefaultTargetPlatformData extends CTargetPlatformData { setModified(true); } + @Override public String getId() { return fId; } + @Override public String getName() { return fName; } + @Override public boolean isValid() { return getId() != null; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/UserAndDiscoveredEntryConfigurationDataProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/UserAndDiscoveredEntryConfigurationDataProvider.java index a55929f5d42..4b9c712e999 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/UserAndDiscoveredEntryConfigurationDataProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/impl/UserAndDiscoveredEntryConfigurationDataProvider.java @@ -45,12 +45,14 @@ public abstract class UserAndDiscoveredEntryConfigurationDataProvider extends fSupportedKinds = kinds; } + @Override protected ICLanguageSettingEntry[] getAllDiscoveredEntries(int kind) { return UserAndDiscoveredEntryConfigurationDataProvider.this.getAllDiscoveredEntries(this, kind); } } protected class DataFactory extends CDataFacroty { + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, CLanguageData base, String id, boolean clone) { if(id == null) @@ -58,6 +60,7 @@ public abstract class UserAndDiscoveredEntryConfigurationDataProvider extends return new LanguageData(id, base); } + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, String id, String name, String languageId, int supportedKinds, String[] rcTypes, boolean isContentTypes) { @@ -68,10 +71,12 @@ public abstract class UserAndDiscoveredEntryConfigurationDataProvider extends } } + @Override protected CDataSerializer getDataSerializer() { return UserAndDiscoveredEntryDataSerializer.getDefault(); } + @Override protected CDataFacroty getDataFactory() { if(fDataFactory == null){ fDataFactory = new DataFactory(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryContentsKey.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryContentsKey.java index 2b9ce221450..7b37a06e2b5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryContentsKey.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryContentsKey.java @@ -20,6 +20,7 @@ public class EntryContentsKey { fEntry = entry; } + @Override public boolean equals(Object obj) { if(this == obj) return true; @@ -29,6 +30,7 @@ public class EntryContentsKey { return fEntry.equalsByContents(((EntryContentsKey)obj).fEntry); } + @Override public int hashCode() { return ((ACSettingEntry)fEntry).codeForContentsKey(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryNameKey.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryNameKey.java index f6ed1126c9f..d660b6e9cab 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryNameKey.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryNameKey.java @@ -20,6 +20,7 @@ public class EntryNameKey { fEntry = entry; } + @Override public boolean equals(Object obj) { if(this == obj) return true; @@ -29,6 +30,7 @@ public class EntryNameKey { return fEntry.equalsByName(((EntryNameKey)obj).fEntry); } + @Override public int hashCode() { return ((ACSettingEntry)fEntry).codeForNameKey(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStorageBasedLanguageData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStorageBasedLanguageData.java index 56c54debaa9..cef24e3ce4d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStorageBasedLanguageData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStorageBasedLanguageData.java @@ -31,6 +31,7 @@ public abstract class EntryStorageBasedLanguageData extends CDefaultLanguageData super(id, languageId, ids, isContentTypes); } + @Override public ICLanguageSettingEntry[] getEntries(int kind) { AbstractEntryStorage storage = getStorage(kind); if(storage != null){ @@ -40,6 +41,7 @@ public abstract class EntryStorageBasedLanguageData extends CDefaultLanguageData return new ICLanguageSettingEntry[0]; } + @Override public void setEntries(int kind, ICLanguageSettingEntry[] entries) { AbstractEntryStorage storage = getStorage(kind); if(storage != null){ @@ -55,6 +57,7 @@ public abstract class EntryStorageBasedLanguageData extends CDefaultLanguageData return fStore.getEntries(kind); } + @Override protected EntryStore createStore(){ return new EntryStore(false); } 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 05fd25ce13b..b3e70fdd2d5 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 @@ -193,6 +193,7 @@ public class KindBasedStore implements Cloneable { } } + @Override public Object clone() { try { KindBasedStore clone = (KindBasedStore)super.clone(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java index 93333648601..1b28276452a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java @@ -134,6 +134,7 @@ public class PathEntryTranslator { fCfg = cfg; } + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException { if(!CdtVarPathEntryVariableManager.isPathEntryVariable(macro, fCfg, fMngr)) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathSettingsContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathSettingsContainer.java index ce7f5f9a13f..14788e7c8f5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathSettingsContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathSettingsContainer.java @@ -627,6 +627,7 @@ public final class PathSettingsContainer { fDirectParentContainer = parent; } + @Override public String toString() { return contributeToString(new StringBuffer(), 0).toString(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PatternNameMap.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PatternNameMap.java index c4fbaa65f70..9caffb18251 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PatternNameMap.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PatternNameMap.java @@ -45,6 +45,7 @@ public class PatternNameMap { return fCharArray; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -55,10 +56,12 @@ public class PatternNameMap { return fString.equals(((StringCharArray)obj).fString); } + @Override public int hashCode() { return fString.hashCode(); } + @Override public String toString() { return fString; } @@ -109,18 +112,22 @@ public class PatternNameMap { } } + @Override public Iterator iterator() { return fChildrenMap != null ? (Iterator)new Iter(fChildrenMap.entrySet().iterator()) : (Iterator)new EmptyIterator(); } + @Override public int size() { return PatternNameMap.this.size(); } + @Override public void clear(){ PatternNameMap.this.clear(); } + @Override public boolean contains(Object o){ return fChildrenMap != null ? fChildrenMap.containsValue(o) : false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryDataSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryDataSerializer.java index 1d5248b68f2..11e1bfba64a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryDataSerializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryDataSerializer.java @@ -32,6 +32,7 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer { return fInstance; } + @Override public void loadEntries(CLanguageData data, ICStorageElement el) { UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; @@ -86,6 +87,7 @@ public class UserAndDiscoveredEntryDataSerializer extends CDataSerializer { } } + @Override public void storeEntries(CLanguageData data, ICStorageElement el) { UserAndDiscoveredEntryLanguageData lData = (UserAndDiscoveredEntryLanguageData)data; int kinds[] = KindBasedStore.getLanguageEntryKinds(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java index 830971167ec..1a2bd406f86 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryLanguageData.java @@ -28,6 +28,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends super(id, base); } + @Override protected void copySettingsFrom(CLanguageData data) { super.copySettingsFrom(data); @@ -62,28 +63,34 @@ public abstract class UserAndDiscoveredEntryLanguageData extends fLangData = lData; } + @Override protected ICLanguageSettingEntry[] getDiscoveredEntries( Set disabledNameSet) { return fLangData.getDiscoveredEntries(getKind(), disabledNameSet); } + @Override protected ICLanguageSettingEntry[] getUserEntries() { return fLangData.getUserEntries(getKind()); } + @Override protected void setDisabledDiscoveredNames(Set disabledNameSet) { fLangData.setDisabledDiscoveredNames(getKind(), disabledNameSet); } + @Override protected void setUserEntries(ICLanguageSettingEntry[] entries) { fLangData.setUserEntries(getKind(), entries); } + @Override protected boolean canDisableDiscoveredEntries() { return fLangData.canDisableDiscoveredEntries(getKind()); } } + @Override protected AbstractEntryStorage getStorage(int kind) { return new UserAndDiscoveredEntryLanguageDataEntryStorage(kind, this); } @@ -146,6 +153,7 @@ public abstract class UserAndDiscoveredEntryLanguageData extends return true; } + @Override protected ICLanguageSettingEntry[] getEntriesToCopy(int kind, CLanguageData data) { return ((UserAndDiscoveredEntryLanguageData)data).getEntriesFromStore(kind); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java index cfbab88d046..01e73cce661 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java @@ -22,6 +22,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage super(kind); } + @Override protected SettingsSet createEmptySettings(){ SettingsSet settings = new SettingsSet(2); SettingLevel levels[] = settings.getLevels(); @@ -41,6 +42,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage return settings; } + @Override protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) { switch(levelNum){ case 0: @@ -56,6 +58,7 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage } } + @Override protected void putEntriesToLevel(int levelNum, SettingLevel level) { switch(levelNum){ case 0: diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java index b27c170b63b..ad232b5c2a4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java @@ -83,6 +83,7 @@ public abstract class APathEntry extends PathEntry { return this.fullCharExclusionPatterns; } + @Override public boolean equals(Object obj) { if (obj instanceof APathEntry) { APathEntry otherEntry = (APathEntry)obj; @@ -130,6 +131,7 @@ public abstract class APathEntry extends PathEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Archive.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Archive.java index 0daefa700d8..9a2327f425d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Archive.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Archive.java @@ -52,10 +52,12 @@ public class Archive extends Openable implements IArchive { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override public CElementInfo createElementInfo() { return new ArchiveInfo(this); } @@ -64,6 +66,7 @@ public class Archive extends Openable implements IArchive { return (ArchiveInfo)getElementInfo(); } + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { return computeChildren(info, underlyingResource); @@ -87,6 +90,7 @@ public class Archive extends Openable implements IArchive { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (IBinaryArchive.class.equals(adapter)) { return getBinaryArchive(); @@ -101,6 +105,7 @@ public class Archive extends Openable implements IArchive { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { IResource res = getResource(); if (res != null) @@ -111,6 +116,7 @@ public class Archive extends Openable implements IArchive { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#closing(java.lang.Object) */ + @Override protected void closing(Object info) throws CModelException { ICProject cproject = getCProject(); CProjectInfo pinfo = (CProjectInfo)CModelManager.getDefault().peekAtInfo(cproject); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java index 7f546176792..df2ca24e8bc 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainer.java @@ -37,6 +37,7 @@ public class ArchiveContainer extends Openable implements IArchiveContainer { return a; } + @Override public CElementInfo createElementInfo() { return new ArchiveContainerInfo(this); } @@ -44,6 +45,7 @@ public class ArchiveContainer extends Openable implements IArchiveContainer { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { // this will bootstrap/start the runner for the project. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainerInfo.java index d3760779b6d..e2b71d9ef0d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainerInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveContainerInfo.java @@ -34,6 +34,7 @@ public class ArchiveContainerInfo extends OpenableInfo { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElementInfo#addChild(org.eclipse.cdt.core.model.ICElement) */ + @Override protected void addChild(ICElement child) { if (!includesChild(child)) { super.addChild(child); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AsmLabel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AsmLabel.java index 063d67ac5df..967be2849a5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AsmLabel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/AsmLabel.java @@ -48,6 +48,7 @@ public class AsmLabel extends SourceManipulation implements IAsmLabel, IParent { /* * @see org.eclipse.cdt.internal.core.model.CElement#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { if (o instanceof AsmLabel) { return equals(this, (AsmLabel) o); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java index c0ef4466a0b..a1914c6af9a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BatchOperation.java @@ -29,6 +29,7 @@ public class BatchOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.jdt.internal.core.JavaModelOperation#executeOperation() */ + @Override protected void executeOperation() throws CModelException { try { this.runnable.run(fMonitor); @@ -49,6 +50,7 @@ public class BatchOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.jdt.internal.core.JavaModelOperation#verify() */ + @Override protected ICModelStatus verify() { // cannot verify user defined operation return CModelStatus.VERIFIED_OK; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java index 8f0388c9918..cf7b1dfeb87 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Binary.java @@ -198,6 +198,7 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (IBinaryObject.class.equals(adapter)) { return getBinaryObject(); @@ -213,6 +214,7 @@ public class Binary extends Openable implements IBinary { return fBinType; } + @Override protected boolean hasChanged() { long modification = getModificationStamp(); boolean changed = modification != fLastModification; @@ -241,17 +243,20 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } - public CElementInfo createElementInfo() { + @Override + public CElementInfo createElementInfo() { return new BinaryInfo(this); } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { return computeChildren(info, underlyingResource); @@ -421,6 +426,7 @@ public class Binary extends Openable implements IBinary { * overridden from default as we do not need to create our children to provider a buffer since the buffer just contains * IBinaryOject contents which is not model specific. */ + @Override public IBuffer getBuffer() throws CModelException { if (hasBuffer()) { IBuffer buffer = getBufferManager().getBuffer(this); @@ -436,6 +442,7 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#openBuffer(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IBuffer openBuffer(IProgressMonitor pm) throws CModelException { // create buffer - translation units only use default buffer factory @@ -480,6 +487,7 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#hasBuffer() */ + @Override protected boolean hasBuffer() { return true; } @@ -487,6 +495,7 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { IResource res = getResource(); if (res != null) @@ -496,6 +505,7 @@ public class Binary extends Openable implements IBinary { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#closing(java.lang.Object) */ + @Override protected void closing(Object info) throws CModelException { ICProject cproject = getCProject(); CProjectInfo pinfo = (CProjectInfo)CModelManager.getDefault().peekAtInfo(cproject); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java index c4cdd9dd07b..2de9c74ac96 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainer.java @@ -54,6 +54,7 @@ public class BinaryContainer extends Openable implements IBinaryContainer { return b; } + @Override public CElementInfo createElementInfo() { return new BinaryContainerInfo(this); } @@ -61,6 +62,7 @@ public class BinaryContainer extends Openable implements IBinaryContainer { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { // this will bootstrap/start the runner for the project. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java index cf3a74d2fcd..9441701d110 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryContainerInfo.java @@ -28,6 +28,7 @@ public class BinaryContainerInfo extends OpenableInfo { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElementInfo#addChild(org.eclipse.cdt.core.model.ICElement) */ + @Override protected void addChild(ICElement child) { if (!includesChild(child)) { super.addChild(child); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java index 43a49c8784a..606d1078455 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryElement.java @@ -155,6 +155,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() */ + @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } @@ -162,6 +163,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { return null; } @@ -247,6 +249,7 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#generateInfos(java.lang.Object, java.util.Map, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void generateInfos(Object info, Map newElements, IProgressMonitor monitor) throws CModelException { } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryModule.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryModule.java index 6c465d6f1b3..4bcad2bb57b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryModule.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryModule.java @@ -65,6 +65,7 @@ public class BinaryModule extends Parent implements IBinaryModule { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { IWorkspaceRoot root = getCModel().getWorkspace().getRoot(); IPath path = getPath(); @@ -77,6 +78,7 @@ public class BinaryModule extends Parent implements IBinaryModule { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } @@ -84,6 +86,7 @@ public class BinaryModule extends Parent implements IBinaryModule { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() */ + @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } @@ -91,6 +94,7 @@ public class BinaryModule extends Parent implements IBinaryModule { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getPath() */ + @Override public IPath getPath() { return fPath; } @@ -98,6 +102,7 @@ public class BinaryModule extends Parent implements IBinaryModule { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#generateInfos(java.lang.Object, java.util.Map, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void generateInfos(Object info, Map newElements, IProgressMonitor monitor) throws CModelException { newElements.put(this, info); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java index 726d9e8eb00..73c2118ead8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryRunner.java @@ -50,10 +50,12 @@ public class BinaryRunner { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override protected void executeOperation() throws CModelException { ICProject cproj = (ICProject)getElementsToProcess()[0]; IParent[] containers = new IParent[2]; @@ -94,6 +96,7 @@ public class BinaryRunner { String taskName = CCorePlugin.getResourceString("CoreModel.BinaryRunner.Binary_Search_Thread"); //$NON-NLS-1$ taskName += " (" + cproject.getElementName() + ")"; //$NON-NLS-1$//$NON-NLS-2$ Job job= new Job(taskName) { + @Override protected IStatus run(IProgressMonitor monitor) { IStatus status = Status.OK_STATUS; try { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Buffer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Buffer.java index a890f8ddb4d..d04b1aac8a0 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Buffer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Buffer.java @@ -426,6 +426,7 @@ public class Buffer implements IBuffer { } } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("Owner: " + ((CElement)this.owner).toString()); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java index a80ca11e000..3fcffe3d0c1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BufferManager.java @@ -52,6 +52,7 @@ public class BufferManager implements IBufferFactory { *

NOTE: this triggers an external removal of this buffer * by closing the buffer. */ + @Override protected boolean close(LRUCacheEntry entry) { IBuffer buffer= (IBuffer) entry._fValue; if (buffer.hasUnsavedChanges()) { @@ -63,6 +64,7 @@ public class BufferManager implements IBufferFactory { /** * Returns a new instance of the reciever. */ + @Override protected LRUCache newInstance(int size, int overflow) { return new BufferCache(size, overflow); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java index 9e32ad1210c..f4685a082f3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java @@ -159,11 +159,13 @@ public class CContainer extends Openable implements ICContainer { return (IContainer) getResource(); } + @Override protected CElementInfo createElementInfo() { return new CContainerInfo(this); } // CHECKPOINT: folders will return the hash code of their path + @Override public int hashCode() { return getPath().hashCode(); } @@ -171,6 +173,7 @@ public class CContainer extends Openable implements ICContainer { /** * @see Openable */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { boolean validInfo = false; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java index 0133771b3f3..cc38691ee69 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElement.java @@ -73,6 +73,7 @@ public abstract class CElement extends PlatformObject implements ICElement { /* (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { // handle all kinds of resources if (IResource.class.isAssignableFrom(adapter)) { @@ -260,6 +261,7 @@ public abstract class CElement extends PlatformObject implements ICElement { /** * Tests if an element has the same name, type and an equal parent. */ + @Override public boolean equals (Object o) { if (this == o) return true; @@ -304,6 +306,7 @@ public abstract class CElement extends PlatformObject implements ICElement { return info; } + @Override public String toString() { return getElementName(); } @@ -488,6 +491,7 @@ public abstract class CElement extends PlatformObject implements ICElement { */ // CHECKPOINT: making not equal objects seem equal // What elements should override this? + @Override public int hashCode() { return hashCode(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java index 6255c9f5c6b..836122f2dba 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDelta.java @@ -764,6 +764,7 @@ public class CElementDelta implements ICElementDelta { * Returns a string representation of this delta's * structure suitable for debug purposes. */ + @Override public String toString() { return toDebugString(0); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDeltaBuilder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDeltaBuilder.java index 9f363867a11..b7cca8e4062 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDeltaBuilder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementDeltaBuilder.java @@ -368,6 +368,7 @@ private void removed(ICElement element) { private void removeElementInfo(ICElement element) { this.infos.remove(element); } +@Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("Built delta:\n"); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementInfo.java index e7e42715118..7248b1bb80b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CElementInfo.java @@ -144,6 +144,7 @@ class CElementInfo { fIsStructureKnown = newIsStructureKnown; } + @Override public Object clone() { try { return super.clone(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java index 853fef2a18b..3aeba67329a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModel.java @@ -41,6 +41,7 @@ public class CModel extends Openable implements ICModel { super (null, root, ICElement.C_MODEL); } + @Override public boolean equals(Object o) { if (!(o instanceof CModel)) { return false; @@ -160,11 +161,13 @@ public class CModel extends Openable implements ICModel { op.runOperation(monitor); } + @Override protected CElementInfo createElementInfo () { return new CModelInfo(this); } // CHECKPOINT: Roots will return the hashcode of their resource + @Override public int hashCode() { return resource.hashCode(); } @@ -184,6 +187,7 @@ public class CModel extends Openable implements ICModel { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { boolean validInfo = false; try { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java index eae2b8cfa88..865ae4a2a4f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelStatus.java @@ -152,6 +152,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * @see IStatus */ + @Override public IStatus[] getChildren() { return fChildren; } @@ -166,6 +167,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * Returns the message that is relevant to the code of this status. */ + @Override public String getMessage() { Throwable exception = getException(); if (isMultiStatus()) { @@ -314,6 +316,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * @see IStatus */ + @Override public int getSeverity() { if (fChildren == fgEmptyChildren) return super.getSeverity(); @@ -354,6 +357,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * @see IStatus */ + @Override public boolean isMultiStatus() { return fChildren != fgEmptyChildren; } @@ -361,6 +365,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * @see ICModelStatus */ + @Override public boolean isOK() { return getCode() == OK; } @@ -368,6 +373,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus /** * @see IStatus#matches */ + @Override public boolean matches(int mask) { if (!isMultiStatus()) { return matches(this, mask); @@ -417,6 +423,7 @@ public class CModelStatus extends Status implements ICModelStatus, ICModelStatus * Returns a printable representation of this exception for debugging * purposes. */ + @Override public String toString() { if (this == VERIFIED_OK) { return "CModelStatus[OK]"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java index 0acfe01c8f3..802d86e2ee1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java @@ -130,6 +130,7 @@ public class CProject extends Openable implements ICProject { * * @see CElement#equals(Object) */ + @Override public boolean equals(Object o) { if (this == o) @@ -142,11 +143,13 @@ public class CProject extends Openable implements ICProject { return getProject().equals(other.getProject()); } + @Override protected CElementInfo createElementInfo() { return new CProjectInfo(this); } // CHECKPOINT: CProjects will return the hash code of their underlying IProject + @Override public int hashCode() { return getProject().hashCode(); } @@ -574,6 +577,7 @@ public class CProject extends Openable implements ICProject { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { @@ -701,6 +705,7 @@ public class CProject extends Openable implements ICProject { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { if (!isCProject()) { return false; @@ -718,6 +723,7 @@ public class CProject extends Openable implements ICProject { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#closing(java.lang.Object) */ + @Override protected void closing(Object info) throws CModelException { if (info instanceof CProjectInfo) { CProjectInfo pinfo = (CProjectInfo)info; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CShiftData.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CShiftData.java index 3f9d1d2a928..11c1a2cc5bc 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CShiftData.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CShiftData.java @@ -116,6 +116,7 @@ public class CShiftData implements ICElementDelta { return null; } + @Override public String toString() { return ("CShiftData: offset=" + offset + ", size=" + size + ", lines=" + lines); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java index 5df9bdf7e68..76c4931235d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java @@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.core.model; -import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICElement; @@ -63,6 +62,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { super(new ICElement[] {element}, force); } + @Override public ISchedulingRule getSchedulingRule() { IResource resource = getElementToProcess().getResource(); IWorkspace workspace = resource.getWorkspace(); @@ -75,6 +75,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { /** * @see org.eclipse.cdt.internal.core.model.CModelOperation#executeOperation() */ + @Override protected void executeOperation() throws CModelException { try { beginTask(CoreModelMessages.getString("workingCopy.commit"), 2); //$NON-NLS-1$ @@ -171,6 +172,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { * */ + @Override public ICModelStatus verify() { IWorkingCopy wc = (IWorkingCopy) getElementToProcess(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContainerEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContainerEntry.java index 5779a1e6f67..0a1a5fe5370 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContainerEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContainerEntry.java @@ -20,6 +20,7 @@ public class ContainerEntry extends PathEntry implements IContainerEntry { super(IPathEntry.CDT_CONTAINER, path, isExported); } + @Override public boolean equals(Object obj) { if (obj instanceof IContainerEntry) { IContainerEntry container = (IContainerEntry)obj; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContentTypeProcessor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContentTypeProcessor.java index bb0ed29c80a..982a130d96a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContentTypeProcessor.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ContentTypeProcessor.java @@ -56,10 +56,12 @@ public class ContentTypeProcessor extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override protected void executeOperation() throws CModelException { for (int i = 0; i < fEvents.length; ++i) { IContentType contentType = fEvents[i].getContentType(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java index 37ad2dc52dd..8573754c60e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java @@ -79,6 +79,7 @@ public class CopyElementsOperation extends MultiOperation { * Returns the String to use as the main task name * for progress monitoring. */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.copyElementProgress"); //$NON-NLS-1$ } @@ -153,6 +154,7 @@ public class CopyElementsOperation extends MultiOperation { * @exception CModelException if the operation is unable to * be completed */ + @Override protected void processElement(ICElement element) throws CModelException { CModelOperation op = getNestedOperation(element); if (op == null) { @@ -215,6 +217,7 @@ public class CopyElementsOperation extends MultiOperation { * does not match the number of elements that were supplied. * */ + @Override protected ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { @@ -249,6 +252,7 @@ public class CopyElementsOperation extends MultiOperation { * */ + @Override protected void verify(ICElement element) throws CModelException { if (element == null || !element.exists()) error(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST, element); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java index bee0147529d..fbcf019302c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java @@ -83,6 +83,7 @@ public class CopyResourceElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.copyResourceProgress"); //$NON-NLS-1$ } @@ -189,6 +190,7 @@ public class CopyResourceElementsOperation extends MultiOperation { * processPackageFragmentResource, depending on the type of * element. */ + @Override protected void processElement(ICElement element) throws CModelException { ICElement dest = getDestinationParent(element); if (element.getElementType() <= ICElement.C_UNIT) { @@ -204,6 +206,7 @@ public class CopyResourceElementsOperation extends MultiOperation { * Overridden to allow special processing of CElementDeltas * and fResultElements. */ + @Override protected void processElements() throws CModelException { fCreatedElements = new ArrayList(fElementsToProcess.length); try { @@ -225,6 +228,7 @@ public class CopyResourceElementsOperation extends MultiOperation { * does not match the number of elements that were supplied. * */ + @Override protected ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { @@ -240,6 +244,7 @@ public class CopyResourceElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected void verify(ICElement element) throws CModelException { if (element == null || !element.exists()) error(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST, element); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java index 17601a3e5c2..ac762fae440 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateElementInTUOperation.java @@ -103,6 +103,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation { /** * Only allow cancelling if this operation is not nested. */ + @Override protected void checkCanceled() { if (!fNested) { super.checkCanceled(); @@ -135,6 +136,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation { * * @exception CModelException if the operation is unable to complete */ + @Override protected void executeOperation() throws CModelException { beginTask(getMainTaskName(), getMainAmountOfWork()); CElementDelta delta = newCElementDelta(); @@ -225,6 +227,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation { /** * Returns the elements created by this operation. */ + @Override public ICElement[] getResultElements() { return fResultElements; } @@ -306,6 +309,7 @@ public abstract class CreateElementInTUOperation extends CModelOperation { * @see ICModelStatus * @see CNamingConventions */ + @Override public ICModelStatus verify() { if (getParentElement() == null) { return new CModelStatus(ICModelStatusConstants.NO_ELEMENTS_TO_PROCESS); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java index 8a01a3b7c2e..fbea945fefd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateFieldOperation.java @@ -47,6 +47,7 @@ public class CreateFieldOperation extends CreateMemberOperation { /** * @see CreateElementInCUOperation#getMainTaskName */ + @Override public String getMainTaskName(){ return "operation.createFieldProgress"; //$NON-NLS-1$ } @@ -56,6 +57,7 @@ public class CreateFieldOperation extends CreateMemberOperation { * declaration, or as the first member in the type if there are no * field declarations. */ + @Override protected void initializeDefaultPosition() { IStructure parentElement = getStructure(); try { @@ -75,6 +77,7 @@ public class CreateFieldOperation extends CreateMemberOperation { /** * @see CreateElementInCUOperation#generateResultHandle */ + @Override protected ICElement generateResultHandle() { return getStructure().getField(fName); } @@ -82,6 +85,7 @@ public class CreateFieldOperation extends CreateMemberOperation { /** * @see CreateTypeMemberOperation#verifyNameCollision */ + @Override protected ICModelStatus verifyNameCollision() { return super.verifyNameCollision(); } @@ -89,6 +93,7 @@ public class CreateFieldOperation extends CreateMemberOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { StringBuffer sb = new StringBuffer(); sb.append(fReturnType).append(' '); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java index f7d9b67df71..0687d9acad7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateIncludeOperation.java @@ -58,6 +58,7 @@ public class CreateIncludeOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#generateResultHandle */ + @Override protected ICElement generateResultHandle() { return getTranslationUnit().getInclude(fIncludeName); } @@ -65,6 +66,7 @@ public class CreateIncludeOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#getMainTaskName */ + @Override public String getMainTaskName(){ return "operation.createIncludeProgress"; //$NON-NLS-1$ } @@ -75,6 +77,7 @@ public class CreateIncludeOperation extends CreateElementInTUOperation { * * if no include */ + @Override protected void initializeDefaultPosition() { try { ITranslationUnit cu = getTranslationUnit(); @@ -96,6 +99,7 @@ public class CreateIncludeOperation extends CreateElementInTUOperation { * @see ICModelStatus * @see CNamingConventions */ + @Override public ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { @@ -111,6 +115,7 @@ public class CreateIncludeOperation extends CreateElementInTUOperation { /* * TODO: Use the ASTRewrite once it is available. */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { StringBuffer sb = new StringBuffer(); sb.append("#include "); //$NON-NLS-1$; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java index 6df0ddea467..5784b7207b2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMemberOperation.java @@ -60,6 +60,7 @@ public abstract class CreateMemberOperation extends CreateElementInTUOperation { * create this new element. * Used by the CopyElementsOperation for renaming */ + @Override protected void setAlteredName(String newName) { fAlteredName = newName; } @@ -72,6 +73,7 @@ public abstract class CreateMemberOperation extends CreateElementInTUOperation { *

  • NAME_COLLISION - A name collision occurred in the destination * */ + @Override public ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java index 00de5466833..62a2fa1ec6d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateMethodOperation.java @@ -52,6 +52,7 @@ public class CreateMethodOperation extends CreateMemberOperation { /** * @see CreateElementInCUOperation#generateResultHandle */ + @Override protected ICElement generateResultHandle() { //TODO: what about collisions, we need the signature here. return getStructure().getMethod(fName); @@ -60,6 +61,7 @@ public class CreateMethodOperation extends CreateMemberOperation { /** * @see CreateElementInCUOperation#getMainTaskName */ + @Override public String getMainTaskName(){ return "operation.createMethodProgress"; //$NON-NLS-1$ } @@ -67,6 +69,7 @@ public class CreateMethodOperation extends CreateMemberOperation { /** * @see CreateTypeMemberOperation#verifyNameCollision */ + @Override protected ICModelStatus verifyNameCollision() { ICModelStatus status = super.verify(); if (!status.isOK()) { @@ -90,6 +93,7 @@ public class CreateMethodOperation extends CreateMemberOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { StringBuffer sb = new StringBuffer(); sb.append(fReturnType); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateNamespaceOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateNamespaceOperation.java index af03a4ad3aa..ba1e117c3dd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateNamespaceOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateNamespaceOperation.java @@ -41,6 +41,7 @@ public class CreateNamespaceOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#generateResultHandle */ + @Override protected ICElement generateResultHandle() { return getTranslationUnit().getNamespace(fNamespace); } @@ -48,6 +49,7 @@ public class CreateNamespaceOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#getMainTaskName */ + @Override public String getMainTaskName(){ return "operation.createNamespaceProgress"; //$NON-NLS-1$ } @@ -57,6 +59,7 @@ public class CreateNamespaceOperation extends CreateElementInTUOperation { *
  • after the last namespace * */ + @Override protected void initializeDefaultPosition() { try { ITranslationUnit cu = getTranslationUnit(); @@ -72,6 +75,7 @@ public class CreateNamespaceOperation extends CreateElementInTUOperation { /* * TODO: Use the ASTRewrite once it is available. */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { StringBuffer sb = new StringBuffer(); sb.append("namespace "); //$NON-NLS-1$; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java index 90bf45dd263..9a5f66de2a4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateSourceReferenceOperation.java @@ -50,6 +50,7 @@ public class CreateSourceReferenceOperation extends CreateElementInTUOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateElement(org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { return fSource; } @@ -57,6 +58,7 @@ public class CreateSourceReferenceOperation extends CreateElementInTUOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateResultHandle() */ + @Override protected ICElement generateResultHandle() { IParent parent = (IParent)getParentElement(); try { @@ -78,6 +80,7 @@ public class CreateSourceReferenceOperation extends CreateElementInTUOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#getMainTaskName() */ + @Override protected String getMainTaskName() { return "operation.createsourceReference"; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateUsingOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateUsingOperation.java index c46d65e4e14..668d2dd2b5f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateUsingOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateUsingOperation.java @@ -48,6 +48,7 @@ public class CreateUsingOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#generateResultHandle */ + @Override protected ICElement generateResultHandle() { return getTranslationUnit().getUsing(fUsingName); } @@ -55,6 +56,7 @@ public class CreateUsingOperation extends CreateElementInTUOperation { /** * @see CreateElementInCUOperation#getMainTaskName */ + @Override public String getMainTaskName(){ return "operation.createUsingProgress"; //$NON-NLS-1$ } @@ -65,6 +67,7 @@ public class CreateUsingOperation extends CreateElementInTUOperation { * * if no using */ + @Override protected void initializeDefaultPosition() { try { ITranslationUnit cu = getTranslationUnit(); @@ -80,6 +83,7 @@ public class CreateUsingOperation extends CreateElementInTUOperation { /* * TODO: Use the ASTRewrite once it is available. */ + @Override protected String generateElement(ITranslationUnit unit) throws CModelException { StringBuffer sb = new StringBuffer(); sb.append("using "); //$NON-NLS-1$; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateWorkingCopyOperation.java index e516888d18e..c40d615625e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CreateWorkingCopyOperation.java @@ -39,6 +39,7 @@ public class CreateWorkingCopyOperation extends CModelOperation { this.factory = factory; this.problemRequestor = problemRequestor; } + @Override protected void executeOperation() throws CModelException { ITranslationUnit tu = getTranslationUnit(); @@ -79,6 +80,7 @@ public class CreateWorkingCopyOperation extends CModelOperation { /** * @see JavaModelOperation#isReadOnly */ + @Override public boolean isReadOnly() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java index 5cc6f185bd7..82bf92d03be 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java @@ -50,6 +50,7 @@ public class DeleteElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.deleteElementProgress"); //$NON-NLS-1$ } @@ -88,6 +89,7 @@ public class DeleteElementsOperation extends MultiOperation { * Deletes this element from its compilation unit. * @see MultiOperation */ + @Override protected void processElement(ICElement element) throws CModelException { ITranslationUnit tu = (ITranslationUnit) element; @@ -117,6 +119,7 @@ public class DeleteElementsOperation extends MultiOperation { /** * @deprecated marked deprecated, future to use ASTRewrite */ + @Deprecated private void replaceElementInBuffer(IBuffer buffer, ICElement elementToRemove, String cuName) throws CModelException { if (elementToRemove instanceof ISourceReference) { ISourceRange range = ((ISourceReference)elementToRemove).getSourceRange(); @@ -152,6 +155,7 @@ public class DeleteElementsOperation extends MultiOperation { * This method first group the elements by ICompilationUnit, * and then processes the ICompilationUnit. */ + @Override protected void processElements() throws CModelException { groupElements(); super.processElements(); @@ -159,6 +163,7 @@ public class DeleteElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected void verify(ICElement element) throws CModelException { ICElement[] children = ((IRegion) fChildrenToRemove.get(element)).getElements(); for (int i = 0; i < children.length; i++) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java index 3eab27dd049..d2094a0629b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java @@ -33,6 +33,7 @@ public class DeleteResourceElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.deleteResourceProgress"); //$NON-NLS-1$ } @@ -41,6 +42,7 @@ public class DeleteResourceElementsOperation extends MultiOperation { * @see MultiOperation. This method delegate to deleteResource or * deletePackageFragment depending on the type of element. */ + @Override protected void processElement(ICElement element) throws CModelException { deleteResource(element.getResource(), fForce); } @@ -48,6 +50,7 @@ public class DeleteResourceElementsOperation extends MultiOperation { /** * @see MultiOperation */ + @Override protected void verify(ICElement element) throws CModelException { if (element == null || !element.exists()) error(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST, element); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DestroyWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DestroyWorkingCopyOperation.java index 4a6c8d8f39b..89ba2ee7e38 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DestroyWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DestroyWorkingCopyOperation.java @@ -29,6 +29,7 @@ public class DestroyWorkingCopyOperation extends CModelOperation { * @exception CModelException if setting the source * of the original translation unit fails */ + @Override protected void executeOperation() throws CModelException { WorkingCopy workingCopy = getWorkingCopy(); @@ -72,6 +73,7 @@ public class DestroyWorkingCopyOperation extends CModelOperation { /** * @see CModelOperation#isReadOnly */ + @Override public boolean isReadOnly() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ElementCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ElementCache.java index 5672406a716..64d63190e4b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ElementCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ElementCache.java @@ -42,6 +42,7 @@ public class ElementCache extends OverflowingLRUCache { *

    NOTE: this triggers an external removal of this element * by closing the element. */ + @Override protected boolean close(LRUCacheEntry entry) { IOpenable element = (IOpenable) entry._fKey; try { @@ -57,6 +58,7 @@ public class ElementCache extends OverflowingLRUCache { /** * Returns a new instance of the reciever. */ + @Override protected LRUCache newInstance(int size, int overflow) { return new ElementCache(size, overflow); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumeration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumeration.java index b398b9ffcfd..46951cb8141 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumeration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumeration.java @@ -22,6 +22,7 @@ public class Enumeration extends SourceManipulation implements IEnumeration{ super(parent, name, ICElement.C_ENUMERATION); } + @Override protected CElementInfo createElementInfo () { return new EnumerationInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java index beba725b32b..811a7c8001e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Enumerator.java @@ -21,6 +21,7 @@ public class Enumerator extends SourceManipulation implements IEnumerator{ super(parent, name, ICElement.C_ENUMERATOR); } + @Override protected CElementInfo createElementInfo () { return new SourceManipulationInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Field.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Field.java index d686cdccfc7..f6ebf77bc14 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Field.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Field.java @@ -30,34 +30,42 @@ public class Field extends VariableDeclaration implements IField { getFieldInfo().setMutable(mutable); } + @Override public String getTypeName() throws CModelException { return getFieldInfo().getTypeName(); } + @Override public void setTypeName(String type) throws CModelException { getFieldInfo().setTypeName(type); } + @Override public boolean isConst() throws CModelException { return getFieldInfo().isConst(); } + @Override public void setConst(boolean isConst) throws CModelException { getFieldInfo().setConst(isConst); } + @Override public boolean isVolatile() throws CModelException { return getFieldInfo().isVolatile(); } + @Override public void setVolatile(boolean isVolatile) throws CModelException { getFieldInfo().setVolatile(isVolatile); } + @Override public boolean isStatic() throws CModelException { return getFieldInfo().isStatic(); } + @Override public void setStatic(boolean isStatic) throws CModelException { getFieldInfo().setStatic(isStatic); } @@ -74,6 +82,7 @@ public class Field extends VariableDeclaration implements IField { return (FieldInfo) getElementInfo(); } + @Override protected CElementInfo createElementInfo () { return new FieldInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java index 2050cc5f4ea..8ff1ff3a618 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FieldInfo.java @@ -85,6 +85,7 @@ public class FieldInfo extends SourceManipulationInfo { /** * @see org.eclipse.cdt.internal.core.model.SourceManipulationInfo#hasSameContentsAs(SourceManipulationInfo) */ + @Override public boolean hasSameContentsAs( SourceManipulationInfo info){ return( super.hasSameContentsAs(info) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java index 3222e218f10..3f6f6984621 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionDeclaration.java @@ -103,6 +103,7 @@ public class FunctionDeclaration extends SourceManipulation implements IFunction return new String[] {}; } + @Override protected CElementInfo createElementInfo () { return new FunctionInfo(this); } @@ -111,6 +112,7 @@ public class FunctionDeclaration extends SourceManipulation implements IFunction return (FunctionInfo) getElementInfo(); } + @Override public boolean equals(Object other) { if (other instanceof IFunctionDeclaration) { return equals(this, (IFunctionDeclaration) other); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionInfo.java index e89e3574fb2..c8b4392e918 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/FunctionInfo.java @@ -57,6 +57,7 @@ class FunctionInfo extends SourceManipulationInfo { /** * @see org.eclipse.cdt.internal.core.model.SourceManipulationInfo#hasSameContentsAs(org.eclipse.cdt.internal.core.model.SourceManipulationInfo) */ + @Override public boolean hasSameContentsAs(SourceManipulationInfo otherInfo) { return (super.hasSameContentsAs(otherInfo) && (this.isStatic() == ((FunctionInfo)otherInfo).isStatic()) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java index a5fbefd7cb6..2e0fb8b97f3 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Include.java @@ -93,6 +93,7 @@ public class Include extends SourceManipulation implements IInclude { /* * @see org.eclipse.cdt.internal.core.model.CElement#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (other instanceof IInclude && equals(this, (IInclude) other)) { if (other instanceof Include) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeEntry.java index 5748073617e..0ddc10cfe2f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeEntry.java @@ -49,6 +49,7 @@ public class IncludeEntry extends APathEntry implements IIncludeEntry { return isSystemInclude; } + @Override public boolean equals(Object obj) { if (obj instanceof IIncludeEntry) { IIncludeEntry otherEntry = (IIncludeEntry) obj; @@ -116,6 +117,7 @@ public class IncludeEntry extends APathEntry implements IIncludeEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeFileEntry.java index c93580f66e3..5e4cd59048e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeFileEntry.java @@ -40,6 +40,7 @@ public class IncludeFileEntry extends APathEntry implements IIncludeFileEntry { return includeFilePath; } + @Override public boolean equals(Object obj) { if (obj instanceof IIncludeFileEntry) { IIncludeFileEntry otherEntry = (IIncludeFileEntry) obj; @@ -104,6 +105,7 @@ public class IncludeFileEntry extends APathEntry implements IIncludeFileEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java index 1c31ce53326..034ad462af4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java @@ -59,6 +59,7 @@ public class IncludeReference extends Openable implements IIncludeReference { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { return null; } @@ -66,6 +67,7 @@ public class IncludeReference extends Openable implements IIncludeReference { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() */ + @Override protected CElementInfo createElementInfo() { return new OpenableInfo(this); } @@ -80,6 +82,7 @@ public class IncludeReference extends Openable implements IIncludeReference { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Openable#buildStructure(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.runtime.IProgressMonitor, java.util.Map, org.eclipse.core.resources.IResource) */ + @Override protected boolean buildStructure(OpenableInfo info, IProgressMonitor pm, Map newElements, IResource underlyingResource) throws CModelException { return computeChildren(info, underlyingResource); } @@ -144,6 +147,7 @@ public class IncludeReference extends Openable implements IIncludeReference { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getPath() */ + @Override public IPath getPath() { return fPath; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LanguageDescriptor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LanguageDescriptor.java index 1556aeb542a..7359fcfd328 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LanguageDescriptor.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LanguageDescriptor.java @@ -84,6 +84,7 @@ public class LanguageDescriptor extends CExtensionDescriptor implements return ids; } + @Override public String getId(){ if(fId == null) fId = getConfigurationElement().getNamespaceIdentifier() + NAMESPACE_SEPARATOR + super.getId(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java index e0c576ef01d..489ea932bb1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java @@ -91,6 +91,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry { } + @Override public boolean equals(Object obj) { if (obj instanceof ILibraryEntry) { ILibraryEntry otherEntry = (ILibraryEntry)obj; @@ -174,6 +175,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReference.java index e6181c476d6..da68e7df13c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReference.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReference.java @@ -38,6 +38,7 @@ public class LibraryReference extends Parent implements ILibraryReference { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { return null; } @@ -45,6 +46,7 @@ public class LibraryReference extends Parent implements ILibraryReference { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() */ + @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } @@ -52,6 +54,7 @@ public class LibraryReference extends Parent implements ILibraryReference { /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getPath() */ + @Override public IPath getPath() { return entry.getFullLibraryPath(); } @@ -66,6 +69,7 @@ public class LibraryReference extends Parent implements ILibraryReference { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#generateInfos(java.lang.Object, java.util.Map, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void generateInfos(Object info, Map newElements, IProgressMonitor monitor) throws CModelException { } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceArchive.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceArchive.java index b2c3271d775..e0f058727cf 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceArchive.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceArchive.java @@ -34,6 +34,7 @@ public class LibraryReferenceArchive extends Archive implements ILibraryReferenc /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { return null; } @@ -43,6 +44,7 @@ public class LibraryReferenceArchive extends Archive implements ILibraryReferenc /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getPath() */ + @Override public IPath getPath() { return entry.getFullLibraryPath(); } @@ -50,6 +52,7 @@ public class LibraryReferenceArchive extends Archive implements ILibraryReferenc /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { File f = getPath().toFile(); if (f != null) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceShared.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceShared.java index 32fa2e90e4e..41f59a9bd4c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceShared.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryReferenceShared.java @@ -39,6 +39,7 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.Binary#getModificationStamp() */ + @Override protected long getModificationStamp() { File f = getPath().toFile(); if (f != null) { @@ -50,6 +51,7 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getResource() */ + @Override public IResource getResource() { return null; } @@ -57,6 +59,7 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { File f = getPath().toFile(); if (f != null) { @@ -68,6 +71,7 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference /* (non-Javadoc) * @see org.eclipse.cdt.core.model.ICElement#getPath() */ + @Override public IPath getPath() { return entry.getFullLibraryPath(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java index 3d1005987f7..14b98172725 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Macro.java @@ -28,6 +28,7 @@ public class Macro extends SourceManipulation implements IMacro { return ""; //$NON-NLS-1$ } + @Override protected CElementInfo createElementInfo () { return new SourceManipulationInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java index ab3d030cbcc..781be59c740 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroEntry.java @@ -44,6 +44,7 @@ public class MacroEntry extends APathEntry implements IMacroEntry { return macroValue; } + @Override public boolean equals(Object obj) { if (obj instanceof IMacroEntry) { IMacroEntry otherEntry = (IMacroEntry)obj; @@ -76,6 +77,7 @@ public class MacroEntry extends APathEntry implements IMacroEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroFileEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroFileEntry.java index 1742b4a979d..59f8466f2b5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroFileEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MacroFileEntry.java @@ -39,6 +39,7 @@ public class MacroFileEntry extends APathEntry implements IMacroFileEntry { return macroFilePath; } + @Override public boolean equals(Object obj) { if (obj instanceof IMacroFileEntry) { IMacroFileEntry otherEntry = (IMacroFileEntry) obj; @@ -107,6 +108,7 @@ public class MacroFileEntry extends APathEntry implements IMacroFileEntry { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(super.toString()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java index 6431118c222..3445f90e68d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodDeclaration.java @@ -84,10 +84,12 @@ public class MethodDeclaration extends FunctionDeclaration implements IMethodDec getMethodInfo().setFriend(isFriend); } + @Override public boolean isConst(){ return isConst; } + @Override public void setConst(boolean isConst) throws CModelException{ this.isConst = isConst; } @@ -100,6 +102,7 @@ public class MethodDeclaration extends FunctionDeclaration implements IMethodDec getMethodInfo().setVisibility(visibility); } + @Override protected CElementInfo createElementInfo () { return new MethodInfo(this); } @@ -108,6 +111,7 @@ public class MethodDeclaration extends FunctionDeclaration implements IMethodDec return (MethodInfo) getElementInfo(); } + @Override public boolean equals(Object other) { if (other instanceof IMethodDeclaration) { return equals(this, (IMethodDeclaration) other); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodInfo.java index 93cbd918564..a8bc4a6aa51 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MethodInfo.java @@ -77,6 +77,7 @@ public class MethodInfo extends FunctionInfo { /** * @see org.eclipse.cdt.internal.core.model.SourceManipulationInfo#hasSameContentsAs(org.eclipse.cdt.internal.core.model.SourceManipulationInfo) */ + @Override public boolean hasSameContentsAs(SourceManipulationInfo otherInfo) { return (super.hasSameContentsAs(otherInfo) && (isPureVirtual == ((MethodInfo)otherInfo).isPureVirtual()) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java index 2476f75d164..2d56a444c92 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java @@ -28,12 +28,14 @@ public class MoveElementsOperation extends CopyElementsOperation { * Returns the String to use as the main task name * for progress monitoring. */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.moveElementProgress"); //$NON-NLS-1$ } /** * @see CopyElementsOperation#isMove() */ + @Override protected boolean isMove() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java index 2fb05589712..87e42c95e11 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java @@ -35,6 +35,7 @@ public class MoveResourceElementsOperation extends CopyResourceElementsOperation /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.moveResourceProgress"); //$NON-NLS-1$ } @@ -42,6 +43,7 @@ public class MoveResourceElementsOperation extends CopyResourceElementsOperation /** * @see CopyResourceElementsOperation#isMove() */ + @Override protected boolean isMove() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MultiOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MultiOperation.java index a53b731c095..faaf9aeb28a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MultiOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MultiOperation.java @@ -99,6 +99,7 @@ public abstract class MultiOperation extends CModelOperation { * If multiple errors occured, the corresponding CModelStatus is a * multi-status. Otherwise, it is a simple one. */ + @Override protected void executeOperation() throws CModelException { try { processElements(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java index 11f2586374e..d25d174b7e4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Namespace.java @@ -52,6 +52,7 @@ public class Namespace extends SourceManipulation implements INamespace{ /* * @see org.eclipse.cdt.internal.core.model.CElement#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (other instanceof INamespace && equals(this, (INamespace) other)) { if (other instanceof Namespace) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java index d337f1a6d95..ed51cbbcc97 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Openable.java @@ -46,6 +46,7 @@ public abstract class Openable extends Parent implements IOpenable, IBufferChang resource = res; } + @Override public IResource getResource() { return resource; } @@ -95,6 +96,7 @@ public abstract class Openable extends Parent implements IOpenable, IBufferChang /** * This element is being closed. Do any necessary cleanup. */ + @Override protected void closing(Object info) throws CModelException { closeBuffer(); } @@ -240,6 +242,7 @@ public abstract class Openable extends Parent implements IOpenable, IBufferChang /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CElement#generateInfos(java.lang.Object, java.util.Map, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void generateInfos(Object info, Map newElements, IProgressMonitor monitor) throws CModelException { if (CModelManager.VERBOSE){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/OutputEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/OutputEntry.java index b05890de0e9..7cb69181d4c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/OutputEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/OutputEntry.java @@ -27,6 +27,7 @@ public class OutputEntry extends APathEntry implements IOutputEntry { super(CDT_OUTPUT, null, null, path, exclusionPatterns, isExported); } + @Override public boolean equals(Object obj) { if (obj instanceof IOutputEntry) { IOutputEntry otherEntry = (IOutputEntry) obj; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java index ac70ce3a72a..3237bb47051 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Parent.java @@ -29,6 +29,7 @@ public abstract class Parent extends CElement { * Adds a child to the current element. * Implementations override this method to support children */ + @Override public void addChild(ICElement member) throws CModelException { getElementInfo().addChild(member); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntry.java index a883ff7e4ad..3d473077051 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntry.java @@ -53,6 +53,7 @@ public class PathEntry implements IPathEntry { return isExported; } + @Override public boolean equals(Object obj) { if (obj instanceof IPathEntry) { IPathEntry otherEntry = (IPathEntry)obj; @@ -130,6 +131,7 @@ public class PathEntry implements IPathEntry { /** * Returns a printable representation of this classpath entry. */ + @Override public String toString() { StringBuffer buffer = new StringBuffer(); if (path != null && !path.isEmpty()) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryContainerUpdatesOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryContainerUpdatesOperation.java index 8e25429fe01..dc67e0d8a5a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryContainerUpdatesOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryContainerUpdatesOperation.java @@ -37,10 +37,12 @@ public class PathEntryContainerUpdatesOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override protected void executeOperation() throws CModelException { PathEntryManager pathEntryManager = PathEntryManager.getDefault(); ArrayList list = new ArrayList(events.length); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java index c7d369e85de..2caaead65b1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java @@ -991,6 +991,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { try { CCorePlugin.getWorkspace().run(new IWorkspaceRunnable() { @@ -1426,6 +1427,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { try { CCorePlugin.getWorkspace().run(new IWorkspaceRunnable() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreChangedOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreChangedOperation.java index 1450bd44141..1dd4b744c54 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreChangedOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreChangedOperation.java @@ -26,11 +26,13 @@ public class PathEntryStoreChangedOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override protected void executeOperation() throws CModelException { PathEntryManager manager = PathEntryManager.getDefault(); ICProject cproject = (ICProject)getElementToProcess(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreProxy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreProxy.java index 7fd2b586cd7..8b5274fa874 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreProxy.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryStoreProxy.java @@ -69,6 +69,7 @@ public class PathEntryStoreProxy extends AbstractCExtensionProxy implements IPat /* (non-Javadoc) * @see org.eclipse.cdt.core.resources.IPathEntryStore#fireClosedChangedEvent(IProject) */ + @Override public void close() { super.close(); PathEntryStoreChangedEvent evt = new PathEntryStoreChangedEvent(this, getProject(), PathEntryStoreChangedEvent.STORE_CLOSED); @@ -79,6 +80,7 @@ public class PathEntryStoreProxy extends AbstractCExtensionProxy implements IPat } } + @Override public IProject getProject() { return super.getProject(); } @@ -103,6 +105,7 @@ public class PathEntryStoreProxy extends AbstractCExtensionProxy implements IPat notifyListeners(event); } + @Override protected Object createDefaultProvider(ICConfigurationDescription cfgDes, boolean newStile) { if(newStile){ @@ -111,28 +114,33 @@ public class PathEntryStoreProxy extends AbstractCExtensionProxy implements IPat return new DefaultPathEntryStore(getProject()); } + @Override protected void deinitializeProvider(Object o) { IPathEntryStore store = (IPathEntryStore)o; store.removePathEntryStoreListener(this); store.close(); } + @Override protected void initializeProvider(Object o) { IPathEntryStore store = (IPathEntryStore)o; fStore = store; store.addPathEntryStoreListener(this); } + @Override protected boolean isValidProvider(Object o) { return o instanceof IPathEntryStore; } + @Override protected void postProcessProviderChange(Object newProvider, Object oldProvider) { // if(oldProvider != null) fireContentChangedEvent(getProject()); } + @Override protected boolean doHandleEvent(CProjectDescriptionEvent event) { IPathEntryStore oldStore = fStore; boolean result = super.doHandleEvent(event); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ProjectEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ProjectEntry.java index dc712ddc003..36b76ba85d1 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ProjectEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ProjectEntry.java @@ -21,6 +21,7 @@ public class ProjectEntry extends PathEntry implements IProjectEntry { super(IPathEntry.CDT_PROJECT, path, isExported); } + @Override public boolean equals(Object obj) { if (obj instanceof IProjectEntry) { IProjectEntry otherEntry = (IProjectEntry)obj; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ReconcileWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ReconcileWorkingCopyOperation.java index 311a385a701..4e2b6c94b46 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ReconcileWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ReconcileWorkingCopyOperation.java @@ -40,6 +40,7 @@ public class ReconcileWorkingCopyOperation extends CModelOperation { * @exception CModelException if setting the source * of the original compilation unit fails */ + @Override protected void executeOperation() throws CModelException { if (fMonitor != null){ if (fMonitor.isCanceled()) @@ -86,10 +87,12 @@ public class ReconcileWorkingCopyOperation extends CModelOperation { /** * @see CModelOperation#isReadOnly */ + @Override public boolean isReadOnly() { return true; } + @Override protected ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Region.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Region.java index c6d9ee2e065..f6a101731e6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Region.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Region.java @@ -145,6 +145,7 @@ public class Region implements IRegion { /** * Returns a printable representation of this region. */ + @Override public String toString() { StringBuffer buffer = new StringBuffer(); ICElement[] roots = getElements(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java index 9bc7e87d518..4d8e65c8908 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java @@ -35,18 +35,21 @@ public class RenameElementsOperation extends MoveElementsOperation { /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.renameElementProgress"); //$NON-NLS-1$ } /** * @see CopyElementsOperation#isRename() */ + @Override protected boolean isRename() { return true; } /** * @see MultiOperation */ + @Override protected ICModelStatus verify() { ICModelStatus status = super.verify(); if (! status.isOK()) @@ -58,6 +61,7 @@ public class RenameElementsOperation extends MoveElementsOperation { /** * @see MultiOperation */ + @Override protected void verify(ICElement element) throws CModelException { int elementType = element.getElementType(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java index d95bfa9c46e..2b8cff6a892 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java @@ -38,6 +38,7 @@ public class RenameResourceElementsOperation extends MoveResourceElementsOperati /** * @see MultiOperation */ + @Override protected String getMainTaskName() { return CoreModelMessages.getString("operation.renameResourceProgress"); //$NON-NLS-1$ } @@ -45,6 +46,7 @@ public class RenameResourceElementsOperation extends MoveResourceElementsOperati /** * @see CopyResourceElementsOperation#isRename() */ + @Override protected boolean isRename() { return true; } @@ -52,6 +54,7 @@ public class RenameResourceElementsOperation extends MoveResourceElementsOperati /** * @see MultiOperation */ + @Override protected void verify(ICElement element) throws CModelException { super.verify(element); verifyRenaming(element); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java index 85c8424b507..a18cfb748db 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntriesOperation.java @@ -46,6 +46,7 @@ public class SetPathEntriesOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#executeOperation() */ + @Override protected void executeOperation() throws CModelException { // project reference updated - may throw an exception if unable to write .cdtproject file updateProjectReferencesIfNecessary(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntryContainerOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntryContainerOperation.java index 72b7a54d7eb..bccb3a46f58 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntryContainerOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SetPathEntryContainerOperation.java @@ -45,10 +45,12 @@ public class SetPathEntryContainerOperation extends CModelOperation { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() */ + @Override public boolean isReadOnly() { return true; } + @Override protected void executeOperation() throws CModelException { if (isCanceled()) { return; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceEntry.java index b73d027a757..f8b42fac5ad 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceEntry.java @@ -25,6 +25,7 @@ public class SourceEntry extends APathEntry implements ISourceEntry { super(IPathEntry.CDT_SOURCE, null, null, sourcePath, exclusionPatterns, false); } + @Override public boolean equals (Object obj) { if (obj instanceof ISourceEntry) { ISourceEntry otherEntry = (ISourceEntry)obj; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java index d1540c97885..9a89df85102 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceManipulation.java @@ -134,6 +134,7 @@ public class SourceManipulation extends Parent implements ISourceManipulation, I * Returns the first parent of the element that is an instance of * IOpenable. */ + @Override public IOpenable getOpenableParent() { ICElement current = getParent(); while (current != null){ @@ -162,14 +163,17 @@ public class SourceManipulation extends Parent implements ISourceManipulation, I /** * @see ICElement */ + @Override public IResource getUnderlyingResource() { return getParent().getUnderlyingResource(); } + @Override public IResource getResource() { return null; } + @Override protected CElementInfo createElementInfo () { return new SourceManipulationInfo(this); } @@ -186,6 +190,7 @@ public class SourceManipulation extends Parent implements ISourceManipulation, I /* * @see CElement#generateInfos */ + @Override protected void generateInfos(Object info, Map newElements, IProgressMonitor pm) throws CModelException { Openable openableParent = (Openable)getOpenableParent(); if (openableParent == null) { @@ -226,6 +231,7 @@ public class SourceManipulation extends Parent implements ISourceManipulation, I /* * @see CElement */ + @Override public ICElement getHandleFromMemento(String token, MementoTokenizer memento) { switch (token.charAt(0)) { case CEM_SOURCEELEMENT: diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRange.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRange.java index 45439ce9cab..4a1416a7433 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRange.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRange.java @@ -79,6 +79,7 @@ class SourceRange implements ISourceRange { return endLine; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("[offset="); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRoot.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRoot.java index bbd82e3299b..2334508fabc 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRoot.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/SourceRoot.java @@ -92,6 +92,7 @@ public class SourceRoot extends CContainer implements ISourceRoot { /** * @see CElement#getHandleMemento() */ + @Override protected char getHandleMementoDelimiter() { return CElement.CEM_SOURCEROOT; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureDeclaration.java index eefbf92dc15..e89b8ada618 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/StructureDeclaration.java @@ -53,6 +53,7 @@ public class StructureDeclaration extends SourceManipulation implements IStructu return (StructureInfo) getElementInfo(); } + @Override protected CElementInfo createElementInfo () { return new StructureInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Using.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Using.java index 8662a72a862..d17b1232fe4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Using.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Using.java @@ -23,6 +23,7 @@ public class Using extends SourceManipulation implements IUsing { directive = isDirective; } + @Override protected CElementInfo createElementInfo () { return new SourceManipulationInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableDeclaration.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableDeclaration.java index 4b6966d32a8..1c31859a310 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableDeclaration.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableDeclaration.java @@ -61,6 +61,7 @@ public class VariableDeclaration extends SourceManipulation implements IVariable return (VariableInfo) getElementInfo(); } + @Override protected CElementInfo createElementInfo () { return new VariableInfo(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java index fce9cf674db..11b67a02c09 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java @@ -60,6 +60,7 @@ class VariableInfo extends SourceManipulationInfo { /** * @see org.eclipse.cdt.internal.core.model.SourceManipulationInfo#hasSameContentsAs(org.eclipse.cdt.internal.core.model.SourceManipulationInfo) */ + @Override public boolean hasSameContentsAs(SourceManipulationInfo otherInfo) { return ( super.hasSameContentsAs(otherInfo) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java index c89a1659079..3439de200af 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopy.java @@ -32,7 +32,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; /** @@ -141,6 +140,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see org.eclipse.cdt.core.model.ICElement#exists() */ + @Override public boolean exists() { // working copy always exists in the model until it is detroyed return this.useCount != 0; @@ -149,6 +149,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * Answers custom buffer factory */ + @Override public IBufferFactory getBufferFactory(){ return this.bufferFactory; @@ -159,6 +160,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { * * @see Object#equals */ + @Override public boolean equals(Object o) { return this == o; } @@ -232,6 +234,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see org.eclipse.cdt.core.model.ITranslationUnit#getSharedWorkingCopy(IProgressMonitor, IBufferFactory) */ + @Override public IWorkingCopy getSharedWorkingCopy(IProgressMonitor monitor,IBufferFactory factory) throws CModelException{ return this; @@ -239,6 +242,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see org.eclipse.cdt.core.model.ITranslationUnit#getWorkingCopy() */ + @Override public IWorkingCopy getWorkingCopy() { return this; } @@ -246,6 +250,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see IWorkingCopy */ + @Override public IWorkingCopy getWorkingCopy(IProgressMonitor monitor, IBufferFactory factory){ return this; } @@ -271,6 +276,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see org.eclipse.cdt.core.model.ITranslationUnit#isWorkingCopy() */ + @Override public boolean isWorkingCopy() { return true; } @@ -283,6 +289,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { * something other than navigation or if this is a working copy being * opened after it has been destroyed. */ + @Override public void open(IProgressMonitor monitor) throws CModelException { if (this.useCount == 0) { // was destroyed throw newNotPresentException(); @@ -299,6 +306,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /* * @see org.eclipse.cdt.internal.core.model.TranslationUnit#openBuffer(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IBuffer openBuffer(IProgressMonitor pm) throws CModelException { if (this.useCount == 0) throw newNotPresentException(); @@ -373,6 +381,7 @@ public class WorkingCopy extends TranslationUnit implements IWorkingCopy { /** * @see org.eclipse.cdt.core.model.ICFile#save(IProgressMonitor, boolean) */ + @Override public void save(IProgressMonitor pm, boolean force) throws CModelException { if (isReadOnly()) { throw new CModelException(new CModelStatus(ICModelStatusConstants.READ_ONLY, this)); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopyInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopyInfo.java index 5e7be65f579..17288e6c912 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopyInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/WorkingCopyInfo.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.core.model; * The Element Info of a Working Copy. * @deprecated Use {@link TranslationUnitInfo} directly */ +@Deprecated public class WorkingCopyInfo extends TranslationUnitInfo { public WorkingCopyInfo (CElement element) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java index 4313e8c0753..3d5ad0e5473 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java @@ -66,6 +66,7 @@ abstract class CElementHandle implements ICElementHandle, ISourceReference { fRegion= new Region(0,0); } + @Override public boolean equals(Object obj) { if (obj instanceof ICElement) { return CElement.equals(this, (ICElement) obj); @@ -73,6 +74,7 @@ abstract class CElementHandle implements ICElementHandle, ISourceReference { return false; } + @Override public int hashCode() { return CElement.hashCode(this); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/FunctionDeclarationHandle.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/FunctionDeclarationHandle.java index 722e5552e2b..16716a39e66 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/FunctionDeclarationHandle.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/FunctionDeclarationHandle.java @@ -40,6 +40,7 @@ public class FunctionDeclarationHandle extends CElementHandle implements org.ecl } } + @Override public boolean equals(Object obj) { if (obj instanceof IFunctionDeclaration) { return FunctionDeclaration.equals(this, (IFunctionDeclaration) obj); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/MethodDeclarationHandle.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/MethodDeclarationHandle.java index 8d849a4d5c2..dfb3edbfb7e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/MethodDeclarationHandle.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/MethodDeclarationHandle.java @@ -48,6 +48,7 @@ public class MethodDeclarationHandle extends CElementHandle implements IMethodDe } + @Override public boolean equals(Object obj) { if (obj instanceof IMethodDeclaration) { return MethodDeclaration.equals(this, (IMethodDeclaration) obj); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CBuildSettingCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CBuildSettingCache.java index 63b18c1a960..5d42f01d656 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CBuildSettingCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CBuildSettingCache.java @@ -74,10 +74,12 @@ public class CBuildSettingCache extends CDefaultBuildData implements return true; } + @Override public void setBuilderCWD(IPath path) { throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setErrorParserIDs(String[] ids) { throw ExceptionFactory.createIsReadOnlyException(); } @@ -86,10 +88,12 @@ public class CBuildSettingCache extends CDefaultBuildData implements throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setOutputDirectories(ICOutputEntry[] entries) { throw ExceptionFactory.createIsReadOnlyException(); } + @Override public IEnvironmentContributor getBuildEnvironmentContributor() { return fCfgCache.getConfigurationData().getBuildData().getBuildEnvironmentContributor(); } @@ -102,6 +106,7 @@ public class CBuildSettingCache extends CDefaultBuildData implements return fResolvedOutputEntries; } + @Override public ICOutputEntry[] getOutputDirectories() { initOutputEntries(); return (ICOutputEntry[])fProjOutputEntries.clone(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigExtensionReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigExtensionReference.java index 858ac49aef9..4fd4d853833 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigExtensionReference.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigExtensionReference.java @@ -45,6 +45,7 @@ public class CConfigExtensionReference implements ICConfigExtensionReference { return fCfgSettings.getInfo(this); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -58,6 +59,7 @@ public class CConfigExtensionReference implements ICConfigExtensionReference { return false; } + @Override public int hashCode() { return fExtPoint.hashCode() + fId.hashCode(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java index 5ecbf936b10..a3dc6dd9322 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java @@ -157,6 +157,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC // return fCfgCache; // } + @Override public String getId() { String id = super.getId(); if(id == null){ @@ -169,6 +170,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC return id; } + @Override public String getName() { String name = super.getName(); if(name == null){ @@ -246,6 +248,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC return null; } + @Override protected IProxyProvider createChildProxyProvider() { ICDataScope scope = new ICDataScope(){ @@ -636,6 +639,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC return fIsPreference; } + @Override protected boolean containsWritableData(){ if(super.containsWritableData()) return true; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java index b2a534e2454..40b3dd2ca62 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java @@ -176,20 +176,24 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData throw ExceptionFactory.createIsReadOnlyException(); } + @Override public CFileData copyFileData(IPath path, CFileData base, boolean clone) { return new CFileDescriptionCache(base, this); } + @Override protected CFileData copyFileData(IPath path, CFolderData base, CLanguageData langData) { //should never be here throw new UnsupportedOperationException(); } + @Override public CFolderData copyFolderData(IPath path, CFolderData base, boolean clone) { return new CFolderDescriptionCache(base, this); } + @Override protected CBuildData copyBuildData(CBuildData data, boolean clone) { return new CBuildSettingCache(data, this); } @@ -235,26 +239,32 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData throw new CoreException(new DescriptionStatus(SettingsModelMessages.getString("CConfigurationDescriptionCache.0"))); //$NON-NLS-1$ } + @Override public CFileData createFileData(IPath path, CFileData base) throws CoreException{ throw ExceptionFactory.createIsReadOnlyException(); } + @Override public CFileData createFileData(IPath path, CFolderData base, CLanguageData baseLangData) throws CoreException{ throw ExceptionFactory.createIsReadOnlyException(); } + @Override public CFolderData createFolderData(IPath path, CFolderData base) throws CoreException{ throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void removeResourceData(CResourceData data)throws CoreException { throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setDescription(String description) throws WriteAccessException{ throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setName(String name) throws WriteAccessException { throw ExceptionFactory.createIsReadOnlyException(); } @@ -303,6 +313,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData throw ExceptionFactory.createIsReadOnlyException(); } + @Override public boolean isModified() { return false; } @@ -342,6 +353,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData return (ICTargetPlatformSetting)getTargetPlatformData(); } + @Override protected CTargetPlatformData copyTargetPlatformData(CTargetPlatformData base, boolean clone) { return new CTargetPlatformSettingCache(base, this); } @@ -358,6 +370,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData throw ExceptionFactory.createIsReadOnlyException(); } + @Override public ICSourceEntry[] getSourceEntries() { initSourceEntries(); return (ICSourceEntry[])fProjSourceEntries.clone(); @@ -374,6 +387,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData return isPreferenceConfiguration() ? null : getProjectDescription().getProject(); } + @Override public void setSourceEntries(ICSourceEntry[] entries) { throw ExceptionFactory.createIsReadOnlyException(); } @@ -426,6 +440,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData return fSpecSettings.getSettionProperty(name); } + @Override public ICdtVariablesContributor getBuildVariablesContributor() { return fData.getBuildVariablesContributor(); } @@ -467,6 +482,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData return CProjectDescriptionManager.getLanguageSettingForFile(this, path, ignoreExcludeStatus); } + @Override protected CResourceData[] filterRcDatasToCopy(CConfigurationData base) { if(!isPreferenceConfiguration()) CProjectDescriptionManager.removeNonCustomSettings(getProjectDescription().getProject(), base); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CDataProxyContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CDataProxyContainer.java index 5f7e40d2e69..8e164e234e8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CDataProxyContainer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CDataProxyContainer.java @@ -73,6 +73,7 @@ public abstract class CDataProxyContainer extends CDataProxy implements ICDataPr getChildrenProxyProvider().cacheValues(); } + @Override protected void setRescan(boolean rescan){ if(isRescan() == rescan) return; @@ -84,6 +85,7 @@ public abstract class CDataProxyContainer extends CDataProxy implements ICDataPr } } + @Override void setData(CDataObject data) { super.setData(data); setRescanChildren(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingContainerFactoryWithListener.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingContainerFactoryWithListener.java index b8c5a9c56e7..6b92cd735fb 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingContainerFactoryWithListener.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingContainerFactoryWithListener.java @@ -18,6 +18,7 @@ public abstract class CExternalSettingContainerFactoryWithListener extends CExternalSettingContainerFactory { private ListenerList fListenerList; + @Override public void addListener(ICExternalSettingsListener listener){ if(fListenerList == null) fListenerList = new ListenerList(); @@ -25,6 +26,7 @@ public abstract class CExternalSettingContainerFactoryWithListener extends fListenerList.add(listener); } + @Override public void removeListener(ICExternalSettingsListener listener){ if(fListenerList == null) return; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsHolder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsHolder.java index 9f84ff04ba3..4b9037338ef 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsHolder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsHolder.java @@ -64,6 +64,7 @@ public class CExternalSettingsHolder extends CExternalSettingsContainer { fSettingsMap = new HashMap(base.fSettingsMap); } + @Override public CExternalSetting[] getExternalSettings(){ if(fSettingsMap != null) return (CExternalSetting[])fSettingsMap.values().toArray(new CExternalSetting[fSettingsMap.size()]); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsManager.java index 91839442045..098b5ff5435 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettingsManager.java @@ -106,6 +106,7 @@ public class CExternalSettingsManager implements ICExternalSettingsListener, ICP return fContainerId; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -124,10 +125,12 @@ public class CExternalSettingsManager implements ICExternalSettingsListener, ICP return fFactoryId.equals(other.fFactoryId); } + @Override public int hashCode() { return fFactoryId.hashCode() + fContainerId.hashCode(); } + @Override public String toString() { return fFactoryId.toString() + " : " + fContainerId.toString(); //$NON-NLS-1$ } @@ -183,6 +186,7 @@ public class CExternalSettingsManager implements ICExternalSettingsListener, ICP static class NullContainer extends CExternalSettingsContainer { static final NullContainer INSTANCE = new NullContainer(); + @Override public CExternalSetting[] getExternalSettings() { return new CExternalSetting[0]; } @@ -191,9 +195,11 @@ public class CExternalSettingsManager implements ICExternalSettingsListener, ICP private static class NullFactory extends CExternalSettingContainerFactory { static NullFactory INSTANCE = new NullFactory(); + @Override public void addListener(ICExternalSettingsListener listener) { } + @Override public CExternalSettingsContainer createContainer(String id, IProject project, ICConfigurationDescription cfgDes) throws CoreException { return NullContainer.INSTANCE; @@ -203,12 +209,15 @@ public class CExternalSettingsManager implements ICExternalSettingsListener, ICP return null; } + @Override public void removeListener(ICExternalSettingsListener listener) { } + @Override public void shutdown() { } + @Override public void startup() { } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettinsDeltaCalculator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettinsDeltaCalculator.java index 180e1cd6730..b44db7a0bdd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettinsDeltaCalculator.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CExternalSettinsDeltaCalculator.java @@ -118,6 +118,7 @@ class CExternalSettinsDeltaCalculator { fSetting = setting; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -128,6 +129,7 @@ class CExternalSettinsDeltaCalculator { ExtSettingMapKey other = (ExtSettingMapKey)obj; return settingsMatch(fSetting, other.fSetting); } + @Override public int hashCode() { return code(fSetting.getCompatibleLanguageIds()) + code(fSetting.getCompatibleContentTypeIds()) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescription.java index d68716c7c4b..449e944ae0c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescription.java @@ -54,6 +54,7 @@ public class CFileDescription extends CDataProxyContainer implements data.setPath(path); } + @Override void setData(CDataObject data) { super.setData(data); IPath cachedPath = getCachedPath(); @@ -90,6 +91,7 @@ public class CFileDescription extends CDataProxyContainer implements return (CFileData)getData(write); } + @Override protected IProxyProvider createChildProxyProvider() { ICDataScope scope = new ICDataScope(){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescriptionCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescriptionCache.java index 33b605ee209..b9c673a9529 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescriptionCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFileDescriptionCache.java @@ -35,6 +35,7 @@ public class CFileDescriptionCache extends CDefaultFileData implements copyDataFrom(base, true); } + @Override protected CLanguageData copyLanguageData(CLanguageData data, boolean clone) { return new CLanguageSettingCache(data, this); } @@ -47,11 +48,13 @@ public class CFileDescriptionCache extends CDefaultFileData implements return exclude == isExcluded(); } + @Override public void setName(String name) throws WriteAccessException{ throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setPath(IPath path) throws WriteAccessException{ throw ExceptionFactory.createIsReadOnlyException(); } @@ -87,10 +90,12 @@ public class CFileDescriptionCache extends CDefaultFileData implements return getRcDesHolder().getParentFolderDescription(); } + @Override public IPath getPath() { return ResourceDescriptionHolder.normalizePath(super.getPath()); } + @Override public boolean hasCustomSettings() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescription.java index 41e02b783bb..70aa13f3814 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescription.java @@ -61,6 +61,7 @@ public class CFolderDescription extends CDataProxyContainer implements return (CFolderData)getData(write); } + @Override protected IProxyProvider createChildProxyProvider() { ICDataScope scope = new ICDataScope(){ @@ -119,6 +120,7 @@ public class CFolderDescription extends CDataProxyContainer implements return fRcHolder; } + @Override void setData(CDataObject data) { super.setData(data); IPath cachedPath = getCachedPath(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescriptionCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescriptionCache.java index b59baac8424..218534bfffa 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescriptionCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CFolderDescriptionCache.java @@ -67,6 +67,7 @@ public class CFolderDescriptionCache extends CDefaultFolderData implements return getLanguageSettings(); } + @Override protected CLanguageData copyLanguageData(CLanguageData base, boolean clone) { return new CLanguageSettingCache(base, this); } @@ -79,6 +80,7 @@ public class CFolderDescriptionCache extends CDefaultFolderData implements return exclude == isExcluded(); } + @Override public void setPath(IPath path) throws WriteAccessException { throw ExceptionFactory.createIsReadOnlyException(); } @@ -119,11 +121,13 @@ public class CFolderDescriptionCache extends CDefaultFolderData implements throw ExceptionFactory.createIsReadOnlyException(); } + @Override public CLanguageData createLanguageDataForContentTypes(String languageId, String[] typesIds) { throw ExceptionFactory.createIsReadOnlyException(); } + @Override public CLanguageData createLanguageDataForExtensions(String languageId, String[] extensions) { throw ExceptionFactory.createIsReadOnlyException(); @@ -133,10 +137,12 @@ public class CFolderDescriptionCache extends CDefaultFolderData implements return getPath().segmentCount() == 0; } + @Override public IPath getPath() { return ResourceDescriptionHolder.normalizePath(super.getPath()); } + @Override public boolean hasCustomSettings() { return true; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSettingCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSettingCache.java index 2cabeb2f3ee..501b593d31b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSettingCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CLanguageSettingCache.java @@ -43,6 +43,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements copySettingsFrom(base); } + @Override protected void copySettingsFrom(CLanguageData data) { super.copySettingsFrom(data); fContainsDiscoveredScannerInfo = data.containsDiscoveredScannerInfo(); @@ -76,6 +77,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements } + @Override public String[] getSourceExtensions() { if(fCachedExtensions == null ){ String[] typeIds = getSourceContentTypeIds(); @@ -127,6 +129,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements } + @Override public void setLanguageId(String id) { throw ExceptionFactory.createIsReadOnlyException(); } @@ -139,6 +142,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements throw ExceptionFactory.createIsReadOnlyException(); } + @Override public void setEntries(int kind, ICLanguageSettingEntry[] entries) { throw ExceptionFactory.createIsReadOnlyException(); } @@ -163,6 +167,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements return true; } + @Override protected ICLanguageSettingEntry[] processStoredEntries( ICLanguageSettingEntry[] entries, int op) { if(entries.length != 0){ @@ -177,6 +182,7 @@ public class CLanguageSettingCache extends CDefaultLanguageData implements return entries; } + @Override public boolean containsDiscoveredScannerInfo() { return fContainsDiscoveredScannerInfo; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index b0278eb04d2..eca39798a5b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -336,6 +336,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { private Job createPostStartupJob() { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); Job rcJob = new Job(SettingsModelMessages.getString("CProjectDescriptionManager.0")){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { try{ startSaveParticipant(); @@ -766,6 +767,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { if(scheduleRule){ Job job = new Job(SettingsModelMessages.getString("CProjectDescriptionManager.12")){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { try { runAtomic(runnable, monitor); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CRefSettingsHolder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CRefSettingsHolder.java index 89ffe656885..f81ae299f0b 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CRefSettingsHolder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CRefSettingsHolder.java @@ -53,6 +53,7 @@ public class CRefSettingsHolder extends CExternalSettingsHolder { fIsReconsiled = s; } + @Override public void serialize(ICStorageElement el) { super.serialize(el); el.setAttribute(ATTR_FACTORY_ID, fContainerRef.getFactoryId()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CTargetPlatformSettingCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CTargetPlatformSettingCache.java index 4608bd01d9d..afa64175701 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CTargetPlatformSettingCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CTargetPlatformSettingCache.java @@ -42,6 +42,7 @@ public class CTargetPlatformSettingCache extends CDefaultTargetPlatformData return true; } + @Override public void setBinaryParserIds(String[] ids) { if(!fCfgCache.isInitializing()) throw ExceptionFactory.createIsReadOnlyException(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java index bdcc6a857f7..5c9abf2a52a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CfgExportSettingContainerFactory.java @@ -48,12 +48,14 @@ public class CfgExportSettingContainerFactory extends return fInstance; } + @Override public void startup(){ CProjectDescriptionManager.getInstance().addCProjectDescriptionListener(this, CProjectDescriptionEvent.APPLIED | CProjectDescriptionEvent.LOADDED); } + @Override public void shutdown(){ CProjectDescriptionManager.getInstance().removeCProjectDescriptionListener(this); } @@ -66,6 +68,7 @@ public class CfgExportSettingContainerFactory extends fCfgId = cfgId; } + @Override public CExternalSetting[] getExternalSettings() { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjName); if(project.exists() && project.isOpen()){ @@ -89,6 +92,7 @@ public class CfgExportSettingContainerFactory extends } + @Override public CExternalSettingsContainer createContainer(String id, IProject project, ICConfigurationDescription cfgDes) { try { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedEntriesContainerInitializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedEntriesContainerInitializer.java index 0de307eda7e..132619e5e46 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedEntriesContainerInitializer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedEntriesContainerInitializer.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IPath; public class ConfigBasedEntriesContainerInitializer extends PathEntryContainerInitializer { + @Override public void initialize(IPath containerPath, ICProject project) throws CoreException { ConfigBasedPathEntryContainer container = ConfigBasedPathEntryStore.createContainer(project.getProject()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ExtensionContainerFactory.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ExtensionContainerFactory.java index 049dc50e339..ba8b22b088e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ExtensionContainerFactory.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ExtensionContainerFactory.java @@ -40,6 +40,7 @@ public class ExtensionContainerFactory extends CExternalSettingContainerFactoryW private static class NullProvider extends CExternalSettingProvider { private static final NullProvider INSTANCE = new NullProvider(); + @Override public CExternalSetting[] getSettings(IProject project, ICConfigurationDescription cfg) { return new CExternalSetting[0]; } @@ -53,6 +54,7 @@ public class ExtensionContainerFactory extends CExternalSettingContainerFactoryW fSettings = (CExternalSetting[])settings.clone(); } + @Override public CExternalSetting[] getExternalSettings() { return (CExternalSetting[])fSettings.clone(); } @@ -169,6 +171,7 @@ public class ExtensionContainerFactory extends CExternalSettingContainerFactoryW return getInstance(); } + @Override public CExternalSettingsContainer createContainer(String id, IProject project, ICConfigurationDescription cfgDes) throws CoreException { CExtensionSettingProviderDescriptor dr = (CExtensionSettingProviderDescriptor)getProviderDescriptorMap().get(id); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/InternalXmlStorageElement.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/InternalXmlStorageElement.java index 35d2762ccd7..321823a62a6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/InternalXmlStorageElement.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/InternalXmlStorageElement.java @@ -116,6 +116,7 @@ public class InternalXmlStorageElement extends XmlStorageElement { } } + @Override public void clear() { if(fIsReadOnly) throw ExceptionFactory.createIsReadOnlyException(); @@ -124,6 +125,7 @@ public class InternalXmlStorageElement extends XmlStorageElement { fIsDirty = true; } + @Override protected XmlStorageElement createChild(Element element, boolean alowReferencingParent, String[] attributeFilters, String[] childFilters) { @@ -133,6 +135,7 @@ public class InternalXmlStorageElement extends XmlStorageElement { return new InternalXmlStorageElement(element, this, alowReferencingParent, attributeFilters, childFilters, fIsReadOnly); } + @Override public ICStorageElement createChild(String name, boolean alowReferencingParent, String[] attributeFilters, String[] childFilters) { @@ -144,6 +147,7 @@ public class InternalXmlStorageElement extends XmlStorageElement { childFilters); } + @Override public ICStorageElement createChild(String name) { if(fIsReadOnly) throw ExceptionFactory.createIsReadOnlyException(); @@ -152,25 +156,30 @@ public class InternalXmlStorageElement extends XmlStorageElement { return super.createChild(name); } + @Override public void removeAttribute(String name) { fIsDirty = true; super.removeAttribute(name); } + @Override public void setAttribute(String name, String value) { fIsDirty = true; super.setAttribute(name, value); } + @Override public void setValue(String value) { fIsDirty = true; super.setValue(value); } + @Override protected void removed() { super.removed(); } + @Override public ICStorageElement importChild(ICStorageElement el) throws UnsupportedOperationException { if(fIsReadOnly) @@ -179,6 +188,7 @@ public class InternalXmlStorageElement extends XmlStorageElement { return super.importChild(el); } + @Override public void removeChild(ICStorageElement el) { if(fIsReadOnly) throw ExceptionFactory.createIsReadOnlyException(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiConfigDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiConfigDescription.java index e30bf0e0e56..24c654f4670 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiConfigDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiConfigDescription.java @@ -56,6 +56,7 @@ public class MultiConfigDescription extends MultiItemsHolder implements /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.settings.model.MultiItemsHolder#getItems() */ + @Override public Object[] getItems() { return fCfgs; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiResourceDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiResourceDescription.java index e66f28be29a..fe32084386f 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiResourceDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiResourceDescription.java @@ -187,6 +187,7 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen /* (non-Javadoc) * @see org.eclipse.cdt.core.settings.model.ICMultiItemsHolder#getItems() */ + @Override public Object[] getItems() { return fRess; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/PathEntryConfigurationDataProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/PathEntryConfigurationDataProvider.java index 02a30832c7b..bc724fd8c0c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/PathEntryConfigurationDataProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/PathEntryConfigurationDataProvider.java @@ -135,10 +135,12 @@ public class PathEntryConfigurationDataProvider extends fSupportedKinds = kinds; } + @Override protected EntryStore createStore() { return fStore; } + @Override protected EntryStore createStore(CLanguageData data) { return fStore; } @@ -147,6 +149,7 @@ public class PathEntryConfigurationDataProvider extends private static class PathEntryDataFactory extends CDataFacroty { + @Override public CConfigurationData createConfigurationdata(String id, String name, CConfigurationData base, boolean clone) { if(clone){ @@ -158,6 +161,7 @@ public class PathEntryConfigurationDataProvider extends return new CfgData(id, name, base, clone); } + @Override public CFileData createFileData(CConfigurationData cfg, CResourceData base, CLanguageData base2, String id, boolean clone, @@ -170,6 +174,7 @@ public class PathEntryConfigurationDataProvider extends base2, cfg, this); } + @Override public CFolderData createFolderData(CConfigurationData cfg, CFolderData base, String id, boolean clone, IPath path) { if(id == null) @@ -177,6 +182,7 @@ public class PathEntryConfigurationDataProvider extends return new PathEntryFolderData(id, path, (PathEntryFolderData)base, cfg, this, clone); } + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, CLanguageData base, String id, boolean clone) { if(id == null) @@ -189,6 +195,7 @@ public class PathEntryConfigurationDataProvider extends return new PathEntryLanguageData(id, base, store); } + @Override public CLanguageData createLanguageData(CConfigurationData cfg, CResourceData rcBase, String id, String name, String languageId, int supportedEntryKinds, String[] rcTypes, boolean isContentTypes) { @@ -228,6 +235,7 @@ public class PathEntryConfigurationDataProvider extends return data instanceof CfgData; } + @Override public CConfigurationData applyConfiguration( ICConfigurationDescription des, ICConfigurationDescription baseDescription, @@ -277,6 +285,7 @@ public class PathEntryConfigurationDataProvider extends } + @Override public CConfigurationData createConfiguration( ICConfigurationDescription des, ICConfigurationDescription baseDescription, @@ -347,18 +356,21 @@ public class PathEntryConfigurationDataProvider extends return ids; } + @Override public CConfigurationData loadConfiguration(ICConfigurationDescription des, IProgressMonitor monitor) throws CoreException { return createData(des, null, false, true); } + @Override public void removeConfiguration(ICConfigurationDescription des, CConfigurationData data, IProgressMonitor monitor) { //do nothing for now } + @Override public void dataCached(ICConfigurationDescription cfgDes, CConfigurationData data, IProgressMonitor monitor) { fFactory.setModified(data, false); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ProviderBasedRcDesHolder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ProviderBasedRcDesHolder.java index b0a23354244..ddbad2ca305 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ProviderBasedRcDesHolder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ProviderBasedRcDesHolder.java @@ -22,31 +22,37 @@ public class ProviderBasedRcDesHolder extends ResourceDescriptionHolder { fProvider = provider; } + @Override public ICResourceDescription getResourceDescription(IPath path, boolean exactPath){ fProvider.cacheValues(); return super.getResourceDescription(path, exactPath); } + @Override public void addResourceDescription(IPath path, ICResourceDescription des){ fProvider.cacheValues(); super.addResourceDescription(path, des); } + @Override public ICResourceDescription[] getResourceDescriptions(final int kind){ fProvider.cacheValues(); return super.getResourceDescriptions(kind); } + @Override public ICResourceDescription getCurrentResourceDescription() { fProvider.cacheValues(); return super.getCurrentResourceDescription(); } + @Override public ICResourceDescription[] getResourceDescriptions() { fProvider.cacheValues(); return super.getResourceDescriptions(); } + @Override public ICResourceDescription[] getDirectChildren() { fProvider.cacheValues(); return super.getDirectChildren(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java index a7b36011cf3..ad0bc1d89c8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java @@ -291,6 +291,7 @@ public class ResourceChangeHandler extends ResourceChangeHandlerBase implements } + @Override protected IResourceMoveHandler createResourceMoveHandler( IResourceChangeEvent event) { return new RcMoveHandler(); @@ -326,6 +327,7 @@ public class ResourceChangeHandler extends ResourceChangeHandlerBase implements public void rollback(ISaveContext context) { } + @Override protected void doHahdleResourceMove(IResourceChangeEvent event, IResourceMoveHandler handler) { switch(event.getType()){ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ScannerInfoProviderProxy.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ScannerInfoProviderProxy.java index edb0ecf02b8..54a13fc0b86 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ScannerInfoProviderProxy.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ScannerInfoProviderProxy.java @@ -20,7 +20,6 @@ import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfoChangeListener; import org.eclipse.cdt.core.parser.IScannerInfoProvider; import org.eclipse.cdt.core.resources.ScannerProvider; -import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -117,12 +116,14 @@ public class ScannerInfoProviderProxy extends AbstractCExtensionProxy implements notifyInfoListeners(rc, info); } + @Override protected Object createDefaultProvider(ICConfigurationDescription des, boolean newStile){ if(newStile) return new DescriptionScannerInfoProvider(getProject()); return ScannerProvider.getInstance(); } + @Override protected void deinitializeProvider(Object o) { IScannerInfoProvider provider = (IScannerInfoProvider)o; provider.unsubscribe(getProject(), this); @@ -131,18 +132,21 @@ public class ScannerInfoProviderProxy extends AbstractCExtensionProxy implements } } + @Override protected void initializeProvider(Object o) { IScannerInfoProvider provider = (IScannerInfoProvider)o; fProvider = provider; provider.subscribe(getProject(), this); } + @Override protected void postProcessProviderChange(Object newProvider, Object oldProvider) { if(oldProvider != null) notifyInfoListeners(getProject(), getScannerInformation(getProject())); } + @Override protected boolean isValidProvider(Object o) { return o instanceof IScannerInfoProvider; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java index dcf961c2d67..c3bd75e9d31 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/SetCProjectDescriptionOperation.java @@ -35,6 +35,7 @@ public class SetCProjectDescriptionOperation extends CModelOperation { fSetDescription = description; } + @Override protected void executeOperation() throws CModelException { CProjectDescriptionManager mngr = CProjectDescriptionManager.getInstance(); ICProject cProject = (ICProject)getElementToProcess(); @@ -150,6 +151,7 @@ public class SetCProjectDescriptionOperation extends CModelOperation { return false; } + @Override public boolean isReadOnly() { return false; } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/CharArrayBuffer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/CharArrayBuffer.java index 2f5e499e5c1..0502428e342 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/CharArrayBuffer.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/CharArrayBuffer.java @@ -218,6 +218,7 @@ public class CharArrayBuffer { * Returns the contents of the buffer as a String, or null if * the buffer is empty. */ + @Override public String toString() { char[] contents = getContents(); return (contents != null) ? new String(contents) : null; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/LRUCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/LRUCache.java index 5298eb9958c..b46dcd35099 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/LRUCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/LRUCache.java @@ -87,6 +87,7 @@ public class LRUCache implements Cloneable { /** * Returns a String that represents the value of this object. */ + @Override public String toString() { return "LRUCacheEntry [" + _fKey + "-->" + _fValue + "]"; //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-2$ @@ -151,6 +152,7 @@ public class LRUCache implements Cloneable { * * @return New copy of object. */ + @Override public Object clone() { LRUCache newCache = newInstance(fSpaceLimit); @@ -455,6 +457,7 @@ public class LRUCache implements Cloneable { * Returns a String that represents the value of this object. This method * is for debugging purposes only. */ +@Override public String toString() { return "LRUCache " + (fCurrentSpace * 100.0 / fSpaceLimit) + "% full\n" + //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/OverflowingLRUCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/OverflowingLRUCache.java index 86421e7102f..564d9142eb9 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/OverflowingLRUCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/util/OverflowingLRUCache.java @@ -93,6 +93,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * * @return New copy of this object. */ + @Override public Object clone() { OverflowingLRUCache newCache = (OverflowingLRUCache)newInstance(fSpaceLimit, fOverflow); @@ -168,6 +169,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * * @param space Amount of space to free up */ + @Override protected boolean makeSpace(int space) { int limit = fSpaceLimit; @@ -244,6 +246,7 @@ public abstract class OverflowingLRUCache extends LRUCache { fClass = aClass; fCount = 1; } + @Override public String toString() { return "Class: " + fClass + " has " + fCount + " entries."; //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$ } @@ -271,6 +274,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * @param shuffle indicates whether we are just shuffling the queue * (i.e., the entry table is left alone). */ + @Override protected void privateRemoveEntry (LRUCacheEntry entry, boolean shuffle) { privateRemoveEntry(entry, shuffle, true); } @@ -328,6 +332,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * @param value Value of object to add. * @return added value. */ + @Override public Object put(Object key, Object value) { /* attempt to rid ourselves of the overflow, if there is any */ if (fOverflow > 0) @@ -393,6 +398,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * * @param limit Number of units of cache space */ + @Override public void setSpaceLimit(int limit) { if (limit < fSpaceLimit) { makeSpace(fSpaceLimit - limit); @@ -412,6 +418,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * Returns a String that represents the value of this object. This method * is for debugging purposes only. */ + @Override public String toString() { return "OverflowingLRUCache " + this.fillingRatio() + "% full\n" + //$NON-NLS-1$ //$NON-NLS-2$ @@ -423,6 +430,7 @@ public abstract class OverflowingLRUCache extends LRUCache { * *

    This method will do nothing if timestamps have been disabled. */ + @Override protected void updateTimestamp(LRUCacheEntry entry) { if (fTimestampsOn) { entry._fTimestamp = fTimestampCounter++; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTNodeProperty.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTNodeProperty.java index baf2748704e..1136cbca8bb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTNodeProperty.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTNodeProperty.java @@ -48,6 +48,7 @@ public class ASTNodeProperty { this.name = name; } + @Override public String toString() { return getName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBuiltinSymbolProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBuiltinSymbolProvider.java index 6708e0a727b..981df2b69a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBuiltinSymbolProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBuiltinSymbolProvider.java @@ -19,6 +19,7 @@ package org.eclipse.cdt.core.dom.ast; * * @deprecated Use {@link org.eclipse.cdt.core.dom.parser.IBuiltinBindingsProvider} instead */ +@Deprecated public interface IASTBuiltinSymbolProvider { /** 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 1adc30d3191..899de062ee5 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 @@ -47,6 +47,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE /** * @deprecated see {@link IScannerExtensionConfiguration#initializeMacroValuesTo1()} */ + @Deprecated public boolean initializeMacroValuesTo1() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/IScannerExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/IScannerExtensionConfiguration.java index e35a70264c8..a9442d76b17 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/IScannerExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/IScannerExtensionConfiguration.java @@ -39,6 +39,7 @@ public interface IScannerExtensionConfiguration { * @deprecated empty macros are taken as they are. It is the task of configuration to provide the correct values. * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=215789 */ + @Deprecated public boolean initializeMacroValuesTo1(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/GCCParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/GCCParserExtensionConfiguration.java index d3ffad3aa87..46fe2eff855 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/GCCParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/GCCParserExtensionConfiguration.java @@ -23,34 +23,39 @@ public class GCCParserExtensionConfiguration extends AbstractCParserExtensionCon /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportStatementsInExpressions() */ - public boolean supportStatementsInExpressions() { + @Override + public boolean supportStatementsInExpressions() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportGCCStyleDesignators() */ - public boolean supportGCCStyleDesignators() { + @Override + public boolean supportGCCStyleDesignators() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportTypeofUnaryExpressions() */ - public boolean supportTypeofUnaryExpressions() { + @Override + public boolean supportTypeofUnaryExpressions() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportAlignOfUnaryExpression() */ - public boolean supportAlignOfUnaryExpression() { + @Override + public boolean supportAlignOfUnaryExpression() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportKnRC() */ + @Override public boolean supportKnRC() { return true; } @@ -58,6 +63,7 @@ public class GCCParserExtensionConfiguration extends AbstractCParserExtensionCon /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportAttributeSpecifiers() */ + @Override public boolean supportAttributeSpecifiers() { return true; } @@ -65,6 +71,7 @@ public class GCCParserExtensionConfiguration extends AbstractCParserExtensionCon /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#supportDeclspecSpecifiers() */ + @Override public boolean supportDeclspecSpecifiers() { return true; } @@ -72,6 +79,7 @@ public class GCCParserExtensionConfiguration extends AbstractCParserExtensionCon /* * @see org.eclipse.cdt.core.dom.parser.c.AbstractCParserExtensionConfiguration#getBuiltinSymbolProvider() */ + @Override public IBuiltinBindingsProvider getBuiltinBindingsProvider() { return new GCCBuiltinSymbolProvider(ParserLanguage.C); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/ICParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/ICParserExtensionConfiguration.java index 353184f4d8a..1eb560c41be 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/ICParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/ICParserExtensionConfiguration.java @@ -86,6 +86,7 @@ public interface ICParserExtensionConfiguration { * enabled * @deprecated use {@link #getBuiltinBindingsProvider()} instead. */ + @Deprecated public boolean supportGCCOtherBuiltinSymbols(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPParserExtensionConfiguration.java index ac4c70893b8..84c6d2d0d10 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/GPPParserExtensionConfiguration.java @@ -23,69 +23,79 @@ public class GPPParserExtensionConfiguration extends AbstractCPPParserExtensionC /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#allowRestrictPointerOperators() */ - public boolean allowRestrictPointerOperators() { + @Override + public boolean allowRestrictPointerOperators() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportTypeofUnaryExpressions() */ - public boolean supportTypeofUnaryExpressions() { + @Override + public boolean supportTypeofUnaryExpressions() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportAlignOfUnaryExpression() */ - public boolean supportAlignOfUnaryExpression() { + @Override + public boolean supportAlignOfUnaryExpression() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportExtendedTemplateSyntax() */ - public boolean supportExtendedTemplateSyntax() { + @Override + public boolean supportExtendedTemplateSyntax() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportMinAndMaxOperators() */ - public boolean supportMinAndMaxOperators() { + @Override + public boolean supportMinAndMaxOperators() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportStatementsInExpressions() */ - public boolean supportStatementsInExpressions() { + @Override + public boolean supportStatementsInExpressions() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportComplexNumbers() */ - public boolean supportComplexNumbers() { + @Override + public boolean supportComplexNumbers() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportRestrictKeyword() */ - public boolean supportRestrictKeyword() { + @Override + public boolean supportRestrictKeyword() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportLongLongs() */ - public boolean supportLongLongs() { + @Override + public boolean supportLongLongs() { return true; } /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportKnRC() */ + @Override public boolean supportKnRC() { return false; } @@ -93,6 +103,7 @@ public class GPPParserExtensionConfiguration extends AbstractCPPParserExtensionC /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportAttributeSpecifiers() */ + @Override public boolean supportAttributeSpecifiers() { return true; } @@ -100,6 +111,7 @@ public class GPPParserExtensionConfiguration extends AbstractCPPParserExtensionC /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#supportDeclspecSpecifiers() */ + @Override public boolean supportDeclspecSpecifiers() { return true; } @@ -107,6 +119,7 @@ public class GPPParserExtensionConfiguration extends AbstractCPPParserExtensionC /* * @see org.eclipse.cdt.core.dom.parser.cpp.AbstractCPPParserExtensionConfiguration#getBuiltinBindingsProvider() */ + @Override public IBuiltinBindingsProvider getBuiltinBindingsProvider() { return new GCCBuiltinSymbolProvider(ParserLanguage.CPP); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java index 75d424c7b46..0de52efa141 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java @@ -135,6 +135,7 @@ public interface ICPPParserExtensionConfiguration { * enabled * @deprecated use {@link #getBuiltinSymbolProvider(IScope)} instead. */ + @Deprecated public boolean supportGCCOtherBuiltinSymbols(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IndexFilter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IndexFilter.java index 0a1df4daf34..43b8a2baa25 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IndexFilter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IndexFilter.java @@ -44,6 +44,7 @@ abstract public class IndexFilter { */ public static IndexFilter getFilter(final int linkageID) { return new IndexFilter() { + @Override public boolean acceptLinkage(ILinkage linkage) { return linkageID == linkage.getLinkageID(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java index 596298b990e..873c59581fc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReader.java @@ -162,7 +162,8 @@ public class CodeReader { return !CharArrayUtils.equals( filename, NOFILE ); } - public String toString() { + @Override + public String toString() { return getPath(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java index 024c66b7b38..ffc4c9f28c1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java @@ -93,16 +93,20 @@ public interface IToken { static public final int tDIV = 52; /** @deprecated use {@link #tAND} */ + @Deprecated static public final int t_and = 54; /** @deprecated use {@link #tAMPERASSIGN} */ + @Deprecated static public final int t_and_eq = 55; static public final int t_asm = 56; static public final int t_auto = 57; /** @deprecated use {@link #tAMPER} */ + @Deprecated static public final int t_bitand = 58; /** @deprecated use {@link #tBITOR} */ + @Deprecated static public final int t_bitor = 59; static public final int t_bool = 60; @@ -113,8 +117,10 @@ public interface IToken { static public final int t_class = 65; /** @deprecated use {@link #tBITCOMPLEMENT} */ + @Deprecated static public final int tCOMPL= tBITCOMPLEMENT; /** @deprecated use {@link #tBITCOMPLEMENT} */ + @Deprecated static public final int t_compl = 66; static public final int t_const = 67; @@ -144,15 +150,19 @@ public interface IToken { static public final int t_new = 92; /** @deprecated use {@link #tNOT} */ + @Deprecated static public final int t_not = 93; /** @deprecated use {@link #tNOTEQUAL} */ + @Deprecated static public final int t_not_eq = 94; static public final int t_operator = 95; /** @deprecated use {@link #tOR} */ + @Deprecated static public final int t_or = 96; /** @deprecated use {@link #tBITORASSIGN} */ + @Deprecated static public final int t_or_eq = 97; static public final int t_private = 98; @@ -186,8 +196,10 @@ public interface IToken { static public final int t_while = 126; /** @deprecated use {@link #tXOR} */ + @Deprecated static public final int t_xor = 127; /** @deprecated use {@link #tXORASSIGN} */ + @Deprecated static public final int t_xor_eq = 128; static public final int tFLOATINGPT = 129; @@ -201,6 +213,7 @@ public interface IToken { static public final int t_restrict = 137; /** @deprecated don't use it */ + @Deprecated static public final int tMACROEXP = 138; static public final int tPOUND= 138; @@ -209,8 +222,10 @@ public interface IToken { static public final int tEOC = 141; // End of Completion /** @deprecated don't use it */ + @Deprecated static public final int tCOMMENT = 142; /** @deprecated don't use it */ + @Deprecated static public final int tBLOCKCOMMENT = 143; static public final int tEND_OF_INPUT= 144; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayIntMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayIntMap.java index 71925d49e1c..eedeb6ffd8d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayIntMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayIntMap.java @@ -25,6 +25,7 @@ public class CharArrayIntMap extends CharTable { this.undefined = undefined; } + @Override protected void resize(int size) { int[] oldValueTable = valueTable; valueTable = new int[size]; @@ -32,11 +33,13 @@ public class CharArrayIntMap extends CharTable { super.resize(size); } + @Override public void clear() { super.clear(); for( int i = 0; i < capacity(); i++ ) valueTable[i] = undefined; } + @Override public Object clone(){ CharArrayIntMap newMap = (CharArrayIntMap) super.clone(); newMap.valueTable = new int[ capacity() ]; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java index 4beef53605e..d2be1e64c8a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java @@ -21,9 +21,12 @@ import java.util.List; */ public class CharArrayObjectMap extends CharTable { public static final CharArrayObjectMap EMPTY_MAP = new CharArrayObjectMap( 0 ){ - public Object clone() { return this; } - public List toList() { return Collections.EMPTY_LIST; } - public Object put( char[] key, int start, int length, Object value ) + @Override + public Object clone() { return this; } + @Override + public List toList() { return Collections.EMPTY_LIST; } + @Override + public Object put( char[] key, int start, int length, Object value ) { throw new UnsupportedOperationException(); } }; @@ -79,6 +82,7 @@ public class CharArrayObjectMap extends CharTable { return value; } + @Override public Object clone(){ CharArrayObjectMap newTable = (CharArrayObjectMap) super.clone(); newTable.valueTable = new Object[ capacity() ]; @@ -87,6 +91,7 @@ public class CharArrayObjectMap extends CharTable { return newTable; } + @Override protected void resize(int size) { Object[] oldValueTable = valueTable; valueTable = new Object[size]; @@ -94,13 +99,15 @@ public class CharArrayObjectMap extends CharTable { super.resize(size); } + @Override public void clear() { super.clear(); for( int i = 0; i < capacity(); i++ ) valueTable[i] = null; } - protected int partition( Comparator c, int p, int r ){ + @Override + protected int partition( Comparator c, int p, int r ){ char[] x = keyTable[ p ]; Object temp = null; int i = p; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java index eb4b0ba6e00..2b02308713e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArraySet.java @@ -23,11 +23,16 @@ import java.util.List; public class CharArraySet extends CharTable { public static final CharArraySet EMPTY_SET = new CharArraySet( 0 ){ - public Object clone() { return this; } - public List toList() { return Collections.EMPTY_LIST; } - public void put( char[] key ) { throw new UnsupportedOperationException(); } - public void addAll( List list ) { throw new UnsupportedOperationException(); } - public void addAll( CharArraySet set ) { throw new UnsupportedOperationException(); } + @Override + public Object clone() { return this; } + @Override + public List toList() { return Collections.EMPTY_LIST; } + @Override + public void put( char[] key ) { throw new UnsupportedOperationException(); } + @Override + public void addAll( List list ) { throw new UnsupportedOperationException(); } + @Override + public void addAll( CharArraySet set ) { throw new UnsupportedOperationException(); } }; public CharArraySet(int initialSize) { @@ -66,6 +71,7 @@ public class CharArraySet extends CharTable { return true; } + @Override final public void clear(){ for( int i = 0; i < keyTable.length; i++ ){ keyTable[i] = null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java index ac041b4ce18..65b338630ec 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharTable.java @@ -28,6 +28,7 @@ public class CharTable extends HashTable { keyTable = new char[capacity()][]; } + @Override protected void resize(int size) { char[][] oldKeyTable = keyTable; keyTable = new char[size][]; @@ -35,12 +36,14 @@ public class CharTable extends HashTable { super.resize(size); } + @Override public void clear() { super.clear(); for( int i = 0; i < capacity(); i++ ) keyTable[i] = null; } + @Override public Object clone(){ CharTable newTable = (CharTable) super.clone(); @@ -55,6 +58,7 @@ public class CharTable extends HashTable { return CharArrayUtils.hash(source, start, length) & ((keyTable.length * 2) - 1); } + @Override protected final int hash( int pos ){ return hash(keyTable[pos], 0, keyTable[pos].length); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/HashTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/HashTable.java index b757a3d7ead..35416cd66c0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/HashTable.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/HashTable.java @@ -47,6 +47,7 @@ public class HashTable implements Cloneable{ } } + @Override public Object clone() { HashTable newTable = null; try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectMap.java index 37bfd563677..5a8a1d31532 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectMap.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectMap.java @@ -24,9 +24,12 @@ import java.util.List; */ public class ObjectMap extends ObjectTable { public static final ObjectMap EMPTY_MAP = new ObjectMap(0) { - public Object clone() { return this; } - public List toList() { return Collections.emptyList(); } - public Object put(Object key, Object value) { throw new UnsupportedOperationException(); } + @Override + public Object clone() { return this; } + @Override + public List toList() { return Collections.emptyList(); } + @Override + public Object put(Object key, Object value) { throw new UnsupportedOperationException(); } }; private Object[] valueTable; @@ -36,6 +39,7 @@ public class ObjectMap extends ObjectTable { valueTable = new Object[capacity()]; } + @Override public Object clone() { ObjectMap newMap = (ObjectMap) super.clone(); newMap.valueTable = new Object[capacity()]; @@ -43,6 +47,7 @@ public class ObjectMap extends ObjectTable { return newMap; } + @Override final public void clear() { super.clear(); for(int i = 0; i < valueTable.length; i++) { @@ -50,6 +55,7 @@ public class ObjectMap extends ObjectTable { } } + @Override protected void resize(int size) { Object[] oldValueTable = valueTable; valueTable = new Object[size]; @@ -91,6 +97,7 @@ public class ObjectMap extends ObjectTable { return value; } + @Override final protected void removeEntry(int i) { // Remove the entry from the valueTable, shifting everything over if necessary if (i < currEntry) @@ -138,6 +145,7 @@ public class ObjectMap extends ObjectTable { return vals; } + @Override public String toString() { StringBuilder sb = new StringBuilder("{"); //$NON-NLS-1$ for (int i = 0; i < size(); i++) { 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 0f9df111cc6..3ad9b1968ee 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 @@ -32,6 +32,7 @@ public abstract class ObjectTable extends HashTable implements Cloneable{ keyTable= (T[]) new Object[capacity()]; } + @Override @SuppressWarnings("unchecked") public Object clone(){ ObjectTable newTable = (ObjectTable) super.clone(); @@ -59,12 +60,14 @@ public abstract class ObjectTable extends HashTable implements Cloneable{ return keyTable[i]; } + @Override public void clear(){ super.clear(); for( int i = 0; i < keyTable.length; i++ ) keyTable[i] = null; } + @Override protected final int hash( int pos ){ return hash(keyTable[pos]); } @@ -73,6 +76,7 @@ public abstract class ObjectTable extends HashTable implements Cloneable{ return obj.hashCode() & ((capacity() * 2) - 1); } + @Override @SuppressWarnings("unchecked") protected void resize(int size) { Object[] oldKeyTable = keyTable; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java index d0f09a2dc3c..d73327686ca 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ParserLogServiceWrapper.java @@ -21,10 +21,12 @@ public class ParserLogServiceWrapper extends AbstractParserLogService { public ParserLogServiceWrapper(IParserLogService log) { fDelegate= log; } + @Override public boolean isTracing() { return fDelegate.isTracing(); } + @Override public void traceLog(String message) { fDelegate.traceLog(message); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java index e5bcdf1f240..c713c0f43c1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java @@ -123,7 +123,8 @@ public class ProblemBinding extends PlatformObject implements IProblemBinding, I return getASTNode(); } - public Object clone(){ + @Override + public Object clone(){ //don't clone problems return this; } 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 e6941587b0f..bf9ee4b4fc2 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 @@ -37,7 +37,8 @@ public class CASTASMDeclaration extends CASTNode implements IASTASMDeclaration { this.assembly = assembly.toCharArray(); } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 f697efca524..a6dc5f62556 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 @@ -42,7 +42,8 @@ public class CASTAmbiguousExpression extends CASTAmbiguity implements return expressions; } - protected IASTNode[] getNodes() { + @Override + protected IASTNode[] getNodes() { return getExpressions(); } 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 09260a42d66..32189afc224 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 @@ -52,7 +52,8 @@ public class CASTArrayDeclarator extends CASTDeclarator implements IASTArrayDecl } } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ IASTArrayModifier [] mods = getArrayModifiers(); for ( int i = 0; i < mods.length; i++ ) { if( !mods[i].accept( action ) ) return false; 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 e274d829d33..83a8da94774 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 @@ -44,7 +44,8 @@ public class CASTArrayModifier extends CASTNode implements IASTArrayModifier, IA } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( exp != null ) if( !exp.accept( action ) ) return false; return true; } 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 717e0e6e41a..0f7f8e3809b 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 @@ -59,7 +59,8 @@ public class CASTArraySubscriptExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 74fe0a5076f..7de2f2cdd84 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 @@ -72,7 +72,8 @@ public class CASTBinaryExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 478496ad23d..4a85eed6a2e 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 @@ -19,7 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IASTBreakStatement; */ public class CASTBreakStatement extends CASTNode implements IASTBreakStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 f0d4ce31c6b..fca8475eacd 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 @@ -44,7 +44,8 @@ public class CASTCaseStatement extends CASTNode implements IASTCaseStatement, IA } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 82c74ee5480..795dd90a590 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 @@ -43,7 +43,8 @@ public class CASTCastExpression extends CASTUnaryExpression implements IASTCastE return typeId; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java index 6354c7b8068..fa75d2783a9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompositeTypeSpecifier.java @@ -85,11 +85,13 @@ public class CASTCompositeTypeSpecifier extends CASTBaseDeclSpecifier implements } - public String getRawSignature() { + @Override + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 6e57a639f5d..ecbdd134c8d 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 @@ -47,7 +47,8 @@ public class CASTCompoundStatement extends CASTNode implements IASTCompoundState return scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 35856691b2d..9ab2fe6bf8c 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 @@ -43,7 +43,8 @@ public class CASTCompoundStatementExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 61760c2725a..bbd37e7fe7e 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 @@ -74,7 +74,8 @@ public class CASTConditionalExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 3e8c1017ad1..3e5ca624719 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 @@ -20,7 +20,8 @@ import org.eclipse.cdt.core.dom.ast.IASTContinueStatement; public class CASTContinueStatement extends CASTNode implements IASTContinueStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 f12c3da5f0c..41c05dc3852 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 @@ -42,7 +42,8 @@ public class CASTDeclarationStatement extends CASTNode implements IASTDeclaratio } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 690c45a9ed2..c10251769c1 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 @@ -102,7 +102,8 @@ public class CASTDeclarator extends CASTNode implements IASTDeclarator { } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarators ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 b297ef01214..11d069bc933 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 @@ -20,7 +20,8 @@ import org.eclipse.cdt.core.dom.ast.IASTDefaultStatement; public class CASTDefaultStatement extends CASTNode implements IASTDefaultStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 79a91737be2..781f1e36360 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 @@ -65,7 +65,8 @@ public class CASTDesignatedInitializer extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 81a24a76f39..9d9fd804f7c 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 @@ -61,7 +61,8 @@ public class CASTDoStatement extends CASTNode implements IASTDoStatement, IASTAm } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 ab2411e9436..38337efd492 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 @@ -58,7 +58,8 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 499bf633b53..2b3a9df31fa 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 @@ -64,11 +64,13 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier implements return name; } - public String getRawSignature() { + @Override + public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 1472cfb86d7..3c8046f0bbf 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 @@ -59,7 +59,8 @@ public class CASTEnumerator extends CASTNode implements IASTEnumerator, IASTAmbi return value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitEnumerators ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 ee3e07e2860..b243c55070d 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 @@ -42,7 +42,8 @@ public class CASTExpressionList extends CASTNode implements IASTExpressionList, private IASTExpression [] expressions = new IASTExpression[2]; - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitExpressions) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: 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 d8a81110b4c..d4fcd716ba4 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 @@ -45,7 +45,8 @@ public class CASTExpressionStatement extends CASTNode implements } } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitStatements) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: 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 9540af2c0fd..b404d5e6269 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 @@ -48,7 +48,8 @@ public class CASTFieldDeclarator extends CASTDeclarator implements } } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ if( bitFieldSize != null ) if( !bitFieldSize.accept( action ) ) return false; IASTInitializer initializer = getInitializer(); 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 1f41ea8eb33..4c17850cf6d 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 @@ -78,7 +78,8 @@ public class CASTFieldReference extends CASTNode implements IASTFieldReference, ptr = value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 1b66e9eb9d1..de851a38cc8 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 @@ -94,7 +94,8 @@ public class CASTForStatement extends CASTNode implements IASTForStatement, IAST return scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 07202b16073..c5e73b748d1 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 @@ -60,7 +60,8 @@ public class CASTFunctionCallExpression extends CASTNode implements return parameter; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 382a994c93f..401e7dfa38f 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 @@ -57,7 +57,8 @@ public class CASTFunctionDeclarator extends CASTDeclarator implements IASTStanda varArgs = value; } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ IASTParameterDeclaration [] params = getParameters(); for ( int i = 0; i < params.length; i++ ) { if( !params[i].accept( action ) ) return false; 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 ca8df71d10d..0f5d0c99777 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 @@ -84,7 +84,8 @@ public class CASTFunctionDefinition extends CASTNode implements return scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 b94756f8b61..bd8b9096732 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 @@ -41,7 +41,8 @@ public class CASTGotoStatement extends CASTNode implements IASTGotoStatement { } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 3e105d44313..bb7a60ed860 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 @@ -50,7 +50,8 @@ public class CASTIdExpression extends CASTNode implements IASTIdExpression, IAST } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 a41aa7e2a58..7c42f51ca90 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 @@ -79,7 +79,8 @@ public class CASTIfStatement extends CASTNode implements IASTIfStatement, IASTAm } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java index ee05f49fba1..3478441533a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerExpression.java @@ -45,7 +45,8 @@ public class CASTInitializerExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 cb44871da88..1c145c6159d 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 @@ -41,7 +41,8 @@ public class CASTInitializerList extends CASTNode implements private IASTInitializer [] initializers = null; private int initializersPos=-1; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 8b3e098cf82..6ad7af40e6f 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,7 +71,8 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn return parameterDeclarations; } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ IASTName [] ns = getParameterNames(); for ( int i = 0; i < ns.length; i++ ) { if( !ns[i].accept( action ) ) return false; @@ -105,6 +106,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn return null; } + @Override public int getRoleForName(IASTName name) { IASTName [] n = getParameterNames(); for( int i = 0; i < n.length; ++i ) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java index cef5a2d59d9..ab24c6b9961 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java @@ -47,7 +47,8 @@ public class CASTLabelStatement extends CASTNode implements IASTLabelStatement, } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java index 222a1e17db7..537dd43ed36 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java @@ -45,11 +45,13 @@ public class CASTLiteralExpression extends CASTNode implements IASTLiteralExpres this.value = value; } - public String toString() { + @Override + public String toString() { return value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java index 4af7a759751..53dcdf0d6fb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java @@ -79,7 +79,8 @@ public class CASTName extends CASTNode implements IASTName, IASTCompletionContex } - public String toString() { + @Override + public String toString() { if (name == EMPTY_CHAR_ARRAY) return EMPTY_STRING; return new String(name); @@ -89,7 +90,8 @@ public class CASTName extends CASTNode implements IASTName, IASTCompletionContex return name; } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitNames) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java index 341af30d720..fa56fbbced5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java @@ -19,7 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IASTNullStatement; */ public class CASTNullStatement extends CASTNode implements IASTNullStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java index c43f194af41..8cfb80f3da3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java @@ -58,7 +58,8 @@ public class CASTParameterDeclaration extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitParameterDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java index f7a56ff92ea..fad9781d230 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java @@ -46,7 +46,8 @@ public class CASTPointer extends CASTNode implements ICASTPointer { isVolatile = value; } - public boolean accept(ASTVisitor visitor) { + @Override + public boolean accept(ASTVisitor visitor) { return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java index 366986cb58c..1293228be3d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java @@ -45,7 +45,8 @@ public class CASTReturnStatement extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java index a90fec7b7c4..6c8bcd02b08 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java @@ -76,7 +76,8 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC longlong = value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java index bf6fae9dc37..626944748ff 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java @@ -63,7 +63,8 @@ public class CASTSimpleDeclaration extends CASTNode implements IASTSimpleDeclara } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java index 63ed82243ec..614bde82f47 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java @@ -59,7 +59,8 @@ public class CASTSwitchStatement extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java index 1c6b14e3902..4b6d6e33363 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java @@ -57,7 +57,8 @@ public class CASTTypeId extends CASTNode implements IASTTypeId { } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitTypeIds ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java index 75866ae6c2b..00e43f2638c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java @@ -53,7 +53,8 @@ public class CASTTypeIdExpression extends CASTNode implements return typeId; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java index cfda5c9ed7d..cf329bb7d2a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java @@ -59,7 +59,8 @@ public class CASTTypeIdInitializerExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java index 6c9651d11f2..637f078bdc5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java @@ -48,7 +48,8 @@ public class CASTTypedefNameSpecifier extends CASTBaseDeclSpecifier implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java index 4981b0d1a1b..2ef387bf336 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java @@ -56,7 +56,8 @@ public class CASTUnaryExpression extends CASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java index 92d4a8fad1e..d53c5c47dea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java @@ -59,7 +59,8 @@ public class CASTWhileStatement extends CASTNode implements IASTWhileStatement, } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java index baa9307e2aa..c721d469a32 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java @@ -113,7 +113,8 @@ public class CArrayType implements ICArrayType, ITypeContainer { return mod.isVariableSized(); } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java index f0a43dcfee2..1e6cd7e372a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java @@ -135,7 +135,8 @@ public class CBasicType implements ICBasicType { && cObj.isImaginary() == this.isImaginary()); } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java index 17133dc9f43..3cbe57a6dd7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java @@ -42,7 +42,8 @@ public class CCompositeTypeScope extends CScope implements ICCompositeTypeScope /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IScope#find(java.lang.String) */ - public IBinding[] find( String name ) { + @Override + public IBinding[] find( String name ) { CollectNamesAction action = new CollectNamesAction( name.toCharArray() ); getPhysicalNode().accept( action ); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java index e1a90910d1e..7e466db5e3f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java @@ -112,7 +112,8 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return CVisitor.getContainingScope( definition != null ? definition : declarations[0].getParent() ); } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CExternalFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CExternalFunction.java index 8b95cf1caee..1020cb7b526 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CExternalFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CExternalFunction.java @@ -40,7 +40,8 @@ public class CExternalFunction extends CFunction implements IFunction, ICExterna /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getType() */ - public IFunctionType getType() { + @Override + public IFunctionType getType() { IFunctionType t = super.getType(); if( t == null ) { type = new CPPFunctionType( CPPSemantics.VOID_TYPE, IType.EMPTY_TYPE_ARRAY ); @@ -48,35 +49,40 @@ public class CExternalFunction extends CFunction implements IFunction, ICExterna return type; } - protected IASTTranslationUnit getTranslationUnit() { + @Override + protected IASTTranslationUnit getTranslationUnit() { return tu; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ - public String getName() { + @Override + public String getName() { return name.toString(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name.toCharArray(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return tu.getScope(); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#isExtern() */ - public boolean isExtern() { + @Override + public boolean isExtern() { return true; } } 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 98134114cb3..0c2a79b3a47 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 @@ -73,7 +73,8 @@ public class CFunctionScope extends CScope implements ICFunctionScope { shouldVisitStatements = true; } - public int visit( IASTStatement statement ) { + @Override + public int visit( IASTStatement statement ) { if( statement instanceof IASTLabelStatement ){ labels = (IASTLabelStatement[]) ArrayUtil.append( IASTLabelStatement.class, labels, statement ); } 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 96aef981c68..eaf026e0dae 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 @@ -73,7 +73,8 @@ public class CFunctionType implements IFunctionType { return parameters; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitFunction.java index a219515e6a7..7a05cfb9699 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitFunction.java @@ -43,7 +43,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getParameters() */ - public IParameter[] getParameters() { + @Override + public IParameter[] getParameters() { return parms; } @@ -51,7 +52,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getType() */ - public IFunctionType getType() { + @Override + public IFunctionType getType() { return type; } @@ -59,7 +61,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#takesVarArgs() */ - public boolean takesVarArgs() { + @Override + public boolean takesVarArgs() { return takesVarArgs; } @@ -67,7 +70,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ - public String getName() { + @Override + public String getName() { return String.valueOf(name); } @@ -75,7 +79,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name; } @@ -83,7 +88,8 @@ public class CImplicitFunction extends CExternalFunction implements IFunction, I * (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return scope; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java index 9ceacffb672..945a14559d7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java @@ -38,28 +38,32 @@ public class CImplicitTypedef extends CTypedef implements ITypedef, ICInternalBi /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.ITypedef#getType() */ - public IType getType() { + @Override + public IType getType() { return type; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() */ - public String getName() { + @Override + public String getName() { return String.valueOf(name); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return scope; } @@ -100,14 +104,17 @@ public class CImplicitTypedef extends CTypedef implements ITypedef, ICInternalBi * returns null * @return */ - public IASTNode getPhysicalNode() { + @Override + public IASTNode getPhysicalNode() { return null; } + @Override public IASTNode[] getDeclarations() { return IASTNode.EMPTY_NODE_ARRAY; } + @Override public IASTNode getDefinition() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java index 943e3602612..7666c2faea2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CPointerType.java @@ -87,7 +87,8 @@ public class CPointerType implements ICPointerType, ITypeContainer { return (qualifiers & IS_VOLATILE) != 0; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifiedPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifiedPointerType.java index 97e44c3e1dd..89f2d419cc8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifiedPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifiedPointerType.java @@ -66,7 +66,8 @@ public class CQualifiedPointerType implements ICPointerType, ITypeContainer { return ((ICASTArrayModifier)mod).isVolatile(); } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); 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 33cb40c12d4..1aa3488d623 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 @@ -125,7 +125,8 @@ public class CQualifierType implements ICQualifierType, ITypeContainer { type = t; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); 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 1f763bb732f..1648add2bea 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 @@ -65,19 +65,23 @@ public class CScope implements ICScope, IASTInternalScope { private static final IndexFilter[] INDEX_FILTERS = { new IndexFilter() { // namespace type tag + @Override public boolean acceptBinding(IBinding binding) throws CoreException { return IndexFilter.C_DECLARED_OR_IMPLICIT.acceptBinding(binding) && (binding instanceof ICompositeType || binding instanceof IEnumeration); } + @Override public boolean acceptLinkage(ILinkage linkage) { return IndexFilter.C_DECLARED_OR_IMPLICIT.acceptLinkage(linkage); } }, new IndexFilter() { // namespace type other + @Override public boolean acceptBinding(IBinding binding) throws CoreException { return IndexFilter.C_DECLARED_OR_IMPLICIT.acceptBinding(binding) && !(binding instanceof ICompositeType || binding instanceof IEnumeration); } + @Override public boolean acceptLinkage(ILinkage linkage) { return IndexFilter.C_DECLARED_OR_IMPLICIT.acceptLinkage(linkage); } @@ -109,7 +113,8 @@ public class CScope implements ICScope, IASTInternalScope { name = n; shouldVisitNames = true; } - public int visit( IASTName n ){ + @Override + public int visit( IASTName n ){ ASTNodeProperty prop = n.getPropertyInParent(); if( prop == IASTElaboratedTypeSpecifier.TYPE_NAME || prop == IASTCompositeTypeSpecifier.TYPE_NAME || @@ -121,7 +126,8 @@ public class CScope implements ICScope, IASTInternalScope { return PROCESS_CONTINUE; } - public int visit( IASTStatement statement ){ + @Override + public int visit( IASTStatement statement ){ if( statement instanceof IASTDeclarationStatement ) return PROCESS_CONTINUE; return PROCESS_SKIP; 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 e75a0cdfbd4..419a489ef0e 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 @@ -234,7 +234,8 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte return (definition != null ) ? ((IASTCompositeTypeSpecifier)definition.getParent()).getScope() : null; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CTypedef.java index 1f0ce8db1ae..3b127436893 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CTypedef.java @@ -69,7 +69,8 @@ public class CTypedef extends PlatformObject implements ITypedef, ITypeContainer return CVisitor.getContainingScope( declarator.getParent() ); } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); 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 c39d7869b5d..dcfb9aa22df 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 @@ -46,7 +46,8 @@ public class GCCASTSimpleDeclSpecifier extends CASTSimpleDeclSpecifier implement return typeOfExpression; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 a4d2d7dea4a..4216a58b5d2 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 @@ -36,7 +36,8 @@ public class CPPASTASMDeclaration extends CPPASTNode implements IASTASMDeclarati this.assembly = assembly.toCharArray(); } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 d528581a677..bfa049d450d 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 @@ -53,7 +53,8 @@ public class CPPASTArrayDeclarator extends CPPASTDeclarator implements } } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ IASTArrayModifier [] mods = getArrayModifiers(); for ( int i = 0; i < mods.length; i++ ) { if( !mods[i].accept( action ) ) return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayModifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayModifier.java index 8ba087df072..e03a2ce9c58 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayModifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayModifier.java @@ -42,7 +42,8 @@ public class CPPASTArrayModifier extends CPPASTNode implements IASTArrayModifier } } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (exp != null) if (!exp.accept(action)) return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArraySubscriptExpression.java index 1ad0d80bbfc..cbbc7d93ddc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArraySubscriptExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArraySubscriptExpression.java @@ -59,7 +59,8 @@ public class CPPASTArraySubscriptExpression extends CPPASTNode implements IASTAr } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 9e08b3cb3f4..1ba2a3100c2 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 @@ -82,7 +82,8 @@ public abstract class CPPASTBaseDeclSpecifier extends CPPASTNode implements ICPP this.explicit = value; } - public String toString() { + @Override + public String toString() { return ASTSignatureUtil.getSignature(this); } } 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 2336c3f216c..9b6fddd0713 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 @@ -69,7 +69,8 @@ public class CPPASTBinaryExpression extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 79190da44c4..cf1cf9e4b56 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 @@ -19,7 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IASTBreakStatement; public class CPPASTBreakStatement extends CPPASTNode implements IASTBreakStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 47487065507..215a5de0a55 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 @@ -42,7 +42,8 @@ public class CPPASTCaseStatement extends CPPASTNode implements IASTCaseStatement } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java index 926f966bbc4..c5a79d932ce 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java @@ -43,7 +43,8 @@ public class CPPASTCastExpression extends CPPASTUnaryExpression implements ICPPA return typeId; } - public void setOperand(IASTExpression expression) { + @Override + public void setOperand(IASTExpression expression) { super.setOperand(expression); // this needs to be overridden because CPPASTUnaryExpression sets // propertyInParent to ICPPASTUnaryExpression.OPERAND, we want @@ -54,7 +55,8 @@ public class CPPASTCastExpression extends CPPASTUnaryExpression implements ICPPA } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCatchHandler.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCatchHandler.java index afa70d2f60b..27dacbcbb56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCatchHandler.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCatchHandler.java @@ -66,7 +66,8 @@ public class CPPASTCatchHandler extends CPPASTNode implements ICPPASTCatchHandle return declaration; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java index cada1a83730..d7b5f6a8385 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompositeTypeSpecifier.java @@ -39,6 +39,7 @@ public class CPPASTCompositeTypeSpecifier extends CPPASTBaseDeclSpecifier setName(n); } + @Override public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } @@ -107,7 +108,8 @@ public class CPPASTCompositeTypeSpecifier extends CPPASTBaseDeclSpecifier this.scope = scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 7e5bca15c1b..ce74cb03cfb 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 @@ -48,7 +48,8 @@ public class CPPASTCompoundStatement extends CPPASTNode implements return scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 47f2e45e0d1..071595682d6 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 @@ -43,7 +43,8 @@ public class CPPASTCompoundStatementExpression extends CPPASTNode implements IGN } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 a1a20b860c0..da419a536e8 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 @@ -74,7 +74,8 @@ public class CPPASTConditionalExpression extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 69f1bd5c95d..7c9521ce082 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 @@ -60,7 +60,8 @@ public class CPPASTConstructorChainInitializer extends CPPASTNode implements } } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (name != null) if (!name.accept(action)) return false; 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 d50895c683a..876c47e04f4 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 @@ -44,7 +44,8 @@ public class CPPASTConstructorInitializer extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 51b8b550f87..fe23da5a766 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 @@ -19,7 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IASTContinueStatement; public class CPPASTContinueStatement extends CPPASTNode implements IASTContinueStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 b1cdc41cf32..f7caa488acc 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 @@ -48,6 +48,7 @@ public class CPPASTConversionName extends CPPASTName implements ICPPASTConversio } } + @Override public boolean accept(ASTVisitor action) { if (action.shouldVisitNames) { switch (action.visit(this)) { 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 9a7ce973a34..882eb41010b 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 @@ -44,7 +44,8 @@ public class CPPASTDeclarationStatement extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 fe814ec2f11..c0a8b5cc13c 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 @@ -99,7 +99,8 @@ public class CPPASTDeclarator extends CPPASTNode implements IASTDeclarator { } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarators ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 6f52425e383..31b5675995e 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 @@ -18,7 +18,8 @@ import org.eclipse.cdt.core.dom.ast.IASTDefaultStatement; */ public class CPPASTDefaultStatement extends CPPASTNode implements IASTDefaultStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 12eeacdc496..4b9bfeca588 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 @@ -64,7 +64,8 @@ public class CPPASTDeleteExpression extends CPPASTNode implements return isVectored; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 deb87f79a83..79231e165f4 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 @@ -58,7 +58,8 @@ public class CPPASTDoStatement extends CPPASTNode implements IASTDoStatement, IA } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 dff0b0533dd..27d7f4cdb1b 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 @@ -58,7 +58,8 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 74c0efa49d9..4fc4ef783b9 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 @@ -63,10 +63,12 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier return name; } + @Override public String getRawSignature() { return getName().toString() == null ? "" : getName().toString(); //$NON-NLS-1$ } + @Override public boolean accept(ASTVisitor action) { if (action.shouldVisitDeclSpecifiers) { switch (action.visit(this)) { 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 d126b04702a..0af35060fe7 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 @@ -58,7 +58,8 @@ public class CPPASTEnumerator extends CPPASTNode implements IASTEnumerator, IAST return value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitEnumerators ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 c9a1a55416b..7fa47ee9c83 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 @@ -44,7 +44,8 @@ public class CPPASTExplicitTemplateInstantiation extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 c365b4393c4..4beff719b0f 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 @@ -40,7 +40,8 @@ public class CPPASTExpressionList extends CPPASTNode implements private IASTExpression [] expressions = new IASTExpression[2]; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 693293e03bc..d9ac2d71edf 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 @@ -44,7 +44,8 @@ public class CPPASTExpressionStatement extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 605de0525ab..3c3a9f7bde7 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 @@ -47,7 +47,8 @@ public class CPPASTFieldDeclarator extends CPPASTDeclarator implements } } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ if( bitField != null ) if( !bitField.accept( action ) ) return false; IASTInitializer initializer = getInitializer(); 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 c18d53733e0..71aeb5285ba 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 @@ -93,7 +93,8 @@ public class CPPASTFieldReference extends CPPASTNode implements isDeref = value; } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitExpressions) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: return false; 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 e30f325d04d..0993caa0246 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 @@ -94,7 +94,8 @@ public class CPPASTForStatement extends CPPASTNode implements ICPPASTForStatemen return scope; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 5a3137c0dce..279388b65a4 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 @@ -60,7 +60,8 @@ public class CPPASTFunctionCallExpression extends CPPASTNode implements return parameter; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDeclarator.java index 28d0a2f0a9d..620b1d2947e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDeclarator.java @@ -142,7 +142,8 @@ public class CPPASTFunctionDeclarator extends CPPASTDeclarator implements ICPPAS return scope; } - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ IASTParameterDeclaration [] params = getParameters(); for ( int i = 0; i < params.length; i++ ) { if( !params[i].accept( action ) ) return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDefinition.java index 0e658c7a6c6..d02873a068b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionDefinition.java @@ -80,7 +80,8 @@ public class CPPASTFunctionDefinition extends CPPASTNode implements return ((ICPPASTFunctionDeclarator)declarator).getFunctionScope(); } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionTryBlockDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionTryBlockDeclarator.java index 4f98e4de829..c565bcefe77 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionTryBlockDeclarator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionTryBlockDeclarator.java @@ -48,7 +48,8 @@ public class CPPASTFunctionTryBlockDeclarator extends CPPASTFunctionDeclarator private ICPPASTCatchHandler [] catchHandlers = null; private int catchHandlersPos=-1; - protected boolean postAccept( ASTVisitor action ){ + @Override + protected boolean postAccept( ASTVisitor action ){ if( !super.postAccept( action ) ) return false; ICPPASTCatchHandler [] handlers = getCatchHandlers(); 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 faa6a27e873..2ccd40d8363 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 @@ -41,7 +41,8 @@ public class CPPASTGotoStatement extends CPPASTNode implements IASTGotoStatement } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 fda747a9506..1c3a8e206e7 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 @@ -47,7 +47,8 @@ public class CPPASTIdExpression extends CPPASTNode implements IASTIdExpression, } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 cdabba3448a..9d11ffd5282 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 @@ -82,7 +82,8 @@ public class CPPASTIfStatement extends CPPASTNode implements ICPPASTIfStatement, } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java index 5421fbf9c14..b900e6cdf2c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerExpression.java @@ -44,7 +44,8 @@ public class CPPASTInitializerExpression extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 e7ec8d42a2d..7ba83f5d19d 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 @@ -38,7 +38,8 @@ public class CPPASTInitializerList extends CPPASTNode implements IASTInitializer private IASTInitializer [] initializers = null; private int initializersPos=-1; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitInitializers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 499e70a2f40..4bf3193a9d9 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 @@ -47,7 +47,8 @@ public class CPPASTLabelStatement extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 e44d8910a9d..7bb3971cf78 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 @@ -55,7 +55,8 @@ public class CPPASTLinkageSpecification extends CPPASTNode implements private IASTDeclaration [] declarations = new IASTDeclaration[4]; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLiteralExpression.java index 9509ceb38c8..8066be335e4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLiteralExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLiteralExpression.java @@ -45,11 +45,13 @@ public class CPPASTLiteralExpression extends CPPASTNode implements ICPPASTLitera this.value = value; } - public String toString() { + @Override + public String toString() { return value; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 e3b9839ea32..13614ad1b0f 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 @@ -65,7 +65,8 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements } } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitDeclSpecifiers) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: 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 2a65c3f66b2..48e7d8832b4 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 @@ -56,7 +56,8 @@ public class CPPASTNamespaceAlias extends CPPASTNode implements ICPPASTNamespace } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 47fe8c082ce..e3e4692f9c2 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 @@ -110,7 +110,8 @@ public class CPPASTNewExpression extends CPPASTNode implements private IASTExpression [] arrayExpressions = null; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 3292f3bb8e0..af88fe5c999 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 @@ -18,7 +18,8 @@ import org.eclipse.cdt.core.dom.ast.IASTNullStatement; */ public class CPPASTNullStatement extends CPPASTNode implements IASTNullStatement { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTParameterDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTParameterDeclaration.java index 824c108e8ea..82062bdd8f8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTParameterDeclaration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTParameterDeclaration.java @@ -56,7 +56,8 @@ public class CPPASTParameterDeclaration extends CPPASTNode implements ICPPASTPar } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitParameterDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointer.java index e78500fb26d..ba9acb38282 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointer.java @@ -38,7 +38,8 @@ public class CPPASTPointer extends CPPASTNode implements IASTPointer { isVolatile = value; } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { return true; } } 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 93987429976..969f0921384 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 @@ -42,7 +42,8 @@ public class CPPASTPointerToMember extends CPPASTPointer implements return n; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( n != null ) if( !n.accept( action ) ) return false; return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReferenceOperator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReferenceOperator.java index 89253d3f02c..14a0129a626 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReferenceOperator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReferenceOperator.java @@ -19,7 +19,8 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTReferenceOperator; public class CPPASTReferenceOperator extends CPPASTNode implements ICPPASTReferenceOperator { - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ return true; } 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 5ae45b1ea47..eb237353e29 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 @@ -42,7 +42,8 @@ public class CPPASTReturnStatement extends CPPASTNode implements IASTReturnState } } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitStatements) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: 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 b5e64464744..0114e37634d 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 @@ -68,7 +68,8 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier isShort = value; } - public boolean accept(ASTVisitor action) { + @Override + public boolean accept(ASTVisitor action) { if (action.shouldVisitDeclSpecifiers) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: return false; 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 0aeff63fa7d..78c0c6564d5 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 @@ -64,7 +64,8 @@ public class CPPASTSimpleDeclaration extends CPPASTNode implements IASTSimpleDec } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 9f00cf57862..2a53b81aead 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 @@ -55,7 +55,8 @@ public class CPPASTSimpleTypeConstructorExpression extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 d8d00c61930..d7602156c2f 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 @@ -68,7 +68,8 @@ public class CPPASTSwitchStatement extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 215ee4e7d1b..e3e8401fda1 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 @@ -74,7 +74,8 @@ public class CPPASTTemplateDeclaration extends CPPASTNode implements private ICPPASTTemplateParameter [] parameters = null; private int parametersPos=-1; - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 e39500f9f8b..e8acd7ae2e7 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 @@ -48,7 +48,8 @@ public class CPPASTTemplateSpecialization extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 ea4f549be3e..771ce526851 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 @@ -65,7 +65,8 @@ public class CPPASTTryBlockStatement extends CPPASTNode implements ICPPASTTryBlo return tryBody; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java index 73deb129b67..f457fc9c102 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java @@ -57,7 +57,8 @@ public class CPPASTTypeId extends CPPASTNode implements IASTTypeId { } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitTypeIds ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 52059b8e715..c2bd18d9a4d 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 @@ -52,7 +52,8 @@ public class CPPASTTypeIdExpression extends CPPASTNode implements ICPPASTTypeIdE return typeId; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 7084b990d7c..1f253c4657d 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 @@ -75,7 +75,8 @@ public class CPPASTTypenameExpression extends CPPASTNode implements return init; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : 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 2c125de04ad..df217bc0337 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 @@ -56,7 +56,8 @@ public class CPPASTUnaryExpression extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitExpressions ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 1320b2db786..ca7219f674b 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 @@ -59,7 +59,8 @@ public class CPPASTUsingDeclaration extends CPPASTNode implements } } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 b3f2f9031ed..83092b34b0a 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 @@ -50,7 +50,8 @@ public class CPPASTUsingDirective extends CPPASTNode implements } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclarations ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; 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 83c2ca36276..434d5a6eb24 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 @@ -36,7 +36,8 @@ public class CPPASTVisibilityLabel extends CPPASTNode implements ICPPASTVisiblit this.visibility = visibility; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if (action.shouldVisitDeclarations) { switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: 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 49def581d37..b23f76d50f5 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 @@ -79,6 +79,7 @@ public class CPPASTWhileStatement extends CPPASTNode implements } } + @Override public boolean accept( ASTVisitor action ){ if( action.shouldVisitStatements ){ switch( action.visit( 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 034f1ebd314..8bc9f09ef43 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 @@ -63,7 +63,8 @@ public class CPPArrayType implements IArrayType, ITypeContainer { return false; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); 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 156d9b7e45f..04231550328 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 @@ -119,7 +119,8 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase { return base.getName(); } - public Object clone(){ + @Override + public Object clone(){ ICPPBase t = null; try { t = (ICPPBase) super.clone(); 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 edd61917e4b..1262f27accd 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 @@ -105,7 +105,8 @@ public class CPPBasicType implements ICPPBasicType { return ( qualifierBits & IS_LONG ) != 0; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); @@ -130,6 +131,7 @@ public class CPPBasicType implements ICPPBasicType { return qualifierBits; } + @Override public String toString() { return ASTTypeUtil.getType(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBlockScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBlockScope.java index 4629c8c2e62..ab4a46da401 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBlockScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBlockScope.java @@ -29,6 +29,7 @@ public class CPPBlockScope extends CPPNamespaceScope implements ICPPBlockScope { super( physicalNode ); } + @Override public IName getScopeName(){ IASTNode node = getPhysicalNode(); if( node instanceof IASTCompoundStatement && node.getParent() instanceof IASTFunctionDefinition ){ 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 3f035df62b5..a6c5418c933 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 @@ -375,7 +375,8 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getScopeName() */ - public IName getScopeName() { + @Override + public IName getScopeName() { IASTNode node = getPhysicalNode(); if (node instanceof ICPPASTCompositeTypeSpecifier) { return ((ICPPASTCompositeTypeSpecifier)node).getName(); 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 2ccb8fcbb75..b15a9ec6306 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 @@ -59,6 +59,7 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate impl return (ICPPClassTemplate) id.getTemplateName().resolveBinding(); } + @Override public IBinding instantiate( IType [] args ){ ICPPSpecialization instance = getInstance( args ); if( instance != null ){ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplateSpecialization.java index 72cc1c73a44..acee4691e87 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplateSpecialization.java @@ -124,6 +124,7 @@ public class CPPClassTemplateSpecialization extends CPPClassSpecialization //should not occur } + @Override public String toString() { return getName(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionScope.java index 3440e1da513..03c931a47ba 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionScope.java @@ -55,6 +55,7 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#addBinding(org.eclipse.cdt.core.dom.ast.IBinding) */ + @Override public void addBinding(IBinding binding) { //3.3.4 only labels have function scope if (!(binding instanceof ILabel)) @@ -76,6 +77,7 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IScope#find(java.lang.String) */ + @Override public IBinding[] find(String name) throws DOMException { char[] n = name.toCharArray(); List bindings = new ArrayList(); @@ -95,6 +97,7 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope { return bindings.toArray(new IBinding[bindings.size()]); } + @Override public IScope getParent() throws DOMException { //we can't just resolve the function and get its parent scope, since there are cases where that //could loop since resolving functions requires resolving their parameter types @@ -137,7 +140,8 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getScopeName() */ - public IName getScopeName() { + @Override + public IName getScopeName() { IASTNode node = getPhysicalNode(); if (node instanceof ICPPASTFunctionDeclarator) { return ((ICPPASTFunctionDeclarator)node).getName(); @@ -145,6 +149,7 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope { return null; } + @Override public void flushCache() { labels.clear(); super.flushCache(); 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 55676d67231..53cacb9d04c 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 @@ -105,7 +105,8 @@ public class CPPFunctionType implements ICPPFunctionType { return parameters; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitFunction.java index 11199d4ebea..a0f1ac71933 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitFunction.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitFunction.java @@ -48,11 +48,13 @@ public class CPPImplicitFunction extends CPPFunction implements ICPPFunction, IC this.takesVarArgs=takesVarArgs; } - public IParameter [] getParameters() { + @Override + public IParameter [] getParameters() { return parms; } - public IFunctionType getType() { + @Override + public IFunctionType getType() { if( functionType == null ){ ICPPASTFunctionDeclarator primary = getPrimaryDeclaration(); @@ -75,31 +77,36 @@ public class CPPImplicitFunction extends CPPFunction implements ICPPFunction, IC return null; } - public String getName() { + @Override + public String getName() { return String.valueOf( name ); } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() */ - public char[] getNameCharArray() { + @Override + public char[] getNameCharArray() { return name; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() */ - public IScope getScope() { + @Override + public IScope getScope() { return scope; } /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.IFunction#getFunctionScope() */ - public IScope getFunctionScope() { + @Override + public IScope getFunctionScope() { return null; } - public IBinding resolveParameter( IASTParameterDeclaration param ){ + @Override + public IBinding resolveParameter( IASTParameterDeclaration param ){ IASTName aName = param.getDeclarator().getName(); IParameter binding = (IParameter) aName.getBinding(); if( binding != null ) @@ -134,7 +141,8 @@ public class CPPImplicitFunction extends CPPFunction implements ICPPFunction, IC return binding; } - protected void updateParameterBindings( ICPPASTFunctionDeclarator fdtor ){ + @Override + protected void updateParameterBindings( ICPPASTFunctionDeclarator fdtor ){ if( parms != null ){ IASTParameterDeclaration [] nps = fdtor.getParameters(); if( nps.length != parms.length ) @@ -149,7 +157,8 @@ public class CPPImplicitFunction extends CPPFunction implements ICPPFunction, IC } } - public boolean takesVarArgs() { + @Override + public boolean takesVarArgs() { return takesVarArgs; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInstance.java index 48bb7456713..d558e78c499 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPInstance.java @@ -49,6 +49,7 @@ public abstract class CPPInstance extends CPPSpecialization implements ICPPTempl /* (non-Javadoc) * For debug purposes only */ + @Override public String toString() { return getName() + " <" + ASTTypeUtil.getTypeListString(arguments) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } 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 6dc6b1fb049..46d304fd0c0 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 @@ -136,7 +136,8 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements return false; } - public boolean isInline() throws DOMException { + @Override + public boolean isInline() throws DOMException { IASTDeclaration decl = getPrimaryDeclaration(); if( decl instanceof ICPPASTTemplateDeclaration && ((ICPPASTTemplateDeclaration)decl).getDeclaration() instanceof IASTFunctionDefinition ) return true; 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 710e9086b59..b1e3e8aa8d9 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 @@ -54,7 +54,8 @@ public class CPPNamespaceScope extends CPPScope implements ICPPNamespaceScope{ /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getScopeName() */ - public IName getScopeName() { + @Override + public IName getScopeName() { IASTNode node = getPhysicalNode(); if( node instanceof ICPPASTNamespaceDefinition ){ return ((ICPPASTNamespaceDefinition)node).getName(); 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 2e4296b7b87..257541d06a8 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 @@ -41,6 +41,7 @@ public class CPPPointerToMemberType extends CPPPointerType implements this.operator = operator; } + @Override public boolean isSameType( IType o ){ if( o == this ) return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java index a963bef89f7..31cfd804452 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerType.java @@ -105,7 +105,8 @@ public class CPPPointerType implements IPointerType, ITypeContainer { return isVolatile; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); @@ -115,6 +116,7 @@ public class CPPPointerType implements IPointerType, ITypeContainer { return t; } + @Override public String toString() { return ASTTypeUtil.getType(this); } 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 011b7cb8cc2..bb15245c434 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 @@ -72,7 +72,8 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer { type = t; } - public Object clone(){ + @Override + public Object clone(){ IType t = null; try { t = (IType) super.clone(); 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 09f059b970f..b58c6443b19 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 @@ -64,7 +64,8 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer { return false; } - public Object clone() { + @Override + public Object clone() { IType t = null; try { t = (IType) super.clone(); 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 3b0cdea7736..3b25c574701 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 @@ -61,11 +61,13 @@ public class CPPTemplateScope extends CPPScope implements ICPPTemplateScope { /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPScope#getScopeName() */ + @Override public IName getScopeName() { ICPPASTTemplateDeclaration template = (ICPPASTTemplateDeclaration) getPhysicalNode(); return CPPTemplates.getTemplateName(template); } + @Override public IScope getParent() { ICPPASTTemplateDeclaration templateDecl = (ICPPASTTemplateDeclaration) getPhysicalNode(); IASTName name = CPPTemplates.getTemplateName(templateDecl); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownScope.java index 49d48f1e1bf..41d155d0cdf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownScope.java @@ -172,6 +172,7 @@ public class CPPUnknownScope implements ICPPScope, IASTInternalScope { /* (non-Javadoc) * For debug purposes only */ + @Override public String toString() { return scopeName.toString(); } 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 5fe62b337da..13e865ccddf 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 @@ -63,7 +63,8 @@ public class GPPASTSimpleDeclSpecifier extends CPPASTSimpleDeclSpecifier return typeOfExpression; } - public boolean accept( ASTVisitor action ){ + @Override + public boolean accept( ASTVisitor action ){ if( action.shouldVisitDeclSpecifiers ){ switch( action.visit( this ) ){ case ASTVisitor.PROCESS_ABORT : return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerToMemberType.java index 6827cb4d431..3c898f1309a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerToMemberType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerToMemberType.java @@ -37,7 +37,8 @@ public class GPPPointerToMemberType extends CPPPointerToMemberType implements this.isRestrict = operator.isRestrict(); } - public IType stripQualifiers(){ + @Override + public IType stripQualifiers(){ GPPPointerToMemberType result = (GPPPointerToMemberType) super.stripQualifiers(); if( isRestrict ){ @@ -57,7 +58,8 @@ public class GPPPointerToMemberType extends CPPPointerToMemberType implements return isRestrict; } - public boolean isSameType( IType o ){ + @Override + public boolean isSameType( IType o ){ if (o==this) { return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerType.java index 3d6254f5fd3..2edaf3a5bae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPPointerType.java @@ -47,7 +47,8 @@ public class GPPPointerType extends CPPPointerType implements IGPPPointerType { this.isRestrict = isRestrict; } - public IType stripQualifiers(){ + @Override + public IType stripQualifiers(){ GPPPointerType result = (GPPPointerType) super.stripQualifiers(); if( isRestrict ){ @@ -69,7 +70,8 @@ public class GPPPointerType extends CPPPointerType implements IGPPPointerType { } - public boolean isSameType( IType o ){ + @Override + public boolean isSameType( IType o ){ if (o==this) { return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/ArrayTypeClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/ArrayTypeClone.java index 204b6eeac6d..9344af898fa 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/ArrayTypeClone.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/ArrayTypeClone.java @@ -57,6 +57,7 @@ public class ArrayTypeClone implements IIndexType, IArrayType, ITypeContainer { public void setType(IType type) { this.type = type; } + @Override public Object clone() { return new ArrayTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPReferenceTypeClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPReferenceTypeClone.java index 54e60255061..8964b70cb22 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPReferenceTypeClone.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPReferenceTypeClone.java @@ -52,6 +52,7 @@ public class CPPReferenceTypeClone implements ICPPReferenceType, ITypeContainer, public void setType(IType type) { this.type = type; } + @Override public Object clone() { return new CPPReferenceTypeClone(this); } 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 029220f0b67..d4cfbd32099 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 @@ -77,6 +77,7 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC public boolean isGloballyQualified() throws DOMException { return ((ICPPBinding)delegate).isGloballyQualified(); } + @Override public Object clone() { return new CPPTypedefClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DeclaredBindingsFilter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DeclaredBindingsFilter.java index 4680b46f09b..f0c76318055 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DeclaredBindingsFilter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DeclaredBindingsFilter.java @@ -38,10 +38,12 @@ public class DeclaredBindingsFilter extends IndexFilter { fAcceptSpecializations= acceptSpecializations; } + @Override public boolean acceptLinkage(ILinkage linkage) { return fLinkageID == -1 || fLinkageID == linkage.getLinkageID(); } + @Override public boolean acceptBinding(IBinding binding) throws CoreException { if (binding instanceof IIndexFragmentBinding) { return ((IIndexFragmentBinding) binding).hasDeclaration() diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileLocation.java index d2b4df21bfe..9d3a62e34a3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileLocation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileLocation.java @@ -48,6 +48,7 @@ public class IndexFileLocation implements IIndexFileLocation { * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if(obj instanceof IIndexFileLocation) { return uri.equals(((IIndexFileLocation)obj).getURI()); @@ -59,10 +60,12 @@ public class IndexFileLocation implements IIndexFileLocation { * (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return uri.hashCode(); } + @Override public String toString() { if (fullPath == null) { return uri.toString(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/PointerTypeClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/PointerTypeClone.java index 536ed02c343..32df8947811 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/PointerTypeClone.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/PointerTypeClone.java @@ -60,6 +60,7 @@ public class PointerTypeClone implements IPointerType, ITypeContainer, IIndexTyp public void setType(IType type) { this.type = type; } + @Override public Object clone() { return new PointerTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/QualifierTypeClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/QualifierTypeClone.java index 50ace055f9d..9efede5fa57 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/QualifierTypeClone.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/QualifierTypeClone.java @@ -57,6 +57,7 @@ public class QualifierTypeClone implements IQualifierType, ITypeContainer, IInde public void setType(IType type) { this.type = type; } + @Override public Object clone() { return new QualifierTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java index cf27e6861c5..1af61227bd1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeArrayType.java @@ -25,6 +25,7 @@ public class CompositeArrayType extends CompositeTypeContainer implements IArray fail(); return null; } + @Override public Object clone() { return new ArrayTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java index 9f457d47349..7858b8a1333 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeFunctionType.java @@ -33,6 +33,7 @@ public class CompositeFunctionType extends CompositeType implements IFunctionTyp return cf.getCompositeType((IIndexType)((IFunctionType)type).getReturnType()); } + @Override public boolean isSameType(IType other) { return type.isSameType(other); } 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 576ad0afe23..e0e91a1416f 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 @@ -83,6 +83,7 @@ public abstract class CompositeIndexBinding implements IIndexBinding { throw new CompositingNotImplementedError("Compositing feature not implemented"); //$NON-NLS-1$ } + @Override public String toString() { return rbinding.toString(); } @@ -95,6 +96,7 @@ public abstract class CompositeIndexBinding implements IIndexBinding { return rbinding != null ? rbinding.getLocalToFile() : null; } + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -106,6 +108,7 @@ public abstract class CompositeIndexBinding implements IIndexBinding { return super.equals(obj); } + @Override public int hashCode() { return rbinding.hashCode(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java index 3afb25eb401..e2e3953e4bf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositePointerType.java @@ -29,10 +29,12 @@ public class CompositePointerType extends CompositeTypeContainer implements IPoi return ((IPointerType)type).isVolatile(); } + @Override public boolean isSameType(IType other) { return ((IPointerType)type).isSameType(other); } + @Override public Object clone() { return new PointerTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java index c9ea938de20..c7814328af6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeQualifierType.java @@ -29,10 +29,12 @@ public class CompositeQualifierType extends CompositeTypeContainer implements IQ return ((IQualifierType)type).isVolatile(); } + @Override public boolean isSameType(IType other) { return ((IQualifierType)type).isSameType(other); } + @Override public Object clone() { return new QualifierTypeClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java index c622a38d716..b014deb132a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java @@ -29,6 +29,7 @@ public abstract class CompositeType implements IType, IIndexType { return type.isSameType(other); } + @Override public Object clone() { fail(); return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java index fc0ed1631d8..8b5696ad475 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java @@ -27,6 +27,7 @@ public class CompositeTypeContainer extends CompositeType implements ITypeContai return cf.getCompositeType((IIndexType)((ITypeContainer)type).getType()); } + @Override public String toString() { try { return ASTTypeUtil.getType(getType()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java index 679de113fe8..4dcf613cdfb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java @@ -35,5 +35,6 @@ class CompositeCEnumeration extends CompositeCBinding implements IIndexBinding, return ((IEnumeration)rbinding).isSameType(type); } + @Override public Object clone() {fail(); return null;} } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java index e86bd11684c..12531409b3e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java @@ -50,5 +50,6 @@ class CompositeCStructure extends CompositeCBinding implements IIndexBinding, IC return ((ICompositeType)rbinding).isSameType(type); } + @Override public Object clone() {fail(); return null;} } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java index 0654f24556c..4ea3cd43548 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java @@ -32,6 +32,7 @@ class CompositeCTypedef extends CompositeCBinding implements ITypedef, IIndexTyp return ((ITypedef)rbinding).isSameType(type); } + @Override public Object clone() { fail(); return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java index bb70407c2ac..5b56a578823 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java @@ -40,6 +40,7 @@ abstract class CompositeCPPBinding extends CompositeIndexBinding implements ICPP return result; } + @Override public String[] getQualifiedName() { try { return ((ICPPBinding)rbinding).getQualifiedName(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java index 73b699e43bc..ea8639ca9b5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java @@ -47,5 +47,6 @@ ICPPClassType, IIndexType, ICPPTemplateInstance, ICPPSpecialization { public IBinding getSpecializedBinding() { return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding); } public IType[] getArguments() { return TemplateInstanceUtil.getArguments(cf, (ICPPTemplateInstance) rbinding); } public ICPPTemplateDefinition getTemplateDefinition() { return TemplateInstanceUtil.getTemplateDefinition(cf, rbinding); } + @Override public ICPPBase[] getBases() throws DOMException { return CPPTemplates.getBases(this); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java index 1d080110311..c2da0027708 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java @@ -37,5 +37,6 @@ public class CompositeCPPClassTemplatePartialSpecialization extends CompositeCPP public ObjectMap getArgumentMap() { return TemplateInstanceUtil.getArgumentMap(cf, rbinding); } public IBinding getSpecializedBinding() { return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding); } public int getSignatureMemento() throws CoreException { return ((IPDOMOverloader) rbinding).getSignatureMemento(); } + @Override public IBinding instantiate(IType[] args) { return InternalTemplateInstantiatorUtil.instantiate(args, cf, rbinding); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java index d697e05187d..6154d7fd313 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java @@ -36,6 +36,7 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp return (ICPPTemplateDefinition) cf.getCompositeBinding((IIndexFragmentBinding)preresult); } + @Override public ICPPConstructor[] getConstructors() { return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java index e5870cbbf24..00eefa7fb04 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java @@ -25,6 +25,7 @@ implements ICPPFunction, ICPPSpecialization { super(cf, ft); } + @Override public String toString() { StringBuffer result = new StringBuffer(); try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionType.java index 46ef1539901..e20feb4f903 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionType.java @@ -29,6 +29,7 @@ public class CompositeCPPFunctionType extends CompositeFunctionType implements I return ((ICPPFunctionType)type).isVolatile(); } + @Override public Object clone() { fail(); return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java index cb415e16ebf..c448c80efe9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java @@ -75,6 +75,7 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace return cf.getCompositeBinding(rbinding); } + @Override public IIndexName getScopeName() { for(int i=0; i locations) { final int endSequenceNumber= sequenceNumber+length; if (fChildren != null) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroDefinitionParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroDefinitionParser.java index 3bd677ab9b1..50edd141685 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroDefinitionParser.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroDefinitionParser.java @@ -55,6 +55,7 @@ public class MacroDefinitionParser { return fIndex; } + @Override public String toString() { return "[" + fIndex + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java index 1d2dd5759d0..92708ee66a7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java @@ -70,6 +70,7 @@ abstract class PreprocessorMacro implements IMacroBinding { return FunctionStyleMacro.NO_VAARGS; } + @Override public String toString() { char[][] p= getParameterList(); if (p == null) { @@ -142,6 +143,7 @@ class ObjectStyleMacro extends PreprocessorMacro { return result; } + @Override public TokenList getTokens(MacroDefinitionParser mdp, LexerOptions lexOptions, MacroExpander expander) { if (fExpansionTokens == null) { fExpansionTokens= new TokenList(); @@ -182,6 +184,7 @@ class FunctionStyleMacro extends ObjectStyleMacro { fHasVarArgs= hasVarArgs; } + @Override public char[][] getParameterList() { final int length = fParamList.length; if (fHasVarArgs == NO_VAARGS || length==0) { @@ -204,6 +207,7 @@ class FunctionStyleMacro extends ObjectStyleMacro { return result; } + @Override public char[][] getParameterPlaceholderList() { return fParamList; } @@ -247,10 +251,12 @@ class FunctionStyleMacro extends ObjectStyleMacro { /** * Returns one of {@link #NO_VAARGS}, {@link #VAARGS} or {@link #NAMED_VAARGS}. */ + @Override public int hasVarArgs() { return fHasVarArgs; } + @Override public boolean isFunctionStyle() { return true; } @@ -266,6 +272,7 @@ abstract class DynamicMacro extends PreprocessorMacro { } public abstract Token execute(MacroExpander expander); + @Override public TokenList getTokens(MacroDefinitionParser mdp, LexerOptions lexOptions, MacroExpander expander) { TokenList result= new TokenList(); result.append(execute(expander)); @@ -288,6 +295,7 @@ final class DateMacro extends DynamicMacro { super(name); } + @Override public Token execute(MacroExpander expander) { return new TokenWithImage(IToken.tSTRING, null, 0, 0, createDate()); } @@ -317,6 +325,7 @@ final class FileMacro extends DynamicMacro { super(name); } + @Override public Token execute(MacroExpander expander) { StringBuffer buffer = new StringBuffer("\""); //$NON-NLS-1$ buffer.append(expander.getCurrentFilename()); @@ -333,6 +342,7 @@ final class LineMacro extends DynamicMacro { LineMacro(char[] name) { super(name); } + @Override public Token execute(MacroExpander expander) { int lineNumber= expander.getCurrentLineNumber(); return new TokenWithImage(IToken.tINTEGER, null, 0, 0, Long.toString(lineNumber).toCharArray()); @@ -347,6 +357,7 @@ final class TimeMacro extends DynamicMacro { super(name); } + @Override public Token execute(MacroExpander expander) { return new TokenWithImage(IToken.tSTRING, null, 0, 0, createDate()); } 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 349d46f5eda..1f17ab6929a 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 @@ -74,6 +74,7 @@ public class Token implements IToken, Cloneable { return TokenUtil.getImage(getType()); } + @Override public String toString() { return getImage(); } @@ -86,6 +87,7 @@ public class Token implements IToken, Cloneable { return new String(getCharImage()); } + @Override final public Object clone() { try { return super.clone(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenForDigraph.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenForDigraph.java index 340cb859967..2694ea11d5a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenForDigraph.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenForDigraph.java @@ -19,6 +19,7 @@ public class TokenForDigraph extends Token { super(kind, source, offset, endOffset); } + @Override public char[] getCharImage() { return TokenUtil.getDigraphImage(getType()); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenWithImage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenWithImage.java index bf58d015537..d75ba06fcf0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenWithImage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/TokenWithImage.java @@ -18,6 +18,7 @@ public class TokenWithImage extends Token { fImage= image; } + @Override public char[] getCharImage() { return fImage; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/OperatorTokenDuple.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/OperatorTokenDuple.java index d95fe326b1e..6810cc9d0b0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/OperatorTokenDuple.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/OperatorTokenDuple.java @@ -128,6 +128,7 @@ public class OperatorTokenDuple implements ITokenDuple { return token.extractNameFromTemplateId(); } + @Override public String toString() { return token.toString(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TemplateTokenDuple.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TemplateTokenDuple.java index bf20efc3bca..b3e4cfe8f38 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TemplateTokenDuple.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TemplateTokenDuple.java @@ -41,9 +41,11 @@ public class TemplateTokenDuple extends BasicTokenDuple { /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.ITokenDuple#getSegmentCount() */ + @Override public int getSegmentCount() { return numSegments; } + @Override public ITokenDuple getLastSegment() { IToken first = null, last = null, token = null; @@ -91,10 +93,12 @@ public class TemplateTokenDuple extends BasicTokenDuple { /* (non-Javadoc) * @see org.eclipse.cdt.core.parser.ITokenDuple#getTemplateIdArgLists() */ + @Override public List[] getTemplateIdArgLists() { return argLists; } + @Override public ITokenDuple[] getSegments() { List r = new ArrayList(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenFactory.java index 649652f4cdb..c8989a14c21 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/token/TokenFactory.java @@ -31,7 +31,8 @@ public class TokenFactory { fToken= t; } - public String toString() { + @Override + public String toString() { return fToken.toString(); } public char[] extractNameFromTemplateId(){ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java index 9ffa2eea084..d79ad0d33df 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java @@ -40,6 +40,7 @@ public class CModelListener implements IElementChangedListener, IResourceChangeL private PDOMManager fManager; private LinkedHashMap fLRUs= new LinkedHashMap(UPDATE_LR_CHANGED_FILES_COUNT, 0.75f, true) { + @Override protected boolean removeEldestEntry(Map.Entry eldest) { return size() > UPDATE_LR_CHANGED_FILES_COUNT; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java index 3a905af9527..23e506ea9e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMIndexerJob.java @@ -45,6 +45,7 @@ public class PDOMIndexerJob extends Job { setPriority(Job.LONG); } + @Override protected IStatus run(IProgressMonitor monitor) { final long start= System.currentTimeMillis(); fMonitor = monitor; @@ -53,12 +54,15 @@ public class PDOMIndexerJob extends Job { Job monitorJob= startMonitorJob(monitor); try { IProgressMonitor npm= new NullProgressMonitor() { + @Override public boolean isCanceled() { return fMonitor.isCanceled(); } + @Override public void setCanceled(boolean cancelled) { fMonitor.setCanceled(cancelled); } + @Override public void subTask(String name) { sMonitorDetail= name; } @@ -145,6 +149,7 @@ public class PDOMIndexerJob extends Job { private Job startMonitorJob(final IProgressMonitor targetMonitor) { Job monitorJob= new Job(CCorePlugin.getResourceString("PDOMIndexerJob.updateMonitorJob")) { //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor m) { int currentTick= 0; while(!m.isCanceled() && !targetMonitor.isCanceled()) { @@ -182,6 +187,7 @@ public class PDOMIndexerJob extends Job { } } + @Override public boolean belongsTo(Object family) { return family == pdomManager; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ListItem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ListItem.java index 06598e0229c..d921b10e13b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ListItem.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ListItem.java @@ -45,6 +45,7 @@ public class ListItem { return record; } + @Override public boolean equals(Object obj) { if (obj == this) return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java index 7310d267366..ced5a9bf02a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/LongString.java @@ -125,6 +125,7 @@ public class LongString implements IString { db.free(nextRecord); } + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -163,6 +164,7 @@ public class LongString implements IString { /** * Compatible with {@link String#hashCode()} */ + @Override public int hashCode() { int h = hash; if (h == 0) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ShortString.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ShortString.java index 5df8056d73b..887b59f1231 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ShortString.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ShortString.java @@ -85,6 +85,7 @@ public class ShortString implements IString { return new String(getChars()); } + @Override public boolean equals(Object obj) { if (obj == this) return true; @@ -156,6 +157,7 @@ public class ShortString implements IString { /** * Compatible with {@link String#hashCode()} */ + @Override public int hashCode() { int h = hash; if (h == 0) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java index 067a1a93e9a..da9a2bde2d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java @@ -170,6 +170,7 @@ public class PDOMASTAdapter { fDelegate= delegate; } + @Override public Object clone() { throw new PDOMNotImplementedError(); } @@ -213,6 +214,7 @@ public class PDOMASTAdapter { fDelegate= delegate; } + @Override public Object clone() { throw new PDOMNotImplementedError(); } @@ -268,6 +270,7 @@ public class PDOMASTAdapter { fDelegate= delegate; } + @Override public Object clone() { throw new PDOMNotImplementedError(); } 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 58845120f54..1d578ae0b89 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 @@ -195,6 +195,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation { } } + @Override public String toString() { try { Database db = pdom.getDB(); 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 e60108f87df..18ea620d692 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 @@ -67,6 +67,7 @@ public abstract class PDOMNode implements IPDOMNode { return record; } + @Override public final boolean equals(Object obj) { if (obj == this) return true; @@ -78,6 +79,7 @@ public abstract class PDOMNode implements IPDOMNode { return super.equals(obj); } + @Override public final int hashCode() { return System.identityHashCode(pdom) + 41*record; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMPointerType.java index 99e26afe794..21b586cdd56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMPointerType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMPointerType.java @@ -75,10 +75,12 @@ public class PDOMPointerType extends PDOMNode implements IPointerType, } } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexBindingConstants.POINTER_TYPE; } @@ -139,15 +141,18 @@ public class PDOMPointerType extends PDOMNode implements IPointerType, throw new PDOMNotImplementedError(); } + @Override public Object clone() { return new PointerTypeClone(this); } + @Override public void delete(PDOMLinkage linkage) throws CoreException { linkage.deleteType(getType(), record); super.delete(linkage); } + @Override public String toString() { return ASTTypeUtil.getType(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java index 60edc6271ac..86acaf5418c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java @@ -80,10 +80,12 @@ public class PDOMQualifierType extends PDOMNode implements IQualifierType, ICQua } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexBindingConstants.QUALIFIER_TYPE; } @@ -153,15 +155,18 @@ public class PDOMQualifierType extends PDOMNode implements IQualifierType, ICQua throw new PDOMNotImplementedError(); } + @Override public Object clone() { return new QualifierTypeClone(this); } + @Override public void delete(PDOMLinkage linkage) throws CoreException { linkage.deleteType(getType(), record); super.delete(linkage); } + @Override public String toString() { return ASTTypeUtil.getType(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/CVariableReadWriteFlags.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/CVariableReadWriteFlags.java index 134a1148cd4..c1860eeca79 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/CVariableReadWriteFlags.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/CVariableReadWriteFlags.java @@ -36,6 +36,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return INSTANCE.rwAnyNode(variable, 0); } + @Override protected int rwAnyNode(IASTNode node, int indirection) { final IASTNode parent= node.getParent(); if (parent instanceof ICASTFieldDesignator) { @@ -44,6 +45,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwAnyNode(node, indirection); } + @Override protected int rwInExpression(IASTNode node, IASTExpression expr, int indirection) { if (expr instanceof ICASTTypeIdInitializerExpression) { return 0; @@ -51,6 +53,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwInExpression(node, expr, indirection); } + @Override protected int rwInInitializerExpression(int indirection, IASTNode parent) { if (indirection == 0) { return READ; @@ -58,6 +61,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwInInitializerExpression(indirection, parent); } + @Override protected int rwArgumentForFunctionCall(IASTFunctionCallExpression func, int parameterIdx,int indirection) { if (indirection == 0) { return READ; @@ -65,6 +69,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwArgumentForFunctionCall(func, parameterIdx, indirection); } + @Override protected int rwArgumentForFunctionCall(IASTNode node, IASTExpressionList exprList, IASTFunctionCallExpression funcCall, int indirection) { if (indirection == 0) { return READ; @@ -72,6 +77,7 @@ final class CVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwArgumentForFunctionCall(node, exprList, funcCall, indirection); } + @Override protected int rwAssignmentToType(IType type, int indirection) { if (indirection == 0) { return READ; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCBasicType.java index 61babbafd24..ad07a629ff4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCBasicType.java @@ -74,10 +74,12 @@ class PDOMCBasicType extends PDOMNode implements ICBasicType, IIndexType { } } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CBASICTYPE; } @@ -133,6 +135,7 @@ class PDOMCBasicType extends PDOMNode implements ICBasicType, IIndexType { } } + @Override public Object clone() { try { return super.clone(); 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 7be00b8c259..2a92ad376cf 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 @@ -47,10 +47,12 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType { super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CENUMERATION; } @@ -116,6 +118,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType { return false; } + @Override public Object clone() { throw new PDOMNotImplementedError(); } 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 6ad21b9dd5a..80d2b83ac9b 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 @@ -44,10 +44,12 @@ class PDOMCEnumerator extends PDOMBinding implements IEnumerator { super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CENUMERATOR; } 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 f4701f45a64..0b6ef675741 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 @@ -35,10 +35,12 @@ class PDOMCField extends PDOMCVariable implements IField { super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CFIELD; } @@ -49,16 +51,19 @@ class PDOMCField extends PDOMCVariable implements IField { return false; } + @Override public boolean isExtern() { // ISO/IEC 9899:TC1 6.7.2.1 return false; } + @Override public boolean isAuto() { // ISO/IEC 9899:TC1 6.7.2.1 return false; } + @Override public boolean isRegister() { // ISO/IEC 9899:TC1 6.7.2.1 return false; 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 e4ed6b03902..2e8ff884b44 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 @@ -82,6 +82,7 @@ class PDOMCFunction extends PDOMBinding implements IFunction { pdom.getDB().putByte(record + ANNOTATIONS, annotations); } + @Override public void update(final PDOMLinkage linkage, IBinding newBinding) throws CoreException { if (newBinding instanceof IFunction) { IFunction func= (IFunction) newBinding; @@ -145,10 +146,12 @@ class PDOMCFunction extends PDOMBinding implements IFunction { super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CFUNCTION; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java index 2fc9a1a8502..3c0b2411ddc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java @@ -78,6 +78,7 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction } } + @Override public void delete(final PDOMLinkage linkage) throws CoreException { linkage.deleteType(getReturnType(), record); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + TYPELIST, getLinkageImpl(), true); @@ -95,10 +96,12 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction super.delete(linkage); } + @Override public int getNodeType() { return IIndexCBindingConstants.CFUNCTIONTYPE; } + @Override protected int getRecordSize() { return RECORD_SIZE; } @@ -182,6 +185,7 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction } } + @Override public Object clone() { throw new PDOMNotImplementedError(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java index 051b5f233bf..87cd98514a1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkage.java @@ -65,6 +65,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { super(pdom, C_LINKAGE_NAME, C_LINKAGE_NAME.toCharArray()); } + @Override public int getNodeType() { return LINKAGE; } @@ -77,6 +78,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return C_LINKAGE_ID; } + @Override public PDOMBinding addBinding(IBinding binding, IASTName fromName) throws CoreException { PDOMBinding pdomBinding = adaptBinding(binding); if (pdomBinding != null) { @@ -142,6 +144,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return false; } + @Override public PDOMBinding addBinding(IASTName name) throws CoreException { if (name == null) return null; @@ -162,6 +165,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return addBinding(binding, name); } + @Override public int getBindingType(IBinding binding) { if (binding instanceof IField) // This needs to be before variable @@ -259,6 +263,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return null; } + @Override public final PDOMBinding doAdaptBinding(final IBinding binding) throws CoreException { PDOMNode parent = getAdaptedParent(binding); if (parent == this) { @@ -272,6 +277,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return null; } + @Override @SuppressWarnings("hiding") public PDOMNode getNode(int record) throws CoreException { if (record == 0) @@ -303,6 +309,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return super.getNode(record); } + @Override public PDOMNode addType(PDOMNode parent, IType type) throws CoreException { if(type instanceof IProblemBinding) return null; @@ -318,6 +325,7 @@ class PDOMCLinkage extends PDOMLinkage implements IIndexCBindingConstants { return super.addType(parent, type); } + @Override public IBTreeComparator getIndexComparator() { return new FindBinding.DefaultBindingBTreeComparator(getPDOM()); } 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 30dde110768..c47fdfde78b 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 @@ -72,10 +72,12 @@ class PDOMCParameter extends PDOMNamedNode implements IParameter, IIndexFragment } } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CPARAMETER; } @@ -135,6 +137,7 @@ class PDOMCParameter extends PDOMNamedNode implements IParameter, IIndexFragment return null; } + @Override public char[] getNameCharArray() { try { return super.getNameCharArray(); @@ -178,6 +181,7 @@ class PDOMCParameter extends PDOMNamedNode implements IParameter, IIndexFragment return getNodeType(); } + @Override public void delete(PDOMLinkage linkage) throws CoreException { linkage.deleteType(getType(), record); PDOMCParameter next= getNextParameter(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java index eaf8fd18ace..38182f81369 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java @@ -66,6 +66,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom super(pdom, record); } + @Override public void update(PDOMLinkage linkage, IBinding newBinding) throws CoreException { if (newBinding instanceof ICompositeType) { ICompositeType ct= (ICompositeType) newBinding; @@ -82,6 +83,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom } } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); new PDOMNodeLinkedList(pdom, record+MEMBERLIST, getLinkageImpl()).accept(visitor); @@ -91,10 +93,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom new PDOMNodeLinkedList(pdom, record+MEMBERLIST, getLinkageImpl()).addMember(member); } + @Override public int getNodeType() { return IIndexCBindingConstants.CSTRUCTURE; } + @Override public Object clone() { throw new PDOMNotImplementedError(); } @@ -220,14 +224,17 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom return false; } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public void addChild(PDOMNode member) throws CoreException { addMember(member); } + @Override public boolean mayHaveChildren() { return true; } @@ -240,10 +247,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom fail(); return null; } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) throws DOMException { fail(); return null; } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) throws DOMException { fail(); return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCTypedef.java index 2bce7015221..e60d3869350 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCTypedef.java @@ -55,6 +55,7 @@ class PDOMCTypedef extends PDOMBinding implements ITypedef, ITypeContainer, IInd super(pdom, record); } + @Override public void update(final PDOMLinkage linkage, IBinding newBinding) throws CoreException { if (newBinding instanceof ITypedef) { ITypedef td= (ITypedef) newBinding; @@ -110,10 +111,12 @@ class PDOMCTypedef extends PDOMBinding implements ITypedef, ITypeContainer, IInd return true; } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CTYPEDEF; } @@ -144,5 +147,6 @@ class PDOMCTypedef extends PDOMBinding implements ITypedef, ITypeContainer, IInd } public void setType(IType type) {fail();} + @Override public Object clone() {fail(); return null;} } 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 022ab4ccd38..423bc7e17a5 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 @@ -63,6 +63,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable { } } + @Override public void update(final PDOMLinkage linkage, IBinding newBinding) throws CoreException { if (newBinding instanceof IVariable) { IVariable var= (IVariable) newBinding; @@ -89,10 +90,12 @@ class PDOMCVariable extends PDOMBinding implements IVariable { super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCBindingConstants.CVARIABLE; } @@ -123,6 +126,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable { return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.REGISTER_OFFSET); } + @Override public int getAdditionalNameFlags(int standardFlags, IASTName name) { if ((standardFlags & PDOMName.IS_REFERENCE) == PDOMName.IS_REFERENCE) { return CVariableReadWriteFlags.getReadWriteFlags(name); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPFindBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPFindBinding.java index b129f45e32b..8b2fd60b3e6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPFindBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPFindBinding.java @@ -35,6 +35,7 @@ public class CPPFindBinding extends FindBinding { public CPPBindingBTreeComparator(PDOM pdom) { super(pdom); } + @Override public int compare(int record1, int record2) throws CoreException { int cmp = super.compare(record1, record2); if(cmp==0) { @@ -59,6 +60,7 @@ public class CPPFindBinding extends FindBinding { fSigMemento= memento; } + @Override public int compare(int record) throws CoreException { int cmp= super.compare(record); if (cmp == 0) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPVariableReadWriteFlags.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPVariableReadWriteFlags.java index c68029c4bde..0ad18e89296 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPVariableReadWriteFlags.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/CPPVariableReadWriteFlags.java @@ -35,6 +35,7 @@ final class CPPVariableReadWriteFlags extends VariableReadWriteFlags { return INSTANCE.rwAnyNode(variable, 0); } + @Override protected int rwInUnaryExpression(IASTNode node, IASTUnaryExpression expr, int indirection) { switch (expr.getOperator()) { case ICPPASTUnaryExpression.op_typeid: @@ -43,6 +44,7 @@ final class CPPVariableReadWriteFlags extends VariableReadWriteFlags { return super.rwInUnaryExpression(node, expr, indirection); } + @Override protected int rwAssignmentToType(IType type, int indirection) { if (indirection == 0) { if (!(type instanceof ICPPReferenceType)) { 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 a143b2c36f8..12587769a28 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 @@ -132,6 +132,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { throw new PDOMNotImplementedError(); } + @Override public Object clone() { return new PDOMCPPBaseClone(this); } @@ -161,6 +162,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase { public void setBaseClass(IBinding binding) { baseClass = binding; } + @Override public Object clone() { return new PDOMCPPBaseClone(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java index 088cfb001be..daf74ea170e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java @@ -83,10 +83,12 @@ class PDOMCPPBasicType extends PDOMNode implements ICPPBasicType, IIndexType { return flags; } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPPBASICTYPE; } @@ -159,6 +161,7 @@ class PDOMCPPBasicType extends PDOMNode implements ICPPBasicType, IIndexType { } } + @Override public Object clone() { try { return super.clone(); @@ -167,6 +170,7 @@ class PDOMCPPBasicType extends PDOMNode implements ICPPBasicType, IIndexType { } } + @Override public String toString() { return ASTTypeUtil.getType(this); } 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 73a76424692..1c15c348c06 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 @@ -73,10 +73,12 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CLASS_INSTANCE; } @@ -171,6 +173,7 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements public IBinding[] getFriends() throws DOMException { fail(); return null; } public ICPPMethod[] getMethods() throws DOMException { fail(); return null; } public ICPPClassType[] getNestedClasses() throws DOMException { fail(); return null; } + @Override public Object clone() {fail();return null;} public ICPPClassType getClassType() { @@ -220,6 +223,7 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements return CPPSemantics.findBindings( this, name, false ); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) throws DOMException { try { @@ -241,6 +245,7 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements return null; } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) throws DOMException { IBinding[] result = null; try { @@ -269,6 +274,7 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements return this; } + @Override public void addChild(PDOMNode member) throws CoreException { addMember(member); } @@ -278,6 +284,7 @@ class PDOMCPPClassInstance extends PDOMCPPInstance implements list.addMember(member); } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + MEMBERLIST, getLinkageImpl()); 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 cd87435978d..3cf276c5ff4 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 @@ -84,10 +84,12 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CLASS_SPECIALIZATION; } @@ -258,6 +260,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return false; } + @Override public Object clone() {fail();return null;} public ICPPClassType getClassType() { @@ -307,6 +310,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return CPPSemantics.findBindings( this, name, false ); } + @Override public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) throws DOMException { if (!(this instanceof ICPPTemplateDefinition) && @@ -364,6 +368,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return this; } + @Override public void addChild(PDOMNode member) throws CoreException { addMember(member); } @@ -373,12 +378,14 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements list.addMember(member); } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + MEMBERLIST, getLinkageImpl()); list.accept(visitor); } + @Override public String toString() { String result= super.toString(); ObjectMap map= getArgumentMap(); @@ -387,6 +394,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements return result; } + @Override public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) throws DOMException { IBinding[] result = null; if (!(this instanceof ICPPTemplateDefinition) 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 dba76282eed..68010127c77 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 @@ -79,10 +79,12 @@ class PDOMCPPClassTemplatePartialSpecialization extends return pdom.getDB().getInt(record + SIGNATURE_MEMENTO); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CLASS_TEMPLATE_PARTIAL_SPEC; } @@ -144,6 +146,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends } } + @Override public int pdomCompareTo(PDOMBinding other) { int cmp = super.pdomCompareTo(other); if(cmp==0) { @@ -163,6 +166,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends return cmp; } + @Override public IBinding instantiate(IType[] args) { ICPPSpecialization instance = getInstance( args ); if( instance != null ){ @@ -235,6 +239,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends return null; } + @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/cpp/PDOMCPPClassTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplateSpecialization.java index e1ce3fc32a3..d230906228a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplateSpecialization.java @@ -60,10 +60,12 @@ class PDOMCPPClassTemplateSpecialization extends super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CLASS_TEMPLATE_SPECIALIZATION; } @@ -145,6 +147,7 @@ class PDOMCPPClassTemplateSpecialization extends return CPPTemplates.instantiateTemplate(this, arguments, getArgumentMap()); } + @Override public void addMember(PDOMNode member) throws CoreException { if (member instanceof ICPPTemplateInstance) { PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + INSTANCES, getLinkageImpl()); @@ -161,6 +164,7 @@ class PDOMCPPClassTemplateSpecialization extends } } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + INSTANCES, getLinkageImpl()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java index 79d80fbeace..e21b3b761b4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructor.java @@ -33,10 +33,12 @@ class PDOMCPPConstructor extends PDOMCPPMethod implements ICPPConstructor { return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.EXPLICIT_CONSTRUCTOR_OFFSET); } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CONSTRUCTOR; } + @Override public int getAdditionalNameFlags(int standardFlags, IASTName name) { return 0; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java index b95a8721805..99fc56ce8ea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorInstance.java @@ -41,10 +41,12 @@ public class PDOMCPPConstructorInstance extends PDOMCPPMethodInstance implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CONSTRUCTOR_INSTANCE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java index 018c319d6a9..26793da8f07 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorSpecialization.java @@ -39,10 +39,12 @@ class PDOMCPPConstructorSpecialization extends super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CONSTRUCTOR_SPECIALIZATION; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java index 05b33fe576e..6f9c41fb592 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplate.java @@ -36,6 +36,7 @@ class PDOMCPPConstructorTemplate extends PDOMCPPMethodTemplate implements return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.EXPLICIT_CONSTRUCTOR_OFFSET); } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CONSTRUCTOR_TEMPLATE; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java index 3fa36dc5aaa..39222b45604 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPConstructorTemplateSpecialization.java @@ -40,10 +40,12 @@ class PDOMCPPConstructorTemplateSpecialization extends super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_CONSTRUCTOR_TEMPLATE_SPECIALIZATION; } 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 c232a6561a5..044a8702af9 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 @@ -61,10 +61,12 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPInstance implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_DEFERRED_CLASS_INSTANCE; } @@ -158,5 +160,6 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPInstance implements public IBinding[] getFriends() throws DOMException { fail(); return null; } public ICPPMethod[] getMethods() throws DOMException { fail(); return null; } public ICPPClassType[] getNestedClasses() throws DOMException { fail(); return null; } + @Override public Object clone() {fail();return null;} } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredFunctionInstance.java index 0da29b5fdc8..356829ccb50 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredFunctionInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredFunctionInstance.java @@ -40,10 +40,12 @@ class PDOMCPPDeferredFunctionInstance extends PDOMCPPFunctionInstance super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_DEFERRED_FUNCTION_INSTANCE; } 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 e4bf905caf3..53739a05cde 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 @@ -60,10 +60,12 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_FIELD_SPECIALIZATION; } 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 9d3ea8c2143..daac19d0c89 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 @@ -97,10 +97,12 @@ class PDOMCPPFunctionInstance extends PDOMCPPInstance implements ICPPFunction { super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_FUNCTION_INSTANCE; } @@ -189,6 +191,7 @@ class PDOMCPPFunctionInstance extends PDOMCPPInstance implements ICPPFunction { return false; } + @Override public int pdomCompareTo(PDOMBinding other) { int cmp= super.pdomCompareTo(other); return cmp==0 ? PDOMCPPFunction.compareSignatures(this, other) : cmp; 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 5323f504687..b31c341708a 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 @@ -59,10 +59,12 @@ class PDOMCPPFunctionTemplateSpecialization extends super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_FUNCTION_TEMPLATE_SPECIALIZATION; } @@ -127,6 +129,7 @@ class PDOMCPPFunctionTemplateSpecialization extends return CPPTemplates.instantiateTemplate(this, arguments, getArgumentMap()); } + @Override public void addChild(PDOMNode child) throws CoreException { addMember(child); } @@ -141,6 +144,7 @@ class PDOMCPPFunctionTemplateSpecialization extends } } + @Override public void accept(IPDOMVisitor visitor) throws CoreException { super.accept(visitor); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + INSTANCES, getLinkageImpl()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionType.java index db024a8de07..94ec1c8000b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionType.java @@ -52,10 +52,12 @@ public class PDOMCPPFunctionType extends PDOMCFunctionType implements ICPPFuncti return getBit(getInt(record + FLAGS), PDOMCAnnotation.VOLATILE_OFFSET); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public boolean isSameType(IType type) { if(type instanceof ICPPFunctionType) { if(super.isSameType(type)) { @@ -68,10 +70,12 @@ public class PDOMCPPFunctionType extends PDOMCFunctionType implements ICPPFuncti return false; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_FUNCTION_TYPE; } + @Override public String toString() { return ASTTypeUtil.getType(this); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPInstance.java index 35497f38ed0..7134a98a38f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPInstance.java @@ -88,6 +88,7 @@ abstract class PDOMCPPInstance extends PDOMCPPSpecialization implements } } + @Override public boolean matchesArguments(IType[] arguments) { IType [] args = getArguments(); if( args.length == arguments.length ){ 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 a125507e955..c3dee4e9b71 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 @@ -42,10 +42,12 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_METHOD_INSTANCE; } @@ -54,6 +56,7 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements return ((ICPPMethod)getTemplateDefinition()).isDestructor(); } + @Override public boolean isExternC() { return false; } 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 68b1859c90a..ca2ea461560 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 @@ -67,10 +67,12 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_METHOD_SPECIALIZATION; } @@ -87,11 +89,13 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.VIRTUAL_OFFSET); } + @Override public boolean isExtern() throws DOMException { // ISO/IEC 14882:2003 9.2.6 return false; } + @Override public boolean isExternC() { return false; } @@ -107,10 +111,12 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization return PDOMCPPAnnotation.getVisibility(getByte(record + ANNOTATION)); } + @Override public boolean isConst() { return getBit(getByte(record + ANNOTATION1), PDOMCAnnotation.CONST_OFFSET + CV_OFFSET); } + @Override public boolean isVolatile() { return getBit(getByte(record + ANNOTATION1), PDOMCAnnotation.VOLATILE_OFFSET + CV_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 b42884494fe..536141484cd 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 @@ -70,10 +70,12 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE; } @@ -111,20 +113,24 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements return getBit(getByte(record + ANNOTATION1), PDOMCAnnotation.VOLATILE_OFFSET + CV_OFFSET); } + @Override public boolean isExtern() throws DOMException { // ISO/IEC 14882:2003 9.2.6 return false; } + @Override public boolean isExternC() { return false; } + @Override public boolean isAuto() throws DOMException { // ISO/IEC 14882:2003 9.2.6 return false; } + @Override public boolean isRegister() throws DOMException { // ISO/IEC 14882:2003 9.2.6 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 f6295995286..53281272b77 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 @@ -44,10 +44,12 @@ class PDOMCPPMethodTemplateSpecialization extends super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE_SPECIALIZATION; } @@ -92,6 +94,7 @@ class PDOMCPPMethodTemplateSpecialization extends return 0; } + @Override public boolean isExternC() { return false; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java index 257130d28e3..9b7e93b1a18 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java @@ -78,10 +78,12 @@ class PDOMCPPParameterSpecialization extends PDOMCPPSpecialization implements IC super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_PARAMETER_SPECIALIZATION; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPPointerToMemberType.java index 9472e41e2a9..cf24a7e0373 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPPointerToMemberType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPPointerToMemberType.java @@ -51,10 +51,12 @@ implements ICPPPointerToMemberType, IIndexType { db.putInt(record + TYPE, typeRec); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_POINTER_TO_MEMBER_TYPE; } @@ -72,6 +74,7 @@ implements ICPPPointerToMemberType, IIndexType { return null; } + @Override public Object clone() { return new PDOMCPPPointerToMemberTypeClone(this); } @@ -83,11 +86,13 @@ implements ICPPPointerToMemberType, IIndexType { public ICPPClassType getMemberOfClass() { return ((ICPPPointerToMemberType)delegate).getMemberOfClass(); } + @Override public Object clone() { return new PDOMCPPPointerToMemberTypeClone(this); } } + @Override public void delete(PDOMLinkage linkage) throws CoreException { linkage.deleteType(getMemberOfClass(), record); super.delete(linkage); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java index 39522cdd03a..3ac7011d2ee 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java @@ -62,10 +62,12 @@ class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, } } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_REFERENCE_TYPE; } @@ -103,15 +105,18 @@ class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, throw new PDOMNotImplementedError(); } + @Override public Object clone() { return new CPPReferenceTypeClone(this); } + @Override public void delete(PDOMLinkage linkage) throws CoreException { linkage.deleteType(getType(), record); super.delete(linkage); } + @Override public String toString() { return ASTTypeUtil.getType(this); } 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 1fafc5f6f7d..640e87bf830 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 @@ -62,10 +62,12 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements super(pdom, bindingRecord); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_TEMPLATE_TYPE_PARAMETER; } @@ -110,5 +112,6 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements return (ICPPBinding) getParentBinding(); } + @Override public Object clone() { fail();return 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 18e3846a1da..726f114bcca 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 @@ -57,10 +57,12 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization super(pdom, record); } + @Override protected int getRecordSize() { return RECORD_SIZE; } + @Override public int getNodeType() { return IIndexCPPBindingConstants.CPP_TYPEDEF_SPECIALIZATION; } @@ -103,7 +105,8 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization /* (non-Javadoc) * @see java.lang.Object#clone() */ - public Object clone() { + @Override + public Object clone() { return new CPPTypedefClone(this); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMGPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMGPPBasicType.java index 8353711398c..e4398893ca2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMGPPBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMGPPBasicType.java @@ -30,6 +30,7 @@ class PDOMGPPBasicType extends PDOMCPPBasicType implements IGPPBasicType, IIndex super(pdom, parent, type, encodeGPPFlags(type)); } + @Override public int getNodeType() { return IIndexCPPBindingConstants.GPPBASICTYPE; } 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 781ba4496eb..61e345a4932 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 @@ -184,17 +184,21 @@ public class GeneratePDOMApplication implements IApplication { public IndexingStreamProgressMonitor(PrintStream writer) { super(writer); } + @Override protected boolean shouldOutput() { return taskName!=null && taskName.equals(CCorePlugin.getResourceString("pdom.indexer.task")); //$NON-NLS-1$ } } + @Override public IProgressMonitor createMonitor(Job job) { return new IndexingStreamProgressMonitor(System.out); } + @Override public IProgressMonitor createMonitor(Job job, IProgressMonitor group, int ticks) { return new NullProgressMonitor(); } + @Override public IProgressMonitor createProgressGroup() { return new NullProgressMonitor(); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexerTask.java index 0ae5aae3547..73e1e9afbad 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexerTask.java @@ -24,6 +24,7 @@ class PDOMFastIndexerTask extends PDOMIndexerTask { super(added, changed, removed, indexer, true); } + @Override protected ICodeReaderFactory createReaderFactory() { return null; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFullIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFullIndexerTask.java index b9f97b4203c..63b4d8c9301 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFullIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFullIndexerTask.java @@ -26,6 +26,7 @@ class PDOMFullIndexerTask extends PDOMIndexerTask { super(added, changed, removed, indexer, false); } + @Override protected ICodeReaderFactory createReaderFactory() { return SavedCodeReaderFactory.getInstance(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/AbstractCExtension.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/AbstractCExtension.java index 484d3abbb18..d6ade805b16 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/AbstractCExtension.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/AbstractCExtension.java @@ -20,10 +20,12 @@ public abstract class AbstractCExtension extends InternalCExtension implements I * * @return the project */ + @Override public final IProject getProject() { return super.getProject(); } + @Override public final ICExtensionReference getExtensionReference() { return super.getExtensionReference(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java index 7f468c44056..1a6e67d2b14 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCProjectNature.java @@ -33,7 +33,8 @@ public class CCProjectNature extends CProjectNature { * if not throw a CoreException. Does NOT add a default builder * @see IProjectNature#configure */ - public void configure() throws CoreException { + @Override + public void configure() throws CoreException { if (!getProject().hasNature(CProjectNature.C_NATURE_ID)){ IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index f1c19935462..ad3884360d0 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -294,6 +294,7 @@ public class CCorePlugin extends Plugin { /** * @see Plugin#shutdown */ + @Override public void stop(BundleContext context) throws Exception { try { pdomManager.shutdown(); @@ -327,6 +328,7 @@ public class CCorePlugin extends Plugin { /** * @see Plugin#startup */ + @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -521,10 +523,13 @@ public class CCorePlugin extends Plugin { } return new IConsole() { // return a null console private ConsoleOutputStream nullStream = new ConsoleOutputStream() { - public void write(byte[] b) throws IOException { + @Override + public void write(byte[] b) throws IOException { } + @Override public void write(byte[] b, int off, int len) throws IOException { } + @Override public void write(int c) throws IOException { } }; @@ -570,6 +575,7 @@ public class CCorePlugin extends Plugin { * @throws CoreException * @deprecated - use getBinaryParserExtensions(IProject project) */ + @Deprecated public IBinaryParser[] getBinaryParser(IProject project) throws CoreException { IBinaryParser parsers[] = null; if (project != null) { @@ -635,6 +641,7 @@ public class CCorePlugin extends Plugin { /** * @deprecated use getIndexManager(). */ + @Deprecated public static IPDOMManager getPDOMManager() { return getDefault().pdomManager; } @@ -653,6 +660,7 @@ public class CCorePlugin extends Plugin { * @throws CoreException * @deprecated use getCProjetDescription(IProject project, boolean create) */ + @Deprecated public ICDescriptor getCProjectDescription(IProject project) throws CoreException { return fNewCProjectDescriptionManager.getDescriptorManager().getDescriptor(project); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CDescriptorEvent.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CDescriptorEvent.java index ef3136ab60b..10cb59fdc93 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CDescriptorEvent.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CDescriptorEvent.java @@ -46,6 +46,7 @@ public class CDescriptorEvent extends EventObject { return fType & ~FLAGS_MASK; } + @Override public String toString() { StringBuffer buf = new StringBuffer(); switch (getType()) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ConsoleOutputStream.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ConsoleOutputStream.java index d866ed59bf2..3e0a3038f1d 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ConsoleOutputStream.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ConsoleOutputStream.java @@ -32,13 +32,15 @@ public class ConsoleOutputStream extends OutputStream { return buf; } + @Override public synchronized void write(int c) throws IOException { byte ascii[] = new byte[1]; ascii[0] = (byte) c; fBuffer.append(new String(ascii)); } - public synchronized void write(byte[] b, int off, int len) throws IOException { + @Override + public synchronized void write(byte[] b, int off, int len) throws IOException { fBuffer.append(new String(b, off, len)); } } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java index a89fa570c09..ed2ee19db0b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java @@ -410,6 +410,7 @@ public class ErrorParserManager extends OutputStream { /** * @see java.io.OutputStream#close() */ + @Override public void close() throws IOException { if (nOpens > 0 && --nOpens == 0) { checkLine(true); @@ -423,6 +424,7 @@ public class ErrorParserManager extends OutputStream { /** * @see java.io.OutputStream#flush() */ + @Override public void flush() throws IOException { if (outputStream != null) outputStream.flush(); @@ -431,6 +433,7 @@ public class ErrorParserManager extends OutputStream { /** * @see java.io.OutputStream#write(int) */ + @Override public synchronized void write(int b) throws IOException { currentLine.append((char) b); checkLine(false); @@ -438,6 +441,7 @@ public class ErrorParserManager extends OutputStream { outputStream.write(b); } + @Override public synchronized void write(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IMarkerGenerator.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IMarkerGenerator.java index 53faa6a6ced..335d352613f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IMarkerGenerator.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IMarkerGenerator.java @@ -25,6 +25,7 @@ public interface IMarkerGenerator { * callback from Output Parser * @deprecated Use public void addMarker(org.eclipse.cdt.core.ProblemMarkerInfo problem) instead. */ + @Deprecated void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar); void addMarker(ProblemMarkerInfo problemMarkerInfo); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java index 6fc2e98668a..d11fc80127f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/envvar/EnvirinmentVariable.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core.envvar; import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager; -import org.eclipse.core.runtime.Platform; @@ -72,6 +71,7 @@ public class EnvirinmentVariable implements IEnvironmentVariable, Cloneable { return fDelimiter; } + @Override public Object clone(){ try { return super.clone(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatter.java index 4968f3e77be..2220a95d245 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatter.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/formatter/CodeFormatter.java @@ -48,6 +48,7 @@ public abstract class CodeFormatter { * Kind used to format a compilation unit. * @deprecated Use #K_TRANSLATION_UNIT */ + @Deprecated public static final int K_COMPILATION_UNIT = 0x08; /** * Kind used to format a translation unit. diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java index 69b514bd91b..ce105629fdb 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java @@ -87,6 +87,7 @@ public class CodeReaderCache implements ICodeReaderCache { this.event = event; } + @Override protected IStatus run(IProgressMonitor monitor) { if (event.getSource() instanceof IWorkspace && event.getDelta() != null) { removeKeys(event.getDelta().getAffectedChildren()); @@ -132,6 +133,7 @@ public class CodeReaderCache implements ICodeReaderCache { cache = new CodeReaderLRUCache(size * MB_TO_KB_FACTOR); } + @Override protected void finalize() throws Throwable { flush(); super.finalize(); @@ -238,6 +240,7 @@ public class CodeReaderCache implements ICodeReaderCache { } // must be overloaded, required to remove entries from the cache + @Override protected boolean close(LRUCacheEntry entry) { Object obj = remove(entry._fKey); @@ -247,6 +250,7 @@ public class CodeReaderCache implements ICodeReaderCache { return false; } + @Override protected LRUCache newInstance(int size, int overflow) { return null; } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/FileStorage.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/FileStorage.java index e84878167a0..13e43f91203 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/FileStorage.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/FileStorage.java @@ -77,10 +77,12 @@ public class FileStorage extends PlatformObject implements IStorage { /** * @see IStorage#isReadOnly() */ + @Override public String toString() { return path.toOSString(); } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/PathEntryVariableChangeEvent.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/PathEntryVariableChangeEvent.java index fc0005b03da..74b98656406 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/PathEntryVariableChangeEvent.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/PathEntryVariableChangeEvent.java @@ -72,6 +72,7 @@ public class PathEntryVariableChangeEvent extends EventObject { /** * Return a string representation of this object. */ + @Override public String toString() { String[] typeStrings = {"VARIABLE_CHANGED", "VARIABLE_CREATED", "VARIABLE_DELETED"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ StringBuffer sb = new StringBuffer(getClass().getName()); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java index 74f9d75c58f..e38a76d3cfa 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePreferenceInitializer.java @@ -33,6 +33,7 @@ public class CCorePreferenceInitializer extends AbstractPreferenceInitializer { /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { HashSet optionNames = CModelManager.OptionNames; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java index 48dfca481b6..b677e36b9ef 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java @@ -50,6 +50,7 @@ public class COwner implements ICOwnerInfo { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -60,6 +61,7 @@ public class COwner implements ICOwnerInfo { return false; } + @Override public int hashCode() { return getID().hashCode(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CdtVarPathEntryVariableManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CdtVarPathEntryVariableManager.java index 547bfe950ad..3bccc2ec4c2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CdtVarPathEntryVariableManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CdtVarPathEntryVariableManager.java @@ -66,6 +66,7 @@ public class CdtVarPathEntryVariableManager implements return new ICdtVariableSupplier[]{fVarSupplier}; } + @Override public boolean equals(Object obj) { if(obj == this) return true; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java index 7506011b6cc..8b50e6fdf55 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ConsoleOutputSniffer.java @@ -41,7 +41,8 @@ public class ConsoleOutputSniffer { /* (non-Javadoc) * @see java.io.OutputStream#write(int) */ - public void write(int b) throws IOException { + @Override + public void write(int b) throws IOException { currentLine.append((char) b); checkLine(false); @@ -54,7 +55,8 @@ public class ConsoleOutputSniffer { /* (non-Javadoc) * @see java.io.OutputStream#write(byte[], int, int) */ - public void write(byte[] b, int off, int len) throws IOException { + @Override + public void write(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); } else if (off != 0 || (len < 0) || (len > b.length)) { @@ -73,7 +75,8 @@ public class ConsoleOutputSniffer { /* (non-Javadoc) * @see java.io.OutputStream#close() */ - public void close() throws IOException { + @Override + public void close() throws IOException { checkLine(true); closeConsoleOutputStream(); } @@ -81,7 +84,8 @@ public class ConsoleOutputSniffer { /* (non-Javadoc) * @see java.io.OutputStream#flush() */ - public void flush() throws IOException { + @Override + public void flush() throws IOException { if (outputStream != null) { outputStream.flush(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java index 1ea455b8366..faa62403900 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/LocalProjectScope.java @@ -69,6 +69,7 @@ public class LocalProjectScope implements IScopeContext { return new InstanceScope().getNode(qualifier + QUALIFIER_EXT + fContext); } + @Override public boolean equals(Object obj) { if (this == obj) return true; @@ -80,6 +81,7 @@ public class LocalProjectScope implements IScopeContext { return fContext.equals(other.fContext); } + @Override public int hashCode() { return fContext.hashCode(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java index 91d1c6ca33c..18e6f99f85f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/ProcessClosure.java @@ -44,6 +44,7 @@ public class ProcessClosure { lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$ } + @Override public void run() { try { try { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/SystemBuildConsole.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/SystemBuildConsole.java index 335cea9c72e..7c765a2de7e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/SystemBuildConsole.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/SystemBuildConsole.java @@ -22,19 +22,23 @@ public class SystemBuildConsole implements IConsole { public SystemBuildConsole() { out = new ConsoleOutputStream() { + @Override public synchronized void write(byte[] b, int off, int len) throws java.io.IOException { System.out.write(b, off, len); } + @Override public synchronized void write(int c) throws java.io.IOException { System.out.write(c); } }; err = new ConsoleOutputStream() { + @Override public synchronized void write(byte[] b, int off, int len) throws java.io.IOException { System.err.write(b, off, len); } + @Override public synchronized void write(int c) throws java.io.IOException { System.err.write(c); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/BuildSystemVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/BuildSystemVariableSupplier.java index 8e522b27a65..2f5b8896c56 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/BuildSystemVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/BuildSystemVariableSupplier.java @@ -39,6 +39,7 @@ public class BuildSystemVariableSupplier extends CoreMacroSupplierBase { fContextData = contextData; } + @Override public IVariableContextInfo getMacroContextInfo(int contextType,Object contextData){ IVariableContextInfo startInfo = getStartInfo(); if(contextType == fContextType && @@ -97,6 +98,7 @@ public class BuildSystemVariableSupplier extends CoreMacroSupplierBase { } } + @Override protected ICdtVariable getMacro(String name, int type, Object data) { ICConfigurationDescription des = (ICConfigurationDescription)data; ICdtVariablesContributor cr = des.getBuildVariablesContributor(); @@ -105,6 +107,7 @@ public class BuildSystemVariableSupplier extends CoreMacroSupplierBase { return null; } + @Override protected ICdtVariable[] getMacros(int type, Object data) { ICConfigurationDescription des = (ICConfigurationDescription)data; ICdtVariablesContributor cr = des.getBuildVariablesContributor(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java index 11f471287c9..4f7eae10e01 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java @@ -161,6 +161,7 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) */ + @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { ICdtVariable macro = null; @@ -466,6 +467,7 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) */ + @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { String names[] = getMacroNames(contextType,false); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java index 1eb3fb8dffa..bc0ae17a7a5 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java @@ -24,8 +24,6 @@ import org.eclipse.cdt.utils.cdtvariables.ICdtVariableSupplier; import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo; import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor; import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableManager; -import org.eclipse.core.internal.events.BuildManager; -import org.eclipse.core.internal.localstore.IsSynchronizedVisitor; import org.eclipse.core.variables.IStringVariable; /** @@ -164,6 +162,7 @@ public class CdtVariableManager implements ICdtVariableManager { int type = getContextType(cfg); IVariableContextInfo info = getMacroContextInfo(type,cfg); IVariableSubstitutor subst = new CoreVariableSubstitutor(info,null,""){ //$NON-NLS-1$ + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException { if(macro instanceof EclipseVariablesVariableSupplier.EclipseVarMacro) return new ResolvedMacro(macro.getName(),""); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java index b1e6beaa0d2..4fe2f1fc796 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java @@ -70,6 +70,7 @@ public class EclipseVariablesVariableSupplier implements ICdtVariableSupplier { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() */ + @Override public String getStringValue() throws CdtVariableException { if(!fInitialized){ loadValue(fVariable); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java index 6019b1924f7..63d79781bb6 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java @@ -57,6 +57,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { } + @Override public int getValueType() { if(fVariable != null){ loadValue(fVariable); @@ -67,6 +68,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { return super.getValueType(); } + @Override public String getStringValue() throws CdtVariableException { if(fVariable != null){ loadValue(fVariable); @@ -77,6 +79,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { return super.getStringValue(); } + @Override public String[] getStringListValue() throws CdtVariableException { if(fVariable != null){ loadValue(fVariable); @@ -111,6 +114,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) */ + @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { if(macroName == null || "".equals(macroName)) //$NON-NLS-1$ @@ -143,6 +147,7 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) */ + @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { IEnvironmentVariable vars[] = null; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java index 07fef86966a..56939b1dc71 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java @@ -112,6 +112,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) */ + @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { if(macroName == null || "".equals(macroName)) //$NON-NLS-1$ return null; @@ -125,6 +126,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) */ + @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { StorableCdtVariables macros = getStorableMacros(contextType,contextData); if(macros != null) @@ -289,6 +291,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { return fVar; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -331,6 +334,7 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { return true; } + @Override public int hashCode() { int code = 51; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java index a488b817dd2..3c007c3aba1 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java @@ -32,7 +32,8 @@ public class WorkingCopyCodeReaderFactory extends /* (non-Javadoc) * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getUniqueIdentifier() */ - public int getUniqueIdentifier() { + @Override + public int getUniqueIdentifier() { return CDOM.PARSE_WORKING_COPY_WHENEVER_POSSIBLE; } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSustemEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSustemEnvironmentSupplier.java index db3cd544c3e..f53424cff30 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSustemEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSustemEnvironmentSupplier.java @@ -56,6 +56,7 @@ public class BuildSustemEnvironmentSupplier implements /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariable(java.lang.String, java.lang.Object, boolean) */ + @Override public IEnvironmentVariable getVariable(String variableName, ICConfigurationDescription cfg, boolean resolveMacros) { if((variableName = getValidName(variableName)) == null) @@ -63,6 +64,7 @@ public class BuildSustemEnvironmentSupplier implements return super.getVariable(variableName,cfg,resolveMacros); } + @Override public IEnvironmentVariable[] getVariables(ICConfigurationDescription cfg, boolean resolveMacros) { return filterVariables(super.getVariables(cfg,resolveMacros)); } @@ -70,6 +72,7 @@ public class BuildSustemEnvironmentSupplier implements /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableProvider#getContextInfo(java.lang.Object) */ + @Override public IEnvironmentContextInfo getContextInfo(Object level){ IEnvironmentContextInfo startInfo = getStartInfo(); if(level == fStartLevel) @@ -101,6 +104,7 @@ public class BuildSustemEnvironmentSupplier implements return fStartInfo; } + @Override public IVariableSubstitutor getVariableSubstitutor(IVariableContextInfo info, String inexistentMacroValue, String listDelimiter){ return super.getVariableSubstitutor(getSubstitutorMacroContextInfo(info),inexistentMacroValue,listDelimiter); } @@ -127,11 +131,13 @@ public class BuildSustemEnvironmentSupplier implements final IVariableContextInfo info = getMacroContextInfoForContext(fStartLevel); if(info != null){ fStartMacroContextInfo = new DefaultVariableContextInfo(fStartType,fStartData){ + @Override protected ICdtVariableSupplier[] getSuppliers(int type, Object data){ ICdtVariableSupplier suppliers[] = info.getSuppliers(); return filterValidMacroSuppliers(suppliers); } + @Override public IVariableContextInfo getNext() { return info.getNext(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/ContributedEnvironment.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/ContributedEnvironment.java index 4a070146a65..e5166756e7a 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/ContributedEnvironment.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/ContributedEnvironment.java @@ -32,6 +32,7 @@ public class ContributedEnvironment implements IContributedEnvironment{ fBaseInfo = info; } + @Override public ICoreEnvironmentVariableSupplier[] getSuppliers() { if(fSuppliers == null){ ICoreEnvironmentVariableSupplier[] suppliers = fBaseInfo.getSuppliers(); @@ -56,6 +57,7 @@ public class ContributedEnvironment implements IContributedEnvironment{ return fSuppliers; } + @Override public IEnvironmentContextInfo getNext() { IEnvironmentContextInfo baseNext = fBaseInfo.getNext(); if(baseNext != null) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java index 379a67a71ee..7617b3c55f4 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java @@ -71,6 +71,7 @@ public class UserDefinedEnvironmentSupplier extends return fVar; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -103,6 +104,7 @@ public class UserDefinedEnvironmentSupplier extends return true; } + @Override public int hashCode() { int code = fCode; if(code == 0){ @@ -160,6 +162,7 @@ public class UserDefinedEnvironmentSupplier extends return env; } + @Override protected ISerializeInfo getSerializeInfo(Object context){ ISerializeInfo serializeInfo = null; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java index 970c56c2c7d..bb45c7455dd 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java @@ -35,6 +35,7 @@ public class GCCErrorParser extends AbstractErrorParser { new ErrorPattern(Messages.GCCErrorParser_sikp_instantiatedFromHere), // The following are not... new ErrorPattern(Messages.GCCErrorParser_Warnings, 1, 2, 5, 0, 0) { + @Override public String getVarName(Matcher matcher) { String desc = getDesc(matcher); Matcher varMatcher = null; @@ -48,6 +49,7 @@ public class GCCErrorParser extends AbstractErrorParser { return varMatcher != null ? varMatcher.group(1) : null; } + @Override public int getSeverity(Matcher matcher) { String warningGroup = matcher.group(4); if (warningGroup != null && warningGroup.indexOf("arning") >= 0) //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java index 7411fbd71b6..207efd2418e 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/MakeErrorParser.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Path; public class MakeErrorParser extends AbstractErrorParser { private static final ErrorPattern[] patterns = { new ErrorPattern("make\\[(.*)\\]: Entering directory `(.*)'", 0, 0) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { int level; try { @@ -42,12 +43,14 @@ public class MakeErrorParser extends AbstractErrorParser { } }, new ErrorPattern("make\\[.*\\]: Leaving directory", 0, 0) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { eoParser.popDirectory(); return true; } }, new ErrorPattern("(make: \\*\\*\\* \\[.*\\] Error .*)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -55,6 +58,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //make [foo] Error NN new ErrorPattern("(make.*\\[.*\\] Error [-]{0,1}\\d*.*)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -72,6 +76,7 @@ public class MakeErrorParser extends AbstractErrorParser { // }, //missing separator. Stop. new ErrorPattern("(make.*missing separator.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -79,6 +84,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //missing separator (did you mean TAB instead of 8 spaces?\\). Stop. new ErrorPattern("(make.*missing separator \\(did you mean TAB instead of 8 spaces?\\).\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -86,6 +92,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //commands commence before first target. Stop. new ErrorPattern("(make.*commands commence before first target.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -93,6 +100,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //commands commence before first target. Stop. new ErrorPattern("(make.*commands commence before first target.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -100,6 +108,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //missing rule before commands. Stop. new ErrorPattern("(make.*missing rule before commands.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -107,6 +116,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //missing rule before commands. Stop. new ErrorPattern("(make.*missing rule before commands.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -114,6 +124,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //No rule to make target `xxx'. new ErrorPattern("(make.*No rule to make target `.*'.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -121,6 +132,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //No rule to make target `xxx', needed by `yyy'. new ErrorPattern("(make.*No rule to make target `.*', needed by `.*'.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -128,6 +140,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //No targets specified and no makefile found. Stop. new ErrorPattern("(make.*No targets specified and no makefile found.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -135,6 +148,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //No targets. Stop. new ErrorPattern("(make.*No targets.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -142,6 +156,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //Makefile `xxx' was not found. new ErrorPattern("(make.*Makefile `.*' was not found.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -149,6 +164,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //Included makefile `xxx' was not found. new ErrorPattern("(make.*Included makefile `.*' was not found.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -156,6 +172,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //warning: overriding commands for target `xxx' new ErrorPattern("(make.*warning: overriding commands for target `.*')", 1, IMarkerGenerator.SEVERITY_WARNING) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return false; @@ -163,6 +180,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //warning: ignoring old commands for target `xxx' new ErrorPattern("(make.*warning: ignoring old commands for target `.*')", 1, IMarkerGenerator.SEVERITY_WARNING) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return false; @@ -170,6 +188,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //Circular .+ <- .+ dependency dropped. new ErrorPattern("(make.*Circular .+ <- .+ dependency dropped.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -177,6 +196,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //Recursive variable `xxx' references itself (eventually). Stop. new ErrorPattern("(make.*Recursive variable `.*' references itself \\(eventually\\).\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -184,6 +204,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //Unterminated variable reference. Stop. new ErrorPattern("(make.*[uU]nterminated variable reference.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -191,6 +212,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //insufficient arguments to function `.*'. Stop. new ErrorPattern("(make.*insufficient arguments to function `.*'.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -198,6 +220,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //missing target pattern. Stop. new ErrorPattern("(make.*missing target pattern.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -205,6 +228,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //multiple target patterns. Stop. new ErrorPattern("(make.*multiple target patterns.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -212,6 +236,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //target pattern contains no `%'. Stop. new ErrorPattern("(make.*target pattern contains no `%'.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -219,6 +244,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //mixed implicit and static pattern rules. Stop. new ErrorPattern("(make.*mixed implicit and static pattern rules.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -226,6 +252,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //mixed implicit and static pattern rules. Stop. new ErrorPattern("(make.*mixed implicit and static pattern rules.\\s*Stop.)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; @@ -233,6 +260,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //warning: -jN forced in submake: disabling jobserver mode. new ErrorPattern("(make.*warning: -jN forced in submake: disabling jobserver mode.)", 1, IMarkerGenerator.SEVERITY_WARNING) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return false; @@ -240,6 +268,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //warning: jobserver unavailable: using -j1. Add `+' to parent make rule. new ErrorPattern("(make.*warning: jobserver unavailable: using -j1. Add `+' to parent make rule.)", 1, IMarkerGenerator.SEVERITY_WARNING) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return false; @@ -247,6 +276,7 @@ public class MakeErrorParser extends AbstractErrorParser { }, //target `abc' doesn't match the target pattern new ErrorPattern("(make.*target `.*' doesn't match the target pattern)", 1, IMarkerGenerator.SEVERITY_ERROR_RESOURCE) { //$NON-NLS-1 + @Override protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) { super.recordError(matcher, eoParser); return true; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java index 90b2b2452a7..5e67a625d42 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/VCErrorParser.java @@ -18,6 +18,7 @@ public class VCErrorParser extends AbstractErrorParser { private static final ErrorPattern[] patterns = { new ErrorPattern("(.+?)(\\(([0-9]+)\\))? : (fatal error|error|warning) (.*)", 1, 3, 5, 0, 0) { + @Override public int getSeverity(Matcher matcher) { return "warning".equals(matcher.group(4)) ? IMarkerGenerator.SEVERITY_WARNING diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CCodeFormatter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CCodeFormatter.java index 4896885e149..61444ca0b9c 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CCodeFormatter.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CCodeFormatter.java @@ -59,6 +59,7 @@ public class CCodeFormatter extends CodeFormatter { this(null, options); } + @Override public String createIndentationString(final int indentationLevel) { if (indentationLevel < 0) { throw new IllegalArgumentException(); @@ -100,6 +101,7 @@ public class CCodeFormatter extends CodeFormatter { return buffer.toString(); } + @Override public void setOptions(Map options) { if (options != null) { this.options= options; @@ -113,6 +115,7 @@ public class CCodeFormatter extends CodeFormatter { /* * @see org.eclipse.cdt.core.formatter.CodeFormatter#format(int, java.lang.String, int, int, int, java.lang.String) */ + @Override public TextEdit format(int kind, String source, int offset, int length, int indentationLevel, String lineSeparator) { TextEdit edit= null; ITranslationUnit tu= (ITranslationUnit)options.get(DefaultCodeFormatterConstants.FORMATTER_TRANSLATION_UNIT); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/OptimizedReplaceEdit.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/OptimizedReplaceEdit.java index d901415e9eb..55e010815f4 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/OptimizedReplaceEdit.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/OptimizedReplaceEdit.java @@ -22,6 +22,7 @@ public class OptimizedReplaceEdit { this.replacement = replacement; } + @Override public String toString() { return "(" + this.offset + ", length " + this.length + " :>" + this.replacement + "<"; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java index b8ecdaa8818..3166abef146 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java @@ -1447,6 +1447,7 @@ public class Scribe { needSpace= false; } + @Override public String toString() { StringBuffer stringBuffer= new StringBuffer(); stringBuffer.append("(page width = " + pageWidth + ") - (tabChar = ");//$NON-NLS-1$//$NON-NLS-2$ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/Alignment.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/Alignment.java index 0f567f15c43..37e8b7450c3 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/Alignment.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/Alignment.java @@ -372,6 +372,7 @@ public class Alignment { // default implementation } + @Override public String toString() { StringBuffer buffer = new StringBuffer(10); buffer diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/AlignmentException.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/AlignmentException.java index 53aca7fc940..51e650f1e4a 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/AlignmentException.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/align/AlignmentException.java @@ -36,6 +36,7 @@ public class AlignmentException extends RuntimeException { this.relativeDepth = relativeDepth; } + @Override public String toString(){ StringBuffer buffer = new StringBuffer(10); switch(this.reason){ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Scanner.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Scanner.java index b9b8d2a2b73..22c006f59d3 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Scanner.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Scanner.java @@ -34,6 +34,7 @@ public class Scanner extends SimpleScanner { /* * @see org.eclipse.cdt.internal.formatter.scanner.SimpleScanner#init(java.io.Reader, java.lang.String) */ + @Override protected void init(Reader reader, String filename) { // not allowed throw new UnsupportedOperationException(); @@ -170,6 +171,7 @@ public class Scanner extends SimpleScanner { /** * For debugging purposes. */ + @Override public String toString() { if (this.startPosition == this.source.length) return "EOF\n\n" + new String(this.source); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Token.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Token.java index bf8d4e0f5a7..24a378f6ddf 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Token.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/scanner/Token.java @@ -34,7 +34,8 @@ public class Token { text = i; } - public String toString() { + @Override + public String toString() { return "Token type=" + type + " image =" + text + " offset=" + offset; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java index 8c40d14bec0..6ae700c5219 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java @@ -183,6 +183,7 @@ public class TemplateCore { return processHandler; } + @Override public String toString() { return getLabel(); @@ -244,6 +245,7 @@ public class TemplateCore { this.template = template; } + @Override public String put(K key, String value) { value = TemplateEngineHelper.externalizeTemplateString(template.getTemplateInfo(), value); String v = super.put(key, value); @@ -251,6 +253,7 @@ public class TemplateCore { return v; } + @Override public void putAll(Map map) { for(K key : map.keySet()) { String value = map.get(key); @@ -260,6 +263,7 @@ public class TemplateCore { template.setDirty(); } + @Override public String remove(Object key) { String v = super.remove(key); template.setDirty(); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java index 0db3de1389a..8fe3dbbb880 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateInfo.java @@ -131,6 +131,7 @@ public class TemplateInfo { /** * Checks whether two TemplateInfo object are equal. */ + @Override public boolean equals(Object obj) { if (obj instanceof TemplateInfo) { TemplateInfo info = (TemplateInfo) obj; @@ -146,6 +147,7 @@ public class TemplateInfo { /* * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return projectTypeId.hashCode() | templatePath.hashCode() | pluginId.hashCode(); } diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java index f802d1ac626..d2e1fd53301 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ConditionalProcessGroup.java @@ -58,6 +58,7 @@ public class ConditionalProcessGroup { Operator(String id) { this.id = id; } + @Override public boolean equals(Object arg0) { if(arg0 instanceof Operator) { return id.equals(((Operator)arg0).id); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java index ceaf533d41c..fe7a500d8b0 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/Process.java @@ -195,6 +195,7 @@ public class Process { return set; } + @Override public String toString() { return id; } diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java index 48a654fe845..b30d7df95fe 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessArgument.java @@ -374,6 +374,7 @@ public class ProcessArgument { * (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer b = new StringBuffer(name); b.append(":"); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFile.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFile.java index 245867027bf..a0736b9187d 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFile.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFile.java @@ -38,6 +38,7 @@ public class AddFile extends ProcessRunner { /** * This method Adds the File to the corresponding Project. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); ProcessArgument file = args[1]; diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFiles.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFiles.java index bd11bf60268..cb363d88b1f 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFiles.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddFiles.java @@ -38,6 +38,7 @@ public class AddFiles extends ProcessRunner { /** * This method Adds the list of Files to the corresponding Project. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddLink.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddLink.java index 930bfe65455..1e56ed6c09a 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddLink.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/AddLink.java @@ -34,6 +34,7 @@ public class AddLink extends ProcessRunner { /** * This method Adds a Link to the Project. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); String fileSourcePath = args[1].getSimpleValue(); diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Append.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Append.java index 5577b702a20..1dccc16d640 100644 --- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Append.java +++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/processes/Append.java @@ -32,6 +32,7 @@ public class Append extends ProcessRunner { /** * This method Appends the contents to a file. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { ProcessArgument[][] files = args[0].getComplexArrayValue(); for(int i=0; i> 32)); } 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 71df51d7b18..f577a92e88c 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 @@ -97,6 +97,7 @@ public class Addr64 implements IAddress { return this.address.compareTo(((Addr64)other).address); } + @Override public boolean equals(Object x) { if (x == this) return true; @@ -105,10 +106,12 @@ public class Addr64 implements IAddress { return this.address.equals(((Addr64)x).address); } + @Override public int hashCode() { return address.hashCode(); } + @Override public String toString() { return toString(10); } 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 bd76ff138d6..4ecd8e66d38 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 @@ -160,6 +160,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO return getPath().lastSegment().toString(); } + @Override public String toString() { return getName(); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/ERandomAccessFile.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/ERandomAccessFile.java index f4446e4da78..22984f3ab56 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/ERandomAccessFile.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/ERandomAccessFile.java @@ -98,13 +98,15 @@ public class ERandomAccessFile extends RandomAccessFile { super.seek( offset ); } - public long getFilePointer() throws IOException { + @Override + public long getFilePointer() throws IOException { long ptr = super.getFilePointer(); ptr = ptr - ptr_offset; return ptr; } - public void seek( long pos ) throws IOException { + @Override + public void seek( long pos ) throws IOException { long real_pos = pos + ptr_offset; super.seek( real_pos ); } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/NM.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/NM.java index 9cc2a0f5ec2..cc4a4ba5336 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/NM.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/NM.java @@ -36,6 +36,7 @@ public class NM { address = a; } + @Override public String toString() { return (name + "@" + Long.toHexString(address)); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java index 0fa60266ac8..4814ae5c7b1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java @@ -62,6 +62,7 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() */ + @Override public String getStringValue() throws CdtVariableException { // if(!fIsDefined) // throw new BuildMacroException(BuildMacroException.TYPE_MACROS_UNDEFINED,fName); @@ -73,6 +74,7 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringListValue() */ + @Override public String[] getStringListValue() throws CdtVariableException { // if(!fIsDefined) // throw new BuildMacroException(BuildMacroException.TYPE_MACROS_UNDEFINED,fName); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java index e33cfd6c575..3c5df5fdf77 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Coff.java @@ -96,6 +96,7 @@ public class Coff { return !((f_flags & F_LNNO) == F_LNNO); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("FILE HEADER VALUES").append(NL); //$NON-NLS-1$ @@ -146,6 +147,7 @@ public class Coff { data_start = memory.getInt(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("OPTIONAL HEADER VALUES").append(NL); //$NON-NLS-1$ @@ -274,6 +276,7 @@ public class Coff { return lines; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("SECTION HEADER VALUES").append(NL); //$NON-NLS-1$ @@ -328,6 +331,7 @@ public class Coff { r_type = memory.getUnsignedShort(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("RELOC VALUES").append(NL); //$NON-NLS-1$ @@ -356,6 +360,7 @@ public class Coff { l_lnno = memory.getUnsignedShort(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); if (l_lnno == 0) { @@ -453,6 +458,7 @@ public class Coff { return (n_type & N_TMASK) == (DT_ARY << N_BTSHFT); } + @Override public String toString() { return getName(); } @@ -510,6 +516,7 @@ public class Coff { return string_table; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); try { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Exe.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Exe.java index e8a2ae66128..fde654dc7ee 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Exe.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/Exe.java @@ -87,6 +87,7 @@ public class Exe { e_noverlay = memory.getShort(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); @@ -153,6 +154,7 @@ public class Exe { return ehdr; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append(rfile).append(NL); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java index 30e46df01e6..8ad0849da15 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PE.java @@ -156,6 +156,7 @@ public class PE { memory.getBytes(dos_message); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("DOS STUB VALUES").append(NL); //$NON-NLS-1$ @@ -263,6 +264,7 @@ public class PE { } } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("NT OPTIONAL HEADER VALUES").append(NL); //$NON-NLS-1$ @@ -300,6 +302,7 @@ public class PE { size = s; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("rva = ").append(rva).append(" "); //$NON-NLS-1$ //$NON-NLS-2$ @@ -332,6 +335,7 @@ public class PE { thunk = memory.getInt(); } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); buffer.append("rva = ").append(rva); //$NON-NLS-1$ @@ -570,6 +574,7 @@ public class PE { } } + @Override protected void finalize() throws Throwable { try { dispose(); @@ -677,6 +682,7 @@ public class PE { return stringTable; } + @Override public String toString() { StringBuffer buffer = new StringBuffer(); if (exeHeader != null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PEArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PEArchive.java index 0bc811192db..fdef7d118c8 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PEArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/PEArchive.java @@ -27,6 +27,7 @@ import org.eclipse.cdt.core.CCorePlugin; * @deprecated - use org.eclipse.cdt.ui.utils.AR * @see ARHeader */ +@Deprecated public class PEArchive { protected String filename; @@ -47,6 +48,7 @@ public class PEArchive { /** * Do not leak fds. */ + @Override protected void finalize() throws Throwable { try { dispose(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryArchive.java index fbb439d00f1..ff8785bd3b7 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryArchive.java @@ -34,6 +34,7 @@ public class CygwinPEBinaryArchive extends PEBinaryArchive { * @see org.eclipse.cdt.utils.coff.parser.PEBinaryArchive#addArchiveMembers(org.eclipse.cdt.utils.AR.ARHeader[], * java.util.ArrayList) */ + @Override protected void addArchiveMembers(ARHeader[] headers, ArrayList children2) { for (int i = 0; i < headers.length; i++) { IBinaryObject bin = new CygwinPEBinaryObject(getBinaryParser(), getPath(), headers[i]); 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 616fec24b9f..f38c7eebc3a 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 @@ -161,6 +161,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject { * @throws IOException * @see org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile#getContents() */ + @Override public InputStream getContents() throws IOException { InputStream stream = null; Objdump objdump = getObjdump(); @@ -178,6 +179,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject { return stream; } + @Override protected void loadSymbols(PE pe) throws IOException { symbolLoadingAddr2line = getAddr2line(false); symbolLoadingCPPFilt = getCPPFilt(); @@ -270,6 +272,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject { * @see org.eclipse.cdt.utils.coff.parser.PEBinaryObject#addSymbols(org.eclipse.cdt.utils.coff.Coff.Symbol[], * byte[], java.util.List) */ + @Override protected void addSymbols(Coff.Symbol[] peSyms, byte[] table, List list) { for (int i = 0; i < peSyms.length; i++) { if (peSyms[i].isFunction() || peSyms[i].isPointer() || peSyms[i].isArray()) { @@ -330,6 +333,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject { * * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter == Addr2line.class) { return getAddr2line(false); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java index e57f1428a1e..b00ee794503 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java @@ -27,6 +27,7 @@ public class CygwinPEParser extends PEParser { /** * @see org.eclipse.cdt.core.model.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "Cygwin PE"; //$NON-NLS-1$ } @@ -36,6 +37,7 @@ public class CygwinPEParser extends PEParser { * * @see org.eclipse.cdt.utils.coff.parser.PEParser#createBinaryArchive(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryArchive createBinaryArchive(IPath path) throws IOException { return new CygwinPEBinaryArchive(this, path); } @@ -43,6 +45,7 @@ public class CygwinPEParser extends PEParser { * @param path * @return */ + @Override protected IBinaryExecutable createBinaryExecutable(IPath path) { return new CygwinPEBinaryExecutable(this, path, IBinaryFile.EXECUTABLE); } @@ -51,6 +54,7 @@ public class CygwinPEParser extends PEParser { * @param path * @return */ + @Override protected IBinaryObject createBinaryCore(IPath path) { return new CygwinPEBinaryObject(this, path, IBinaryFile.CORE); } @@ -59,6 +63,7 @@ public class CygwinPEParser extends PEParser { * @param path * @return */ + @Override protected IBinaryObject createBinaryObject(IPath path) { return new CygwinPEBinaryObject(this, path, IBinaryFile.OBJECT); } @@ -67,6 +72,7 @@ public class CygwinPEParser extends PEParser { * @param path * @return */ + @Override protected IBinaryShared createBinaryShared(IPath path) { return new CygwinPEBinaryShared(this, path); } @@ -81,6 +87,7 @@ public class CygwinPEParser extends PEParser { /* (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter.isAssignableFrom(ICygwinToolsFactroy.class)) { if (toolFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java index 161d951849d..437b13cb734 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java @@ -61,6 +61,7 @@ class CygwinSymbol extends Symbol { /* (non-Javadoc) * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) */ + @Override public int getLineNumber(long offset) { int line = -1; Addr2line addr2line = ((CygwinPEBinaryObject)binary).getAddr2line(true); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java index 21e39066e41..3c2e5bf23cf 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java @@ -51,6 +51,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getName() */ + @Override public String getName() { if (header != null) { return header.getObjectName(); @@ -61,6 +62,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() */ + @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { return new ByteArrayInputStream(header.getObjectData()); @@ -71,6 +73,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { /** * @see org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject#getSymbols() */ + @Override public ISymbol[] getSymbols() { if (hasChanged() || symbols == null) { try { @@ -87,6 +90,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { * * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getBinaryObjectInfo() */ + @Override protected BinaryObjectInfo getBinaryObjectInfo() { if (hasChanged() || info == null) { try { @@ -98,6 +102,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { return info; } + @Override public Object getAdapter(Class adapter) { if (adapter.equals(PE.class)) { try { @@ -187,6 +192,7 @@ public class PEBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() */ + @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { addressFactory = new Addr32Factory(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugParameterKind.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugParameterKind.java index 8a122c3b6b8..9e0979ef6e6 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugParameterKind.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugParameterKind.java @@ -36,6 +36,7 @@ public final class DebugParameterKind { this.id = id; } + @Override public boolean equals(Object obj) { if (obj instanceof DebugParameterKind) { DebugParameterKind kind = (DebugParameterKind)obj; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugType.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugType.java index 656adcbf9d9..7d38613fa98 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugType.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugType.java @@ -24,6 +24,7 @@ public class DebugType { protected DebugType() { } + @Override public String toString() { StringBuffer sb = new StringBuffer(); if (this instanceof DebugArrayType) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVariableKind.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVariableKind.java index 1b0f0bec696..e290dd605e4 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVariableKind.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVariableKind.java @@ -38,6 +38,7 @@ public final class DebugVariableKind { this.id = id; } + @Override public boolean equals(Object obj) { if (obj instanceof DebugVariableKind) { DebugVariableKind kind = (DebugVariableKind)obj; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVisibility.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVisibility.java index ceb34d3cae8..f2fb5d463bf 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVisibility.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/DebugVisibility.java @@ -34,6 +34,7 @@ public final class DebugVisibility { this.id = id; } + @Override public boolean equals(Object obj) { if (obj instanceof DebugVisibility) { DebugVisibility kind = (DebugVisibility)obj; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java index c890ee02a2d..11c2210b903 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/Dwarf.java @@ -66,6 +66,7 @@ public class Dwarf { short version; int abbreviationOffset; byte addressSize; + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("Length: " + length).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -100,6 +101,7 @@ public class Dwarf { name = n; form = f; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("name: " + Long.toHexString(name)); //$NON-NLS-1$ @@ -115,6 +117,7 @@ public class Dwarf { attribute = a; value = o; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append(attribute.toString()).append(' '); 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 2545386e447..aa951b596bc 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 @@ -58,6 +58,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader { // Override parent. // + @Override public void init(Elf exe) throws IOException { Elf.ELFhdr header = exe.getELFhdr(); isLE = header.e_ident[Elf.ELFhdr.EI_DATA] == Elf.ELFhdr.ELFDATA2LSB; @@ -436,6 +437,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader { } // Override parent: only handle TAG_Compile_Unit. + @Override void processDebugInfoEntry(IDebugEntryRequestor requestor, AbbreviationEntry entry, List list) { int tag = (int) entry.tag; switch (tag) { @@ -450,6 +452,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader { // Override parent. // Just get the file name of the CU. // Argument "requestor" is ignored. + @Override void processCompileUnit(IDebugEntryRequestor requestor, List list) { String cuName, cuCompDir; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java index df9913753cc..1ad0c3cf487 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java @@ -37,6 +37,7 @@ public class TypeNumber { return fileno; } + @Override public boolean equals(Object obj) { if (obj instanceof TypeNumber) { TypeNumber tn = (TypeNumber)obj; @@ -48,6 +49,7 @@ public class TypeNumber { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return fileno*10 + typeno; } 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 653f9d7cfee..27b32f377c6 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 @@ -40,6 +40,7 @@ public class DebugSym implements Comparable { return (thisVal < anotherVal ? -1 : (thisVal == anotherVal ? 0 : 1)); } + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("Type:").append(type).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/AR.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/AR.java index 153ffe344e8..b0121def520 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/AR.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/AR.java @@ -28,6 +28,7 @@ import org.eclipse.cdt.utils.ERandomAccessFile; * @deprecated use org.eclipse.cdt.utils.AR * @see ARHeader */ +@Deprecated public class AR { protected String filename; @@ -45,6 +46,7 @@ public class AR { } } + @Override protected void finalize() throws Throwable { try { dispose(); 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 68794e5b093..470a5a4961b 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 @@ -340,6 +340,7 @@ public class Elf { return data; } + @Override public String toString() { try { if (section_strtab == null) { @@ -453,6 +454,7 @@ public class Elf { return this.st_value.compareTo( ((Symbol)obj).st_value); } + @Override public String toString() { if (name == null) { try { @@ -602,6 +604,7 @@ public class Elf { this.section = section; } + @Override public String toString() { if (name == null) { switch ((int)d_tag) { @@ -948,6 +951,7 @@ public class Elf { /** * Make sure we do not leak the fds. */ + @Override protected void finalize() throws Throwable { try { dispose(); 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 1c51fa82362..673eba8198b 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 @@ -16,6 +16,7 @@ import java.util.Comparator; /** * @deprecated This class is slated for removal, it is not used by the CDT classes */ +@Deprecated public class SymbolSortCompare implements Comparator { public int compare( Object o1, Object o2 ) { String s1 = o1.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 fd4a30afd6b..f2d403b6ce7 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 @@ -71,6 +71,7 @@ public class ElfBinaryArchive extends BinaryFile implements IBinaryArchive { * @param children2 * @deprecated use {@link ElfBinaryArchive#createArchiveMembers(ARHeader[])} */ + @Deprecated protected void addArchiveMembers(ARHeader[] headers, ArrayList children) { IBinaryObject[] bobjs= createArchiveMembers(headers); children.addAll(Arrays.asList(bobjs)); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java index ab65e5e01b7..79acac4685f 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java @@ -53,6 +53,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getName() */ + @Override public String getName() { if (header != null) { return header.getObjectName(); @@ -63,6 +64,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() */ + @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { return new ByteArrayInputStream(header.getObjectData()); @@ -73,6 +75,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbols() */ + @Override public ISymbol[] getSymbols() { // Call the hasChanged first, to initialize the timestamp if (hasChanged() || symbols == null) { @@ -88,6 +91,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getBinaryObjectInfo() */ + @Override protected BinaryObjectInfo getBinaryObjectInfo() { // Call the hasChanged first, to initialize the timestamp if (hasChanged() || info == null) { @@ -177,6 +181,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter.equals(Elf.class)) { try { @@ -197,6 +202,7 @@ public class ElfBinaryObject extends BinaryObjectAdapter { /* (non-Javadoc) * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() */ + @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { try { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryArchive.java index 366c51c6756..d78bbb34aab 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryArchive.java @@ -24,6 +24,7 @@ public class GNUElfBinaryArchive extends ElfBinaryArchive { super(parser, p); } + @Override protected IBinaryObject[] createArchiveMembers(ARHeader[] headers) { IBinaryObject[] result= new IBinaryObject[headers.length]; for (int i = 0; i < headers.length; i++) { 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 6584aaac9d0..5d381ac96c5 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 @@ -122,6 +122,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject { * @throws IOException * @see org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile#getContents() */ + @Override public InputStream getContents() throws IOException { InputStream stream = null; Objdump objdump = getObjdump(); @@ -144,6 +145,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfBinaryObject#loadSymbols(org.eclipse.cdt.utils.elf.ElfHelper) */ + @Override protected void loadSymbols(ElfHelper helper) throws IOException { symbolLoadingAddr2line = getAddr2line(false); symbolLoadingCPPFilt = getCPPFilt(); @@ -164,6 +166,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject { * @see org.eclipse.cdt.utils.elf.parser.ElfBinaryObject#addSymbols(org.eclipse.cdt.utils.elf.Elf.Symbol[], * int, java.util.List) */ + @Override protected void addSymbols(Elf.Symbol[] array, int type, List list) { for (int i = 0; i < array.length; i++) { String name = array[i].toString(); @@ -203,6 +206,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject { * * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter == Addr2line.class) { return getAddr2line(false); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java index 402b973723a..652db6564e9 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java @@ -25,6 +25,7 @@ public class GNUElfParser extends ElfParser { /** * @see org.eclipse.cdt.core.model.IBinaryParser#getFormat() */ + @Override public String getFormat() { return "GNU ELF"; //$NON-NLS-1$ } @@ -32,6 +33,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryCore(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryObject createBinaryCore(IPath path) throws IOException { return new GNUElfBinaryObject(this, path, IBinaryFile.CORE); } @@ -39,6 +41,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryExecutable(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryExecutable createBinaryExecutable(IPath path) throws IOException { return new GNUElfBinaryExecutable(this, path); } @@ -46,6 +49,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryObject(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryObject createBinaryObject(IPath path) throws IOException { return new GNUElfBinaryObject(this, path, IBinaryFile.OBJECT); } @@ -53,6 +57,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryShared(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryShared createBinaryShared(IPath path) throws IOException { return new GNUElfBinaryShared(this, path); } @@ -61,6 +66,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryArchive(org.eclipse.core.runtime.IPath) */ + @Override protected IBinaryArchive createBinaryArchive(IPath path) throws IOException { return new GNUElfBinaryArchive(this, path); } @@ -75,6 +81,7 @@ public class GNUElfParser extends ElfParser { /* (non-Javadoc) * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (adapter.equals(IGnuToolFactory.class)) { if (toolFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java index be71debe6e5..756a2af0789 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java @@ -30,6 +30,7 @@ public class GNUSymbol extends Symbol { /* (non-Javadoc) * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) */ + @Override public int getLineNumber(long offset) { int line = -1; Addr2line addr2line = ((GNUElfBinaryObject)binary).getAddr2line(true); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/AR.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/AR.java index c28a2998656..7bac4ffb0d9 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/AR.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/AR.java @@ -43,6 +43,7 @@ public class AR { } } + @Override protected void finalize() throws Throwable { try { dispose(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/ERandomAccessFile.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/ERandomAccessFile.java index cb525108fa5..57f21bde1c3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/ERandomAccessFile.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/ERandomAccessFile.java @@ -69,13 +69,15 @@ public class ERandomAccessFile extends RandomAccessFile { super.seek( offset ); } - public long getFilePointer() throws IOException { + @Override + public long getFilePointer() throws IOException { long ptr = super.getFilePointer(); ptr = ptr - ptr_offset; return ptr; } - public void seek( long pos ) throws IOException { + @Override + public void seek( long pos ) throws IOException { long real_pos = pos + ptr_offset; super.seek( real_pos ); } 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 b7dc37ed4ed..8fe74daf8b3 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 @@ -399,7 +399,8 @@ public class MachO { public int header_addr; /* library's header address */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -418,7 +419,8 @@ public class MachO { public int compatibility_version; /* library's compatibility vers number*/ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -434,7 +436,8 @@ public class MachO { public int umbrella; /* the umbrella framework name */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -446,7 +449,8 @@ public class MachO { public int client; /* the client name */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -458,7 +462,8 @@ public class MachO { public int sub_umbrella; /* the sub_umbrella framework name */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -470,7 +475,8 @@ public class MachO { public int sub_library; /* the sub_library name */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -484,7 +490,8 @@ public class MachO { public int linked_modules; /* bit vector of linked modules */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -496,7 +503,8 @@ public class MachO { public int name; /* dynamic linker's path name */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -602,7 +610,8 @@ public class MachO { public int header_addr; /* files virtual address */ public String lc_str_name = null; - public String toString() { + @Override + public String toString() { if ( lc_str_name == null ) { return EMPTY_STRING; } @@ -747,6 +756,7 @@ public class MachO { return (thisVal