diff options
Diffstat (limited to 'core/org.eclipse.cdt.core/model')
165 files changed, 518 insertions, 4 deletions
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/*<String>*/ getAllContentTypes() { ArrayList/*<String>*/ 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 { * <p>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 { * </ul> */ + @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 <code>String</code> 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. * </ul> */ + @Override protected ICModelStatus verify() { ICModelStatus status = super.verify(); if (!status.isOK()) { @@ -249,6 +252,7 @@ public class CopyElementsOperation extends MultiOperation { * </ul> */ + @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 { * <code>processPackageFragmentResource</code>, depending on the type of * <code>element</code>. */ + @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 <code>CElementDelta</code>s * and <code>fResultElements</code>. */ + @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. * </ul> */ + @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 { * </ul> * 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 <code>CopyElementsOperation</code> for renaming */ + @Override protected void setAlteredName(String newName) { fAlteredName = newName; } @@ -72,6 +73,7 @@ public abstract class CreateMemberOperation extends CreateElementInTUOperation { * <li>NAME_COLLISION - A name collision occurred in the destination * </ul> */ + @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 { * <li> after the last namespace * </ul> */ + @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 { * </ul> * 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 <code>ICompilationUnit</code>, * and then processes the <code>ICompilationUnit</code>. */ + @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 <code>deleteResource</code> or * <code>deletePackageFragment</code> depending on the type of <code>element</code>. */ + @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 { * <p>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 <code>String</code> 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 <code>CModelStatus</code> 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 <code>null</code> 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 { * * <p>This method will do nothing if timestamps have been disabled. */ + @Override protected void updateTimestamp(LRUCacheEntry entry) { if (fTimestampsOn) { entry._fTimestamp = fTimestampCounter++; |