diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageMappingChangeEvent.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageMappingChangeEvent.java index 00b75f1a0f9..0ef48be46ce 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageMappingChangeEvent.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/LanguageMappingChangeEvent.java @@ -35,25 +35,16 @@ public class LanguageMappingChangeEvent implements ILanguageMappingChangeEvent { private String fFileName; private IContentType[] fContentTypes; - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getAffectedContentTypes() - */ @Override public IContentType[] getAffectedContentTypes() { return fContentTypes; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getFile() - */ @Override public IFile getFile() { return fFile; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getFilename() - */ @Override public String getFilename() { @@ -85,9 +76,6 @@ public class LanguageMappingChangeEvent implements ILanguageMappingChangeEvent { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getPath() - */ @Override public IPath getPath() { @@ -104,9 +92,6 @@ public class LanguageMappingChangeEvent implements ILanguageMappingChangeEvent { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getProject() - */ @Override public IProject getProject() { @@ -123,9 +108,6 @@ public class LanguageMappingChangeEvent implements ILanguageMappingChangeEvent { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILanguageMappingsChangeEvent#getType() - */ @Override public int getType() { return fType; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICMacroEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICMacroEntry.java index 0f133910011..ff1bafd44dd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICMacroEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICMacroEntry.java @@ -19,9 +19,6 @@ package org.eclipse.cdt.core.settings.model; * See {@link ICSettingEntry#MACRO}. */ public interface ICMacroEntry extends ICLanguageSettingEntry { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingEntry#getValue() - */ @Override String getValue(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiItemsHolder.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiItemsHolder.java index 9909cc85e85..e453ebbfc7c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiItemsHolder.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiItemsHolder.java @@ -25,15 +25,9 @@ public abstract class MultiItemsHolder implements ICMultiItemsHolder { /** @since 5.2 */ protected static final boolean DEBUG = false; - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICMultiItemsHolder#getItems() - */ @Override public abstract Object[] getItems(); - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICMultiItemsHolder#setStringListMode(int) - */ /** * This method is put here to prevent UI from * accessing constructors in "internal" dirs. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java index f5b7a35b455..b44570e52fa 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java @@ -29,17 +29,11 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage cfgd = cf; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getLanguageId() - */ @Override public String getLanguageId() { return items[0].getLanguageId(); // Assuming language is the same. } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getSettingEntries(int) - */ public ICLanguageSettingEntry[][] getSettingEntriesM(int kind) { ICLanguageSettingEntry[][] le = new ICLanguageSettingEntry[items.length][]; for (int i = 0; i < items.length; i++) @@ -48,17 +42,11 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage // return conv2LSE(getListForDisplay(le, comp)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getSettingEntriesList(int) - */ @Override public List getSettingEntriesList(int kind) { return Arrays.asList(getSettingEntries(kind)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getSourceContentTypeIds() - */ public String[][] getSourceContentTypeIdsM() { String[][] ss = new String[items.length][]; for (int i = 0; i < items.length; i++) @@ -66,9 +54,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return ss; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getSourceExtensions() - */ public String[][] getSourceExtensionsM() { String[][] ss = new String[items.length][]; for (int i = 0; i < items.length; i++) @@ -76,9 +61,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return ss; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getSupportedEntryKinds() - */ @Override public int getSupportedEntryKinds() { int res = 0; @@ -87,52 +69,34 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return res; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#setLanguageId(java.lang.String) - */ @Override public void setLanguageId(String id) { } // Do nothing - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#setSettingEntries(int, org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry[]) - */ @Override public void setSettingEntries(int kind, ICLanguageSettingEntry[] entries) { for (ICLanguageSetting item : items) item.setSettingEntries(kind, entries); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#setSettingEntries(int, java.util.List) - */ @Override public void setSettingEntries(int kind, List entriesList) { for (ICLanguageSetting item : items) item.setSettingEntries(kind, entriesList); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#setSourceContentTypeIds(java.lang.String[]) - */ @Override public void setSourceContentTypeIds(String[] ids) { for (ICLanguageSetting item : items) item.setSourceContentTypeIds(ids); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#setSourceExtensions(java.lang.String[]) - */ @Override public void setSourceExtensions(String[] exts) { for (ICLanguageSetting item : items) item.setSourceExtensions(exts); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#supportsEntryKind(int) - */ @Override public boolean supportsEntryKind(int kind) { for (ICLanguageSetting item : items) @@ -141,9 +105,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getConfiguration() - */ @Override public ICConfigurationDescription getConfiguration() { if (DEBUG) @@ -151,9 +112,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return null; // CFGs are different } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getId() - */ @Override public String getId() { // IDs are different if (DEBUG) @@ -161,17 +119,11 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getName() - */ @Override public String getName() { // names are proposed to be equal return items[0].getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getParent() - */ @Override public ICSettingContainer getParent() { if (DEBUG) @@ -179,9 +131,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return null; // Parents are different } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getType() - */ @Override public int getType() { int x = items[0].getType(); @@ -191,9 +140,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return x; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isReadOnly() - */ @Override public boolean isReadOnly() { for (int i = 0; i < items.length; i++) @@ -202,9 +148,6 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isValid() - */ @Override public boolean isValid() { for (int i = 0; i < items.length; i++) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/ResourceChangeHandlerBase.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/ResourceChangeHandlerBase.java index c8e110e1c15..f7e42140b09 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/ResourceChangeHandlerBase.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/ResourceChangeHandlerBase.java @@ -135,11 +135,6 @@ public abstract class ResourceChangeHandlerBase implements IResourceChangeListen } /* - * I R e s o u r c e C h a n g e L i s t e n e r - */ - - /* (non-Javadoc) - * * Handle the renaming and deletion of project resources * This is necessary in order to update ResourceConfigurations and AdditionalInputs * 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 f2ad6204b46..429a1fef0f3 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 @@ -139,9 +139,6 @@ public abstract class APathEntry extends PathEntry { return super.equals(obj); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 70fcee17dba..b0edc084feb 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,9 +52,6 @@ public class Archive extends Openable implements IArchive { return b; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() - */ @Override public boolean isReadOnly() { return true; @@ -89,9 +86,6 @@ public class Archive extends Openable implements IArchive { return true; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { @@ -105,9 +99,6 @@ public class Archive extends Openable implements IArchive { return binaryArchive; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#exists() - */ @Override public boolean exists() { IResource res = getResource(); @@ -116,9 +107,6 @@ public class Archive extends Openable implements IArchive { return super.exists(); } - /* (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(); 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 af2581ea4f5..a38707d76ed 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 @@ -61,9 +61,6 @@ public class ArchiveContainer extends Openable implements IArchiveContainer { return new ArchiveContainerInfo(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 { 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 df4174660b7..bd79fed2ed7 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,9 +34,6 @@ 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)) { 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 bddec3b23f8..e19e696b97c 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 @@ -30,9 +30,6 @@ public class BatchOperation extends CModelOperation { this.runnable = runnable; } - /* (non-Javadoc) - * @see org.eclipse.jdt.internal.core.JavaModelOperation#executeOperation() - */ @Override protected void executeOperation() throws CModelException { try { @@ -51,9 +48,6 @@ public class BatchOperation extends CModelOperation { } } - /* (non-Javadoc) - * @see org.eclipse.jdt.internal.core.JavaModelOperation#verify() - */ @Override protected ICModelStatus verify() { // cannot verify user defined operation 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 7c4df0ef18c..484ae083d2e 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 @@ -212,9 +212,6 @@ public class Binary extends Openable implements IBinary { return binaryObject; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { @@ -258,9 +255,6 @@ public class Binary extends Openable implements IBinary { return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() - */ @Override public boolean isReadOnly() { return true; @@ -271,9 +265,6 @@ public class Binary extends Openable implements IBinary { 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 { @@ -470,9 +461,6 @@ public class Binary extends Openable implements IBinary { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.Openable#openBuffer(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected IBuffer openBuffer(IProgressMonitor pm) throws CModelException { @@ -515,17 +503,11 @@ public class Binary extends Openable implements IBinary { return buffer; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.Openable#hasBuffer() - */ @Override protected boolean hasBuffer() { return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#exists() - */ @Override public boolean exists() { IResource res = getResource(); @@ -534,9 +516,6 @@ public class Binary extends Openable implements IBinary { return super.exists(); } - /* (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(); 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 291a9eaa181..f4f14abba0e 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 @@ -78,9 +78,6 @@ public class BinaryContainer extends Openable implements IBinaryContainer { return new BinaryContainerInfo(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 { 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 8b199731db1..07340c2d67c 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 @@ -27,9 +27,6 @@ public class BinaryContainerInfo extends OpenableInfo { super(element); } - /* (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)) { 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 c6b68536529..5e75f839fed 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 @@ -50,43 +50,28 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa addr = a; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceManipulation#copy(org.eclipse.cdt.core.model.ICElement, org.eclipse.cdt.core.model.ICElement, java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void copy(ICElement container, ICElement sibling, String rename, boolean replace, IProgressMonitor monitor) throws CModelException { throw new CModelException(new CModelStatus(ICModelStatusConstants.READ_ONLY, this)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceManipulation#delete(boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void delete(boolean force, IProgressMonitor monitor) throws CModelException { throw new CModelException(new CModelStatus(ICModelStatusConstants.READ_ONLY, this)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceManipulation#move(org.eclipse.cdt.core.model.ICElement, org.eclipse.cdt.core.model.ICElement, java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void move(ICElement container, ICElement sibling, String rename, boolean replace, IProgressMonitor monitor) throws CModelException { throw new CModelException(new CModelStatus(ICModelStatusConstants.READ_ONLY, this)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceManipulation#rename(java.lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void rename(String name, boolean replace, IProgressMonitor monitor) throws CModelException { throw new CModelException(new CModelStatus(ICModelStatusConstants.READ_ONLY, this)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceReference#getSource() - */ @Override public String getSource() throws CModelException { ITranslationUnit tu = getTranslationUnit(); @@ -104,18 +89,12 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa return ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceReference#getSourceRange() - */ @Override public ISourceRange getSourceRange() throws CModelException { return new SourceRange(getStartPos(), getLength(), getIdStartPos(), getIdLength(), getStartLine(), getEndLine()); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ISourceReference#getTranslationUnit() - */ @Override public ITranslationUnit getTranslationUnit() { if (fSourceTU == null) { @@ -157,25 +136,16 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa return fSourceTU; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() - */ @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IBinaryElement#getAddress() - */ @Override public IAddress getAddress() throws CModelException { return addr; @@ -214,9 +184,6 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IBinaryElement#getBinary() - */ @Override public IBinary getBinary() { ICElement current = this; @@ -228,9 +195,6 @@ public class BinaryElement extends CElement implements IBinaryElement, ISourceMa return null; } - /* (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(CElementInfo info, Map newElements, IProgressMonitor monitor) throws CModelException { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java index e9a9fcad33f..93d8e077bde 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryFunction.java @@ -18,87 +18,58 @@ import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.model.IBinaryFunction; import org.eclipse.cdt.core.model.ICElement; -/** - */ public class BinaryFunction extends BinaryElement implements IBinaryFunction { public BinaryFunction(ICElement parent, String name, IAddress a) { super(parent, name, ICElement.C_FUNCTION, a); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getExceptions() - */ @Override public String[] getExceptions() { return new String[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getNumberOfParameters() - */ @Override public int getNumberOfParameters() { // TODO Auto-generated method stub return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getParameterInitializer(int) - */ @Override public String getParameterInitializer(int pos) { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getParameterTypes() - */ @Override public String[] getParameterTypes() { // TODO Auto-generated method stub return new String[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getReturnType() - */ @Override public String getReturnType() { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IFunctionDeclaration#getSignature() - */ @Override public String getSignature() { return getElementName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isStatic() - */ @Override public boolean isStatic() { // TODO Auto-generated method stub return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isConst() - */ @Override public boolean isConst() { // TODO Auto-generated method stub return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isVolatile() - */ @Override public boolean isVolatile() { // TODO Auto-generated method stub 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 aaaf7fdbd6d..f51c25ae97e 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 @@ -41,9 +41,6 @@ public class BinaryModule extends Parent implements IBinaryModule { fPath = p; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IBinaryModule#getBinaryElements() - */ @Override public IBinaryElement[] getBinaryElements() throws CModelException { ICElement[] e = getChildren(); @@ -52,25 +49,16 @@ public class BinaryModule extends Parent implements IBinaryModule { return b; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IBinaryElement#getAddress() - */ @Override public IAddress getAddress() throws CModelException { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IBinaryElement#getBinary() - */ @Override public IBinary getBinary() { return (IBinary) getParent(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { IWorkspaceRoot root = getCModel().getWorkspace().getRoot(); @@ -81,33 +69,21 @@ public class BinaryModule extends Parent implements IBinaryModule { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#isReadOnly() - */ @Override public boolean isReadOnly() { return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() - */ @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getPath() - */ @Override public IPath getPath() { return fPath; } - /* (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(CElementInfo info, Map newElements, IProgressMonitor monitor) throws CModelException { 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 457a55f00fa..a8881712a9e 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 @@ -49,9 +49,6 @@ public class BinaryRunner { super(cproj); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() - */ @Override public boolean isReadOnly() { return true; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java index 123cd9dac59..5b370a1b653 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryVariable.java @@ -17,62 +17,41 @@ import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IVariable; -/** - * - */ public class BinaryVariable extends BinaryElement implements IVariable { public BinaryVariable(ICElement parent, String name, IAddress a) { super(parent, name, ICElement.C_VARIABLE, a); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IVariable#getInitializer() - */ @Override public String getInitializer() { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IVariableDeclaration#getTypeName() - */ @Override public String getTypeName() { // TODO Auto-generated method stub return ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IVariableDeclaration#setTypeName(java.lang.String) - */ @Override public void setTypeName(String type) { // TODO Auto-generated method stub } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isStatic() - */ @Override public boolean isStatic() { // TODO Auto-generated method stub return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isConst() - */ @Override public boolean isConst() { // TODO Auto-generated method stub return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isVolatile() - */ @Override public boolean isVolatile() { // TODO Auto-generated method stub 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 5513135b8ca..2c9ac7e5093 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 @@ -49,81 +49,51 @@ public class CShiftData implements ICElementDelta { return lines; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getAddedChildren() - */ @Override public ICElementDelta[] getAddedChildren() { return new ICElementDelta[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getAffectedChildren() - */ @Override public ICElementDelta[] getAffectedChildren() { return new ICElementDelta[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getChangedChildren() - */ @Override public ICElementDelta[] getChangedChildren() { return new ICElementDelta[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getElement() - */ @Override public ICElement getElement() { return element; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getFlags() - */ @Override public int getFlags() { return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getKind() - */ @Override public int getKind() { return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getMovedFromElement() - */ @Override public ICElement getMovedFromElement() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getMovedToElement() - */ @Override public ICElement getMovedToElement() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getRemovedChildren() - */ @Override public ICElementDelta[] getRemovedChildren() { return new ICElementDelta[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElementDelta#getResourceDeltas() - */ @Override public IResourceDelta[] getResourceDeltas() { return null; 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 7082f38c76c..72e53faa0a2 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 @@ -48,9 +48,6 @@ public class CreateFieldOperation extends CreateMemberOperation { fInitializer = initializer; } - /** - * @see CreateElementInTUOperation#getMainTaskName - */ @Override public String getMainTaskName() { return CoreModelMessages.getString("operation.createFieldProgress"); //$NON-NLS-1$ @@ -78,25 +75,16 @@ public class CreateFieldOperation extends CreateMemberOperation { } } - /** - * @see CreateElementInTUOperation#generateResultHandle - */ @Override protected ICElement generateResultHandle() { return getStructure().getField(fName); } - /** - * @see CreateMemberOperation#verifyNameCollision - */ @Override protected ICModelStatus verifyNameCollision() { return super.verifyNameCollision(); } - /* (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 { StringBuilder sb = new StringBuilder(); 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 8e5a81dcc9b..2f4fc1e368f 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 @@ -51,26 +51,17 @@ public class CreateMethodOperation extends CreateMemberOperation { fSource = source; } - /** - * @see CreateElementInTUOperation#generateResultHandle - */ @Override protected ICElement generateResultHandle() { //TODO: what about collisions, we need the signature here. return getStructure().getMethod(fName); } - /** - * @see CreateElementInTUOperation#getMainTaskName - */ @Override public String getMainTaskName() { return CoreModelMessages.getString("operation.createMethodProgress"); //$NON-NLS-1$ } - /** - * @see CreateMemberOperation#verifyNameCollision - */ @Override protected ICModelStatus verifyNameCollision() { ICModelStatus status = super.verify(); @@ -92,9 +83,6 @@ public class CreateMethodOperation extends CreateMemberOperation { return CModelStatus.VERIFIED_OK; } - /* (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 { StringBuilder sb = new StringBuilder(); 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 d7fa591c2fd..9508e5656d7 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,17 +50,11 @@ public class CreateSourceReferenceOperation extends CreateElementInTUOperation { fSource = source; } - /* (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; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CreateElementInTUOperation#generateResultHandle() - */ @Override protected ICElement generateResultHandle() { IParent parent = (IParent) getParentElement(); @@ -80,9 +74,6 @@ public class CreateSourceReferenceOperation extends CreateElementInTUOperation { return null; } - /* (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/DefaultPathEntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java index c96670aa886..b7c5de949c4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DefaultPathEntryStore.java @@ -378,17 +378,11 @@ public class DefaultPathEntryStore implements IPathEntryStore, ICDescriptorListe } } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#addPathEntryStoreListener(org.eclipse.cdt.core.resources.IPathEntryStoreListener) - */ @Override public void addPathEntryStoreListener(IPathEntryStoreListener listener) { listeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#removePathEntryStoreListener(org.eclipse.cdt.core.resources.IPathEntryStoreListener) - */ @Override public void removePathEntryStoreListener(IPathEntryStoreListener listener) { listeners.remove(listener); @@ -404,9 +398,6 @@ public class DefaultPathEntryStore implements IPathEntryStore, ICDescriptorListe } } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#fireClosedChangedEvent(IProject) - */ @Override public void close() { PathEntryStoreChangedEvent evt = new PathEntryStoreChangedEvent(this, fProject, 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 0edb800cbd5..88d9da5498b 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 @@ -96,9 +96,6 @@ public class IncludeEntry extends APathEntry implements IIncludeEntry { return super.equals(obj); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeEntry#getFullIncludePath() - */ @Override public IPath getFullIncludePath() { final IPath inc = getIncludePath(); @@ -129,9 +126,6 @@ public class IncludeEntry extends APathEntry implements IIncludeEntry { return inc; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 2676c0e5e26..3abbb76ef4d 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 @@ -82,9 +82,6 @@ public class IncludeFileEntry extends APathEntry implements IIncludeFileEntry { return super.equals(obj); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeEntry#getFullIncludePath() - */ @Override public IPath getFullIncludeFilePath() { final IPath inc = getIncludeFilePath(); @@ -115,9 +112,6 @@ public class IncludeFileEntry extends APathEntry implements IIncludeFileEntry { return inc; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 c9b0e3960df..48396021420 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 @@ -58,17 +58,11 @@ public class IncludeReference extends Openable implements IIncludeReference { fPath = PathUtil.getCanonicalPathWindows(path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { return null; } - /* - * @see org.eclipse.cdt.internal.core.model.CElement#exists() - */ @Override public boolean exists() { File file = null; @@ -80,42 +74,27 @@ public class IncludeReference extends Openable implements IIncludeReference { return file != null && file.isDirectory(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() - */ @Override protected CElementInfo createElementInfo() { return new OpenableInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeReference#getIncludeEntry() - */ @Override public IIncludeEntry getIncludeEntry() { return fIncludeEntry; } - /* (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, pm, underlyingResource); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeReference#getAffectedPath() - */ @Override public IPath getAffectedPath() { return fIncludeEntry.getPath(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CContainer#computeChildren(org.eclipse.cdt.internal.core.model.OpenableInfo, org.eclipse.core.resources.IResource) - */ protected boolean computeChildren(OpenableInfo info, IProgressMonitor pm, IResource res) throws CModelException { ArrayList vChildren = new ArrayList<>(); IPath filePath = null; @@ -178,9 +157,6 @@ public class IncludeReference extends Openable implements IIncludeReference { return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeReference#isOnIncludeEntry(org.eclipse.core.runtime.IPath) - */ @Override public boolean isOnIncludeEntry(IPath path) { if (fIncludeEntry.getFullIncludePath().isPrefixOf(path) @@ -190,9 +166,6 @@ public class IncludeReference extends Openable implements IIncludeReference { return false; } - /* (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/LibraryEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java index 83706e1c0cd..c0de3732635 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 @@ -182,17 +182,11 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry { return p; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILibraryEntry#getLibraryPath() - */ @Override public IPath getLibraryPath() { return libraryPath; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 d1afa5a045c..0459a014218 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,41 +38,26 @@ public class LibraryReference extends Parent implements ILibraryReference { entry = e; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CElement#createElementInfo() - */ @Override protected CElementInfo createElementInfo() { return new CElementInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getPath() - */ @Override public IPath getPath() { return entry.getFullLibraryPath(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILibraryReference#getLibraryEntry() - */ @Override public ILibraryEntry getLibraryEntry() { return entry; } - /* (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(CElementInfo 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 cedc99158a8..d20382149a0 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,25 +34,16 @@ public class LibraryReferenceArchive extends Archive implements ILibraryReferenc entry = e; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getPath() - */ @Override public IPath getPath() { return entry.getFullLibraryPath(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#exists() - */ @Override public boolean exists() { File f = getPath().toFile(); @@ -62,9 +53,6 @@ public class LibraryReferenceArchive extends Archive implements ILibraryReferenc return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILibraryReference#getLibraryEntry() - */ @Override public ILibraryEntry getLibraryEntry() { return entry; 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 e1f2e2b416c..82db301caa8 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,9 +39,6 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference entry = e; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.Binary#getModificationStamp() - */ @Override protected long getModificationStamp() { File f = getPath().toFile(); @@ -51,17 +48,11 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getResource() - */ @Override public IResource getResource() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#exists() - */ @Override public boolean exists() { File f = getPath().toFile(); @@ -71,17 +62,11 @@ public class LibraryReferenceShared extends Binary implements ILibraryReference return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ICElement#getPath() - */ @Override public IPath getPath() { return entry.getFullLibraryPath(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ILibraryReference#getLibraryEntry() - */ @Override public ILibraryEntry getLibraryEntry() { return entry; 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 bccca9af9e6..8d7bea8ed85 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 @@ -89,9 +89,6 @@ public class MacroEntry extends APathEntry implements IMacroEntry { return super.equals(obj); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); 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 62400f7fd2c..f71c54eccb7 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 @@ -81,9 +81,6 @@ public class MacroFileEntry extends APathEntry implements IMacroFileEntry { return super.equals(obj); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IIncludeEntry#getFullIncludePath() - */ @Override public IPath getFullMacroFilePath() { IPath p; @@ -118,9 +115,6 @@ public class MacroFileEntry extends APathEntry implements IMacroFileEntry { return p; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java index 0d4ebb75cef..fe915cef0d4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/NullBinaryParser.java @@ -21,45 +21,28 @@ import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.PlatformObject; -/** - */ public class NullBinaryParser extends PlatformObject implements IBinaryParser { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(byte[] data, IPath path) throws IOException { throw new IOException(CCorePlugin.getResourceString("CoreModel.NullBinaryParser.Not_binary_file")); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(IPath path) throws IOException { throw new IOException(CCorePlugin.getResourceString("CoreModel.NullBinaryParser.Not_binary_file")); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getFormat() - */ @Override public String getFormat() { return CCorePlugin.getResourceString("CoreModel.NullBinaryParser.Null_Format"); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public boolean isBinary(byte[] array, IPath path) { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() - */ @Override public int getHintBufferSize() { return 0; 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 a47678f25b0..9faf737d483 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 @@ -38,9 +38,6 @@ public class PathEntryContainerUpdatesOperation extends CModelOperation { this.events = events; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() - */ @Override public boolean isReadOnly() { return true; 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 478f4d033ed..27675e4c7d1 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 @@ -25,9 +25,6 @@ public class PathEntryStoreChangedOperation extends CModelOperation { super(cproject); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() - */ @Override public boolean isReadOnly() { return true; 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 c59adee0512..e39f6b0bc0c 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,9 +46,6 @@ public class SetPathEntriesOperation extends CModelOperation { this.cproject = project; } - /* (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 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 7fbbf0ad93e..7f002076b70 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,9 +45,6 @@ public class SetPathEntryContainerOperation extends CModelOperation { fPathEntryManager = PathEntryManager.getDefault(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.model.CModelOperation#isReadOnly() - */ @Override public boolean isReadOnly() { return true; 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 364960e031c..2ad37de81cb 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 @@ -18,9 +18,6 @@ import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IStructureDeclaration; -/** - * StructureDeclaration - */ public class StructureDeclaration extends SourceManipulation implements IStructureDeclaration { public StructureDeclaration(ICElement parent, String name, int kind) { @@ -60,25 +57,16 @@ public class StructureDeclaration extends SourceManipulation implements IStructu return new StructureInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isStatic() - */ @Override public boolean isStatic() throws CModelException { return getStructureInfo().isStatic(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isConst() - */ @Override public boolean isConst() throws CModelException { return getStructureInfo().isConst(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IDeclaration#isVolatile() - */ @Override public boolean isVolatile() throws CModelException { return getStructureInfo().isVolatile(); 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 1fce66a39b6..0c244f4c84d 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 @@ -30,9 +30,6 @@ public class Using extends SourceManipulation implements IUsing { return new SourceManipulationInfo(this); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IUsing#isDirective() - */ @Override public boolean isDirective() { return directive; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java index a08840d69eb..ac4fb2f9758 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableTemplate.java @@ -27,17 +27,11 @@ public class VariableTemplate extends Variable implements ITemplate { templateParameterTypes = fgEmptyList; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ITemplate#getNumberOfTemplateParameters() - */ @Override public int getNumberOfTemplateParameters() { return templateParameterTypes == null ? 0 : templateParameterTypes.length; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ITemplate#getTemplateParameterTypes() - */ @Override public String[] getTemplateParameterTypes() { return templateParameterTypes; @@ -48,16 +42,10 @@ public class VariableTemplate extends Variable implements ITemplate { return fgEmptyList; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ITemplate#setTemplateParameterTypes(java.lang.String[]) - */ public void setTemplateParameterTypes(String[] templateParameterTypes) { this.templateParameterTypes = templateParameterTypes; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.ITemplate#getTemplateSignature() - */ @Override public String getTemplateSignature() throws CModelException { StringBuilder sig = new StringBuilder(getElementName()); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedPathEntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedPathEntryStore.java index 26af7a19ed6..6d9ecf44e38 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedPathEntryStore.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ConfigBasedPathEntryStore.java @@ -51,9 +51,6 @@ public class ConfigBasedPathEntryStore implements IPathEntryStore, ICProjectDesc static final QualifiedName PATH_ENTRY_COLLECTOR_PROPERTY_NAME = new QualifiedName(CCorePlugin.PLUGIN_ID, "PathEntryStoreCollector"); //$NON-NLS-1$ - /** - * - */ public ConfigBasedPathEntryStore(IProject project) { fProject = project; fListeners = Collections.synchronizedList(new ArrayList()); @@ -62,17 +59,11 @@ public class ConfigBasedPathEntryStore implements IPathEntryStore, ICProjectDesc CProjectDescriptionEvent.APPLIED | CProjectDescriptionEvent.LOADED); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#addPathEntryStoreListener(org.eclipse.cdt.core.resources.IPathEntryStoreListener) - */ @Override public void addPathEntryStoreListener(IPathEntryStoreListener listener) { fListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#removePathEntryStoreListener(org.eclipse.cdt.core.resources.IPathEntryStoreListener) - */ @Override public void removePathEntryStoreListener(IPathEntryStoreListener listener) { fListeners.remove(listener); @@ -88,9 +79,6 @@ public class ConfigBasedPathEntryStore implements IPathEntryStore, ICProjectDesc } } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.resources.IPathEntryStore#fireClosedChangedEvent(IProject) - */ @Override public void close() { PathEntryStoreChangedEvent evt = new PathEntryStoreChangedEvent(this, fProject, 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 c98d1870bda..89d522f1626 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 @@ -55,17 +55,11 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC fCfgs = des; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.settings.model.MultiItemsHolder#getItems() - */ @Override public Object[] getItems() { return fCfgs; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#create(java.lang.String, java.lang.String) - */ @Override public ICConfigExtensionReference create(String extensionPoint, String extension) throws CoreException { if (DEBUG) @@ -73,9 +67,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#createExternalSetting(java.lang.String[], java.lang.String[], java.lang.String[], org.eclipse.cdt.core.settings.model.ICSettingEntry[]) - */ @Override public ICExternalSetting createExternalSetting(String[] languageIDs, String[] contentTypeIds, String[] extensions, ICSettingEntry[] entries) throws WriteAccessException { @@ -84,9 +75,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#createFileDescription(org.eclipse.core.runtime.IPath, org.eclipse.cdt.core.settings.model.ICResourceDescription) - */ @Override public ICFileDescription createFileDescription(IPath path, ICResourceDescription base) throws CoreException, WriteAccessException { @@ -95,9 +83,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#createFolderDescription(org.eclipse.core.runtime.IPath, org.eclipse.cdt.core.settings.model.ICFolderDescription) - */ @Override public ICFolderDescription createFolderDescription(IPath path, ICFolderDescription base) throws CoreException, WriteAccessException { @@ -106,9 +91,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#get(java.lang.String) - */ @Override public ICConfigExtensionReference[] get(String extensionPointID) { if (DEBUG) @@ -116,9 +98,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getBuildSetting() - */ @Override public ICBuildSetting getBuildSetting() { if (DEBUG) @@ -140,25 +119,16 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC fCfgs[i].getBuildSetting().setErrorParserIDs(ids); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getBuildSystemId() - */ @Override public String getBuildSystemId() { return fCfgs[0].getBuildSystemId(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getBuildVariablesContributor() - */ @Override public ICdtVariablesContributor getBuildVariablesContributor() { return fCfgs[0].getBuildVariablesContributor(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getConfigurationData() - */ @Override public CConfigurationData getConfigurationData() { if (DEBUG) @@ -166,9 +136,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getConfigurationStatus() - */ @Override public CConfigurationStatus getConfigurationStatus() { CConfigurationStatus st = null; @@ -180,25 +147,16 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return st; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getDescription() - */ @Override public String getDescription() { return "Multi Configuration"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getExternalSettings() - */ @Override public ICExternalSetting[] getExternalSettings() { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getExternalSettingsProviderIds() - */ @Override public String[] getExternalSettingsProviderIds() { if (DEBUG) @@ -206,9 +164,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getFileDescriptions() - */ @Override public ICFileDescription[] getFileDescriptions() { ArrayList lst = new ArrayList<>(); @@ -217,9 +172,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return lst.toArray(new ICFileDescription[lst.size()]); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getFolderDescriptions() - */ @Override public ICFolderDescription[] getFolderDescriptions() { ArrayList lst = new ArrayList<>(); @@ -228,9 +180,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return lst.toArray(new ICFolderDescription[lst.size()]); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getLanguageSettingForFile(org.eclipse.core.runtime.IPath, boolean) - */ @Override public ICLanguageSetting getLanguageSettingForFile(IPath path, boolean ignoreExludeStatus) { if (DEBUG) @@ -238,9 +187,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getProjectDescription() - */ @Override public ICProjectDescription getProjectDescription() { ICProjectDescription pd = fCfgs[0].getProjectDescription(); @@ -252,9 +198,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return pd; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getReferenceInfo() - */ @Override public Map getReferenceInfo() { if (DEBUG) @@ -262,17 +205,11 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return Collections.emptyMap(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getResolvedSourceEntries() - */ @Override public ICSourceEntry[] getResolvedSourceEntries() { return new ICSourceEntry[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getResourceDescription(org.eclipse.core.runtime.IPath, boolean) - */ @Override public ICResourceDescription getResourceDescription(IPath path, boolean isForFolder) { ArrayList lst = new ArrayList<>(); @@ -300,9 +237,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return new MultiFileDescription(lst.toArray(new ICFileDescription[lst.size()])); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getResourceDescriptions() - */ @Override public ICResourceDescription[] getResourceDescriptions() { ArrayList lst = new ArrayList<>(); @@ -311,9 +245,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return lst.toArray(new ICResourceDescription[lst.size()]); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getRootFolderDescription() - */ @Override public ICFolderDescription getRootFolderDescription() { ICFolderDescription[] rds = new ICFolderDescription[fCfgs.length]; @@ -322,9 +253,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return new MultiFolderDescription(rds); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getSessionProperty(org.eclipse.core.runtime.QualifiedName) - */ @Override public Object getSessionProperty(QualifiedName name) { if (DEBUG) @@ -332,17 +260,11 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getSourceEntries() - */ @Override public ICSourceEntry[] getSourceEntries() { return new ICSourceEntry[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#getTargetPlatformSetting() - */ @Override public ICTargetPlatformSetting getTargetPlatformSetting() { if (DEBUG) @@ -350,9 +272,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#isActive() - */ @Override public boolean isActive() { for (int i = 0; i < fCfgs.length; i++) @@ -361,9 +280,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#isModified() - */ @Override public boolean isModified() { for (int i = 0; i < fCfgs.length; i++) @@ -372,70 +288,46 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#isPreferenceConfiguration() - */ @Override public boolean isPreferenceConfiguration() { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#remove(org.eclipse.cdt.core.settings.model.ICConfigExtensionReference) - */ @Override public void remove(ICConfigExtensionReference ext) throws CoreException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].remove(ext); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#remove(java.lang.String) - */ @Override public void remove(String extensionPoint) throws CoreException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].remove(extensionPoint); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#removeExternalSetting(org.eclipse.cdt.core.settings.model.ICExternalSetting) - */ @Override public void removeExternalSetting(ICExternalSetting setting) throws WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].removeExternalSetting(setting); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#removeExternalSettings() - */ @Override public void removeExternalSettings() throws WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].removeExternalSettings(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#removeResourceDescription(org.eclipse.cdt.core.settings.model.ICResourceDescription) - */ @Override public void removeResourceDescription(ICResourceDescription des) throws CoreException, WriteAccessException { throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setActive() - */ @Override public void setActive() throws WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].setActive(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setConfigurationData(java.lang.String, org.eclipse.cdt.core.settings.model.extension.CConfigurationData) - */ @Override public void setConfigurationData(String buildSystemId, CConfigurationData data) throws WriteAccessException { if (DEBUG) @@ -443,9 +335,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setDescription(java.lang.String) - */ @Override public void setDescription(String des) throws WriteAccessException { if (DEBUG) @@ -453,18 +342,12 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setExternalSettingsProviderIds(java.lang.String[]) - */ @Override public void setExternalSettingsProviderIds(String[] ids) { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].setExternalSettingsProviderIds(ids); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setName(java.lang.String) - */ @Override public void setName(String name) throws WriteAccessException { if (DEBUG) @@ -472,77 +355,50 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setReferenceInfo(java.util.Map) - */ @Override public void setReferenceInfo(Map refs) throws WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].setReferenceInfo(refs); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setSessionProperty(org.eclipse.core.runtime.QualifiedName, java.lang.Object) - */ @Override public void setSessionProperty(QualifiedName name, Object value) { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].setSessionProperty(name, value); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#setSourceEntries(org.eclipse.cdt.core.settings.model.ICSourceEntry[]) - */ @Override public void setSourceEntries(ICSourceEntry[] entries) throws CoreException, WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].setSourceEntries(entries); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICConfigurationDescription#updateExternalSettingsProviders(java.lang.String[]) - */ @Override public void updateExternalSettingsProviders(String[] ids) throws WriteAccessException { for (int i = 0; i < fCfgs.length; i++) fCfgs[i].updateExternalSettingsProviders(ids); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingContainer#getChildSettings() - */ @Override public ICSettingObject[] getChildSettings() { return new ICSettingObject[0]; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getConfiguration() - */ @Override public ICConfigurationDescription getConfiguration() { return this; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getId() - */ @Override public String getId() { return fCfgs[0].getId() + "_etc"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getName() - */ @Override public String getName() { return "Multiple Config Description"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getParent() - */ @Override public ICSettingContainer getParent() { ICSettingContainer p = fCfgs[0].getParent(); @@ -554,9 +410,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return p; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getType() - */ @Override public int getType() { int t = fCfgs[0].getType(); @@ -566,9 +419,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return t; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isReadOnly() - */ @Override public boolean isReadOnly() { for (int i = 0; i < fCfgs.length; i++) @@ -583,9 +433,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC cfg.setReadOnly(readOnly, keepModify); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isValid() - */ @Override public boolean isValid() { for (int i = 0; i < fCfgs.length; i++) @@ -594,9 +441,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingsStorage#getStorage(java.lang.String, boolean) - */ @Override public ICStorageElement getStorage(String id, boolean create) throws CoreException { if (DEBUG) @@ -604,9 +448,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingsStorage#getStorage(java.lang.String, boolean) - */ @Override public ICStorageElement importStorage(String id, ICStorageElement el) throws UnsupportedOperationException, CoreException { @@ -615,9 +456,6 @@ public class MultiConfigDescription extends MultiItemsHolder implements ICMultiC return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingsStorage#removeStorage(java.lang.String) - */ @Override public void removeStorage(String id) throws CoreException { for (int i = 0; i < fCfgs.length; i++) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFileDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFileDescription.java index d4fd72a8472..e37aff0294c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFileDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFileDescription.java @@ -27,9 +27,6 @@ public class MultiFileDescription extends MultiResourceDescription implements IC super(res); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFileDescription#getLanguageSetting() - */ @Override public ICLanguageSetting getLanguageSetting() { if (DEBUG) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFolderDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFolderDescription.java index 3312ec8ec53..19a69f8dc47 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFolderDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/MultiFolderDescription.java @@ -33,9 +33,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements super(res); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#createLanguageSettingForContentTypes(java.lang.String, java.lang.String[]) - */ @Override public ICLanguageSetting createLanguageSettingForContentTypes(String languageId, String[] typeIds) throws CoreException { @@ -44,9 +41,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#createLanguageSettingForExtensions(java.lang.String, java.lang.String[]) - */ @Override public ICLanguageSetting createLanguageSettingForExtensions(String languageId, String[] extensions) throws CoreException { @@ -55,9 +49,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getLanguageSettingForFile(java.lang.String) - */ @Override public ICLanguageSetting getLanguageSettingForFile(String fileName) { ICLanguageSetting ls0 = ((ICFolderDescription) fRess[0]).getLanguageSettingForFile(fileName); @@ -73,9 +64,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return ls0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getLanguageSettings() - */ @Override public ICLanguageSetting[][] getLanguageSettingsM(Comparator comp) { ICLanguageSetting[][] ls = new ICLanguageSetting[fRess.length][]; @@ -88,9 +76,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return ls; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getNestedResourceDescription(org.eclipse.core.runtime.IPath, boolean) - */ @Override public ICResourceDescription getNestedResourceDescription(IPath relPath, boolean exactPath) { if (DEBUG) @@ -98,9 +83,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getNestedResourceDescriptions(int) - */ @Override public ICResourceDescription[] getNestedResourceDescriptions(int kind) { if (DEBUG) @@ -108,9 +90,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#getNestedResourceDescriptions() - */ @Override public ICResourceDescription[] getNestedResourceDescriptions() { if (DEBUG) @@ -118,9 +97,6 @@ public class MultiFolderDescription extends MultiResourceDescription implements return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICFolderDescription#isRoot() - */ @Override public boolean isRoot() { for (int i = 0; i < fRess.length; i++) 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 19be108946a..dc2acaada0d 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 @@ -39,9 +39,7 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen fRess = res; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#canExclude(boolean) - * + /* * returns TRUE only if all res.configurations return true */ @Override @@ -52,9 +50,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#getParentFolderDescription() - */ @Override public ICFolderDescription getParentFolderDescription() { if (DEBUG) @@ -62,9 +57,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#getPath() - */ @Override public IPath getPath() { IPath p = fRess[0].getPath(); @@ -78,9 +70,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#isExcluded() - */ @Override public boolean isExcluded() { for (int i = 0; i < fRess.length; i++) @@ -89,27 +78,18 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#setExcluded(boolean) - */ @Override public void setExcluded(boolean excluded) throws WriteAccessException { for (int i = 0; i < fRess.length; i++) fRess[i].setExcluded(excluded); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICResourceDescription#setPath(org.eclipse.core.runtime.IPath) - */ @Override public void setPath(IPath path) throws WriteAccessException { for (int i = 0; i < fRess.length; i++) fRess[i].setPath(path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingContainer#getChildSettings() - */ @Override public ICSettingObject[] getChildSettings() { if (DEBUG) @@ -117,9 +97,7 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen throw new UnsupportedOperationException(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getConfiguration() - * + /* * returns multi-configuration object */ @Override @@ -133,25 +111,17 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return fCfg; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getId() - */ @Override public String getId() { return fRess[0].getId() + "_etc"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getName() - */ @Override public String getName() { return "Multiple Resource Description"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getParent() - * + /* * If there's the same parent for all res cfgs, return it. * Else return null; */ @@ -166,9 +136,7 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return sc; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#getType() - * + /* * If there's the same type for all res cfgs, return it. * Else return null; */ @@ -181,9 +149,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return t; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isReadOnly() - */ @Override public boolean isReadOnly() { for (int i = 0; i < fRess.length; i++) @@ -192,9 +157,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.ICSettingObject#isValid() - */ @Override public boolean isValid() { for (int i = 0; i < fRess.length; i++) @@ -203,9 +165,6 @@ public abstract class MultiResourceDescription extends MultiItemsHolder implemen return true; } - /* (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/ResourceChangeHandler.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/ResourceChangeHandler.java index abbe02ab4b9..258ab058f2f 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 @@ -284,36 +284,20 @@ public class ResourceChangeHandler extends ResourceChangeHandlerBase implements return new RcMoveHandler(); } - /* - * I S a v e P a r t i c i p a n t - */ - - /* (non-Javadoc) - * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext) - */ @Override public void saving(ISaveContext context) throws CoreException { //Request a resource delta to be used on next activation. context.needDelta(); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext) - */ @Override public void doneSaving(ISaveContext context) { } - /* (non-Javadoc) - * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext) - */ @Override public void prepareToSave(ISaveContext context) throws CoreException { } - /* (non-Javadoc) - * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext) - */ @Override public void rollback(ISaveContext context) { } 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 4136fa401d9..5211a782a67 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 @@ -170,8 +170,6 @@ public class SetCProjectDescriptionOperation extends CModelOperation { // /* // * Instead of using the workspace scheduling rule, use a more refined project scoped rule. // * This must contain the rule in CConfigBasedDescriptor.setApply(...) - // * (non-Javadoc) - // * @see org.eclipse.cdt.internal.core.model.CModelOperation#getSchedulingRule() // */ // @Override // public ISchedulingRule getSchedulingRule() { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java index 6a16807b649..01c99e4e24c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml/XmlProjectDescriptionStorage.java @@ -367,8 +367,6 @@ public class XmlProjectDescriptionStorage extends AbstractCProjectDescriptionSto } /* Sets the current read-only descriptions -- uses the write lock - * (non-Javadoc) - * @see org.eclipse.cdt.core.settings.model.AbstractCProjectDescriptionStorage#setCurrentDescription(org.eclipse.cdt.core.settings.model.ICProjectDescription, boolean) */ @Override public boolean setCurrentDescription(ICProjectDescription des, boolean overwriteIfExists) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml2/XmlProjectDescriptionStorage2.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml2/XmlProjectDescriptionStorage2.java index e71a55485d6..0503a7165ed 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml2/XmlProjectDescriptionStorage2.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/xml2/XmlProjectDescriptionStorage2.java @@ -78,8 +78,6 @@ public class XmlProjectDescriptionStorage2 extends XmlProjectDescriptionStorage /* * Check for external modification in the module files in the .csettings directory - * (non-Javadoc) - * @see org.eclipse.cdt.internal.core.settings.model.xml.XmlProjectDescriptionStorage#checkExternalModification() */ @Override protected synchronized boolean checkExternalModification() { @@ -165,8 +163,6 @@ public class XmlProjectDescriptionStorage2 extends XmlProjectDescriptionStorage * - We serialize the storageModule children of the CConfiguration elements (in the org.eclipse.cdt.settings module) * to separate files in the .csettings directory to prevent unmanageably large XML deltas * Return the modification stamp of the main .cproject file as our super method does - * (non-Javadoc) - * @see org.eclipse.cdt.internal.core.settings.model.xml.XmlProjectDescriptionStorage#serialize(org.eclipse.core.resources.IContainer, java.lang.String, org.eclipse.cdt.core.settings.model.ICStorageElement) */ @Override protected long serialize(IContainer container, String file, ICStorageElement element) throws CoreException { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java index 6fb435ef8d4..43f0e086f01 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java @@ -97,9 +97,6 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() - */ @Override public String getName() { if (definition != null) @@ -116,9 +113,6 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return declarations[0].toCharArray(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() - */ @Override public IScope getScope() { return CVisitor.getContainingScope(definition != null ? definition : declarations[0].getParent()); @@ -135,9 +129,6 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte return t; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IEnumeration#getEnumerators() - */ @Override public IEnumerator[] getEnumerators() { if (definition == null) { @@ -162,9 +153,6 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte definition = name; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) - */ @Override public boolean isSameType(IType type) { if (type == this) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java index ab2fc1c9155..25048ec8e20 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java @@ -56,9 +56,6 @@ public class CEnumerator extends PlatformObject implements IEnumerator { return enumeratorName; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() - */ @Override public String getName() { return enumeratorName.toString(); @@ -69,17 +66,11 @@ public class CEnumerator extends PlatformObject implements IEnumerator { return enumeratorName.toCharArray(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() - */ @Override public IScope getScope() { return CVisitor.getContainingScope(enumeratorName.getParent()); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType() - */ @Override public IType getType() { return (IType) getOwner(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java index 1d914d061d5..d3c51249bed 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java @@ -27,9 +27,6 @@ public class CFunctionScope extends CScope implements ICFunctionScope { super(function, EScopeKind.eLocal); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.c.ICFunctionScope#getBinding(char[]) - */ @Override public IBinding getBinding(char[] name) { return super.getBinding(NAMESPACE_TYPE_OTHER, name); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java index 34af4fe7c4f..685f9a85cc1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CImplicitTypedef.java @@ -57,9 +57,6 @@ public class CImplicitTypedef extends CTypedef { return scope; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) - */ // public boolean isSameType(IType t) { // if (t == this) // return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java index 92285332ead..f37a41f34d1 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java @@ -42,9 +42,6 @@ public class CKnRParameter extends PlatformObject implements IParameter { this.name = name; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IVariable#getType() - */ @Override public IType getType() { IASTDeclSpecifier declSpec = null; @@ -62,56 +59,35 @@ public class CKnRParameter extends PlatformObject implements IParameter { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getName() - */ @Override public String getName() { return name.toString(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray() - */ @Override public char[] getNameCharArray() { return name.toCharArray(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope() - */ @Override public IScope getScope() { return CVisitor.getContainingScope(declaration); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IBinding#getPhysicalNode() - */ public IASTNode getPhysicalNode() { return declaration; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic() - */ @Override public boolean isStatic() { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern() - */ @Override public boolean isExtern() { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto() - */ @Override public boolean isAuto() { if (declaration instanceof IASTSimpleDeclaration) @@ -120,9 +96,6 @@ public class CKnRParameter extends PlatformObject implements IParameter { return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister() - */ @Override public boolean isRegister() { if (declaration instanceof IASTSimpleDeclaration) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java index 3b1a526fc78..80d15a39748 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java @@ -68,25 +68,16 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali return false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isConst() - */ @Override public boolean isConst() { return isConst; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isVolatile() - */ @Override public boolean isVolatile() { return isVolatile; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.c.ICQualifierType#isRestrict() - */ @Override public boolean isRestrict() { return isRestrict; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java index cfd4de9336d..1f59167c318 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java @@ -174,9 +174,6 @@ public class CVisitor extends ASTQueries { return removeNullFromProblems(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclaration(org.eclipse.cdt.core.dom.ast.IASTDeclaration) - */ @Override public int visit(IASTDeclaration declaration) { if (declaration instanceof IASTProblemHolder) @@ -185,9 +182,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processExpression(org.eclipse.cdt.core.dom.ast.IASTExpression) - */ @Override public int visit(IASTExpression expression) { if (expression instanceof IASTProblemHolder) @@ -196,9 +190,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processStatement(org.eclipse.cdt.core.dom.ast.IASTStatement) - */ @Override public int visit(IASTStatement statement) { if (statement instanceof IASTProblemHolder) @@ -207,9 +198,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processTypeId(org.eclipse.cdt.core.dom.ast.IASTTypeId) - */ @Override public int visit(IASTTypeId typeId) { if (typeId instanceof IASTProblemHolder) @@ -266,9 +254,6 @@ public class CVisitor extends ASTQueries { this.binding = binding; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclarator(org.eclipse.cdt.core.dom.ast.IASTDeclarator) - */ @Override public int visit(IASTDeclarator declarator) { //GCC allows declarations in expressions, so we have to continue from the @@ -309,9 +294,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier) - */ @Override public int visit(IASTDeclSpecifier declSpec) { if (compositeTypeDeclared && declSpec instanceof ICASTTypedefNameSpecifier) @@ -348,9 +330,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processEnumerator(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator) - */ @Override public int visit(IASTEnumerator enumerator) { if (binding instanceof IEnumerator && enumerator.getName().resolveBinding() == binding) { @@ -360,9 +339,6 @@ public class CVisitor extends ASTQueries { return PROCESS_CONTINUE; } - /* (non-Javadoc) - * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processStatement(org.eclipse.cdt.core.dom.ast.IASTStatement) - */ @Override public int visit(IASTStatement statement) { if (statement instanceof IASTLabelStatement && binding instanceof ILabel) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java index e6c2feb213b..c934385971a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java @@ -64,9 +64,6 @@ public class CPPFunctionInstance extends CPPFunctionSpecialization implements IC return false; } - /* (non-Javadoc) - * For debug purposes only - */ @Override public String toString() { return getName() + " " + ASTTypeUtil.getArgumentListString(fArguments, true); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java index cf4d1624448..ace153b52d9 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java @@ -27,25 +27,16 @@ public final class EmptyIterator implements Iterator { private EmptyIterator() { } - /* (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ @Override public final boolean hasNext() { return false; } - /* (non-Javadoc) - * @see java.util.Iterator#next() - */ @Override public final T next() { throw new NoSuchElementException(); } - /* (non-Javadoc) - * @see java.util.Iterator#remove() - */ @Override public final void remove() { throw new UnsupportedOperationException(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncher.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncher.java index 3ab8915e477..0c3d27310e2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncher.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncher.java @@ -66,41 +66,26 @@ public class CommandLauncher implements ICommandLauncher { fShowCommand = false; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#showCommand(boolean) - */ @Override public void showCommand(boolean show) { fShowCommand = show; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#getErrorMessage() - */ @Override public String getErrorMessage() { return fErrorMessage; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#setErrorMessage(java.lang.String) - */ @Override public void setErrorMessage(String error) { fErrorMessage = error; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#getCommandArgs() - */ @Override public String[] getCommandArgs() { return fCommandArgs; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#getEnvironment() - */ @Override public Properties getEnvironment() { if (fEnvironment == null) { @@ -121,9 +106,6 @@ public class CommandLauncher implements ICommandLauncher { return fEnvironment.getProperty(key); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#getCommandLine() - */ @Override public String getCommandLine() { return getCommandLine(getCommandArgs()); @@ -239,9 +221,6 @@ public class CommandLauncher implements ICommandLauncher { return fProcess; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#waitAndRead(java.io.OutputStream, java.io.OutputStream) - */ @Override @Deprecated public int waitAndRead(OutputStream out, OutputStream err) { @@ -258,9 +237,6 @@ public class CommandLauncher implements ICommandLauncher { return OK; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.ICommandLauncher#waitAndRead(java.io.OutputStream, java.io.OutputStream, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public int waitAndRead(OutputStream output, OutputStream err, IProgressMonitor monitor) { if (fShowCommand) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariable.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariable.java index 57f8fb5627d..3f21a15f29b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariable.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariable.java @@ -56,25 +56,16 @@ public class CdtVariable implements ICdtVariable { } } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getName() - */ @Override public String getName() { return fName; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getMacroValueType() - */ @Override public int getValueType() { return fType; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() - */ @Override public String getStringValue() throws CdtVariableException { if (CdtVariableResolver.isStringListVariable(fType)) @@ -83,9 +74,6 @@ public class CdtVariable implements ICdtVariable { return fStringValue; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringListValue() - */ @Override public String[] getStringListValue() throws CdtVariableException { if (!CdtVariableResolver.isStringListVariable(fType)) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariableStatus.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariableStatus.java index be99c22a27e..b2872065e63 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariableStatus.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/cdtvariables/CdtVariableStatus.java @@ -159,40 +159,25 @@ public class CdtVariableStatus extends Status implements ICdtVariableStatus { return message; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroStatus#getMacroName() - */ @Override public String getVariableName() { return fMacroName; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroStatus#getExpression() - */ @Override public String getExpression() { return fExpression; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroStatus#getReferencedName() - */ @Override public String getReferencedMacroName() { return fReferencedName; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroStatus#getContextType() - */ // public int getContextType() { // return fContextType; // } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroStatus#getContextData() - */ // public Object getContextData() { // return fContextData; // } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/ErrorParserNamedWrapper.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/ErrorParserNamedWrapper.java index dca5883700b..18be2d80979 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/ErrorParserNamedWrapper.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/ErrorParserNamedWrapper.java @@ -43,25 +43,16 @@ public class ErrorParserNamedWrapper implements IErrorParserNamed { this.fErrorParser = errorParser; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IErrorParser#processLine(java.lang.String, org.eclipse.cdt.core.ErrorParserManager) - */ @Override public boolean processLine(String line, ErrorParserManager epm) { return fErrorParser.processLine(line, epm); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IErrorParserNamed#getId() - */ @Override public String getId() { return fId; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IErrorParserNamed#getName() - */ @Override public String getName() { return fName; @@ -74,25 +65,16 @@ public class ErrorParserNamedWrapper implements IErrorParserNamed { return fErrorParser; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IErrorParserNamed#setId(java.lang.String) - */ @Override public void setId(String id) { this.fId = id; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IErrorParserNamed#setName(java.lang.String) - */ @Override public void setName(String name) { this.fName = name; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (o instanceof ErrorParserNamedWrapper) { @@ -105,9 +87,6 @@ public class ErrorParserNamedWrapper implements IErrorParserNamed { } - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public Object clone() throws CloneNotSupportedException { // shallow copy since IErrorParser is not {@link Cloneable} in general. diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/FixitErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/FixitErrorParser.java index a190b679cd2..617dd0c76f3 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/FixitErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/FixitErrorParser.java @@ -89,9 +89,6 @@ public class FixitErrorParser extends RegexErrorParser { return super.processLine(line, epManager); } - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public Object clone() throws CloneNotSupportedException { FixitErrorParser that = new FixitErrorParser(getId(), getName()); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorParser.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorParser.java index 10a6386ca38..265e61d1202 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorParser.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorParser.java @@ -157,9 +157,6 @@ public class RegexErrorParser implements IErrorParserNamed { return false; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (o instanceof RegexErrorParser) { @@ -170,9 +167,6 @@ public class RegexErrorParser implements IErrorParserNamed { } - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public Object clone() throws CloneNotSupportedException { RegexErrorParser that = new RegexErrorParser(fId, fName); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorPattern.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorPattern.java index ec8f9e0811c..63ee040abfd 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorPattern.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/errorparsers/RegexErrorPattern.java @@ -344,9 +344,6 @@ public class RegexErrorPattern implements Cloneable { return path; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (o instanceof RegexErrorPattern) { @@ -362,9 +359,6 @@ public class RegexErrorPattern implements Cloneable { } - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public Object clone() throws CloneNotSupportedException { return new RegexErrorPattern(pattern.toString(), fileExpression, lineExpression, descriptionExpression, diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/EFSFileStorage.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/EFSFileStorage.java index 8d63e91cf3b..2a5b5169904 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/EFSFileStorage.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/EFSFileStorage.java @@ -42,9 +42,6 @@ public class EFSFileStorage extends PlatformObject implements IStorage { this.locationURI = locationURI; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IStorage#getContents() - */ @Override public InputStream getContents() throws CoreException { if (inputStream == null) { @@ -59,17 +56,11 @@ public class EFSFileStorage extends PlatformObject implements IStorage { return inputStream; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IStorage#getFullPath() - */ @Override public IPath getFullPath() { return URIUtil.toPath(locationURI); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IStorage#getName() - */ @Override public String getName() { IFileStore fileStore = null; @@ -88,9 +79,6 @@ public class EFSFileStorage extends PlatformObject implements IStorage { return null; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.IStorage#isReadOnly() - */ @Override public boolean isReadOnly() { IFileStore fileStore = null; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java index c862461de0d..3def7c56ca7 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/RefreshExclusion.java @@ -390,9 +390,6 @@ public abstract class RefreshExclusion implements Cloneable { } } - /* (non-Javadoc) - * @see java.lang.Object#clone() - */ @Override public abstract Object clone(); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java index 3506733af1c..3ec1a8ee8ca 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java @@ -179,9 +179,6 @@ public class ScannerProvider extends AbstractCExtension implements IScannerInfoP } } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.model.IElementChangedListener#elementChanged(org.eclipse.cdt.core.model.ElementChangedEvent) - */ @Override public void elementChanged(ElementChangedEvent event) { try { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java index 46d3e61f47a..fcbcdec484f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java @@ -244,8 +244,6 @@ final public class CConfigBasedDescriptorManager implements ICDescriptorManager /* * Run the descriptor operation. Lock the descriptor while this takes place... - * (non-Javadoc) - * @see org.eclipse.cdt.core.ICDescriptorManager#runDescriptorOperation(org.eclipse.core.resources.IProject, org.eclipse.cdt.core.ICDescriptorOperation, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void runDescriptorOperation(IProject project, ICDescriptorOperation op, IProgressMonitor monitor) @@ -275,8 +273,6 @@ final public class CConfigBasedDescriptorManager implements ICDescriptorManager /* * Runs a descriptor operation directly on an ICProjectDescription. * - * (non-Javadoc) - * @see org.eclipse.cdt.core.ICDescriptorManager#runDescriptorOperation(org.eclipse.core.resources.IProject, org.eclipse.cdt.core.settings.model.ICProjectDescription, org.eclipse.cdt.core.ICDescriptorOperation, org.eclipse.core.runtime.IProgressMonitor) */ @Override public void runDescriptorOperation(IProject project, ICProjectDescription des, ICDescriptorOperation op, diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PositionTrackerChain.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PositionTrackerChain.java index 80ad2bf756c..5d215f88690 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PositionTrackerChain.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/PositionTrackerChain.java @@ -77,9 +77,6 @@ class PositionTrackerChain implements IDocumentListener { } } - /* (non-Javadoc) - * @see org.eclipse.jface.text.IPositionUpdater#update(DocumentEvent) - */ private void update(DocumentEvent event) { String text = event.getText(); int insertLen = text != null ? text.length() : 0; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java index a47a3402f01..9c44dc9e6f2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java @@ -160,9 +160,6 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase { return fInstance; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) - */ @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { ICdtVariable macro = null; @@ -460,9 +457,6 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase { return macro; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) - */ @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { String names[] = getMacroNames(contextType, false); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java index 3a0cd2e61e2..90ec97f24d2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtVariableManager.java @@ -56,9 +56,6 @@ public class CdtVariableManager implements ICdtVariableManager { return fDefault; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getMacro(java.lang.String, int, java.lang.Object, boolean) - */ @Override public ICdtVariable getVariable(String macroName, ICConfigurationDescription cfg) { if (cfg instanceof CConfigurationDescriptionCache) { @@ -75,9 +72,6 @@ public class CdtVariableManager implements ICdtVariableManager { return getMacroContextInfo(type, cfg); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getMacros(int, java.lang.Object, boolean) - */ @Override public ICdtVariable[] getVariables(ICConfigurationDescription cfg) { if (cfg instanceof CConfigurationDescriptionCache) { @@ -89,9 +83,6 @@ public class CdtVariableManager implements ICdtVariableManager { return SupplierBasedCdtVariableManager.getVariables(getMacroContextInfo(type, cfg), true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getSuppliers(int, java.lang.Object) - */ public ICdtVariableSupplier[] getSuppliers(int contextType, Object contextData) { IVariableContextInfo info = getMacroContextInfo(contextType, contextData); if (info != null) @@ -106,17 +97,11 @@ public class CdtVariableManager implements ICdtVariableManager { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#convertStringListToString(java.lang.String[], java.lang.String) - */ @Override public String convertStringListToString(String[] value, String listDelimiter) { return CdtVariableResolver.convertStringListToString(value, listDelimiter); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#resolveValue(java.lang.String, java.lang.String, java.lang.String, int, java.lang.Object) - */ @Override public String resolveValue(String value, String nonexistentMacrosValue, String listDelimiter, ICConfigurationDescription cfg) throws CdtVariableException { @@ -128,9 +113,6 @@ public class CdtVariableManager implements ICdtVariableManager { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#resolveStringListValue(java.lang.String, java.lang.String, int, java.lang.Object) - */ @Override public String[] resolveStringListValue(String value, String nonexistentMacrosValue, String listDelimiter, ICConfigurationDescription cfg) throws CdtVariableException { @@ -142,9 +124,6 @@ public class CdtVariableManager implements ICdtVariableManager { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#isStringListValue(java.lang.String) - */ @Override public boolean isStringListValue(String value, ICConfigurationDescription cfg) throws CdtVariableException { try { @@ -157,9 +136,6 @@ public class CdtVariableManager implements ICdtVariableManager { } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#checkIntegrity(int, java.lang.Object) - */ @Override public void checkVariableIntegrity(ICConfigurationDescription cfg) throws CdtVariableException { @@ -188,9 +164,6 @@ public class CdtVariableManager implements ICdtVariableManager { return new CoreVariableSubstitutor(info, inexistentMacroValue, listDelimiter); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#resolveStringListValues(java.lang.String[], java.lang.String, java.lang.String, int, java.lang.Object) - */ @Override public String[] resolveStringListValues(String[] value, String nonexistentMacrosValue, String listDelimiter, ICConfigurationDescription cfg) throws CdtVariableException { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CoreVariableSubstitutor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CoreVariableSubstitutor.java index a7a37426c6c..283435102d6 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CoreVariableSubstitutor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CoreVariableSubstitutor.java @@ -30,18 +30,13 @@ public class CoreVariableSubstitutor extends SupplierBasedCdtVariableSubstitutor public CoreVariableSubstitutor(IVariableContextInfo contextInfo, String inexistentMacroValue, String listDelimiter, Map delimiterMap, String incorrectlyReferencedMacroValue) { super(contextInfo, inexistentMacroValue, listDelimiter, delimiterMap, incorrectlyReferencedMacroValue); - // TODO Auto-generated constructor stub } public CoreVariableSubstitutor(IVariableContextInfo contextInfo, String inexistentMacroValue, String listDelimiter) { super(contextInfo, inexistentMacroValue, listDelimiter); - // TODO Auto-generated constructor stub } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroSubstitutor#setMacroContextInfo(int, java.lang.Object) - */ public void setMacroContextInfo(int contextType, Object contextData) throws CdtVariableException { setMacroContextInfo(getMacroContextInfo(contextType, contextData)); } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/DefaultVariableContextInfo.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/DefaultVariableContextInfo.java index 1bdd8273ee0..f7b552622fe 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/DefaultVariableContextInfo.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/DefaultVariableContextInfo.java @@ -71,25 +71,16 @@ public class DefaultVariableContextInfo implements ICoreVariableContextInfo { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextType() - */ @Override public int getContextType() { return fType; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextData() - */ @Override public Object getContextData() { return fData; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getSuppliers() - */ @Override public ICdtVariableSupplier[] getSuppliers() { if (fSuppliers == null) @@ -97,9 +88,6 @@ public class DefaultVariableContextInfo implements ICoreVariableContextInfo { return fSuppliers; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getNext() - */ @Override public IVariableContextInfo getNext() { switch (fType) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java index 69cf8061ac8..be2b540c8ac 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EclipseVariablesVariableSupplier.java @@ -77,9 +77,6 @@ public class EclipseVariablesVariableSupplier implements ICdtVariableSupplier { fArgument = argument; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() - */ @Override public String getStringValue() throws CdtVariableException { if (!fInitialized) { @@ -124,9 +121,6 @@ public class EclipseVariablesVariableSupplier implements ICdtVariableSupplier { } } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) - */ @Override public ICdtVariable getVariable(String macroName, IVariableContextInfo info) { return getVariable(macroName); @@ -162,9 +156,6 @@ public class EclipseVariablesVariableSupplier implements ICdtVariableSupplier { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) - */ @Override public ICdtVariable[] getVariables(IVariableContextInfo info) { return getVariables(); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java index fd97b1cef7b..f571d76281b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/EnvironmentVariableSupplier.java @@ -123,9 +123,6 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { return fInstance; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) - */ @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { if (macroName == null || macroName.isEmpty()) @@ -155,9 +152,6 @@ public class EnvironmentVariableSupplier extends CoreMacroSupplierBase { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) - */ @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { IEnvironmentVariable vars[] = null; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java index 2fa67fba038..1b4b900d733 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserDefinedVariableSupplier.java @@ -109,9 +109,6 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { return fInstance; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) - */ @Override public ICdtVariable getMacro(String macroName, int contextType, Object contextData) { if (macroName == null || macroName.isEmpty()) @@ -123,9 +120,6 @@ public class UserDefinedVariableSupplier extends CoreMacroSupplierBase { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) - */ @Override public ICdtVariable[] getMacros(int contextType, Object contextData) { StorableCdtVariables macros = getStorableMacros(contextType, contextData); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserVarSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserVarSupplier.java index e8b77e5f42d..48459f5ac13 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserVarSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/UserVarSupplier.java @@ -37,50 +37,32 @@ public class UserVarSupplier implements IUserVarSupplier { return sup; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#createMacro(org.eclipse.cdt.core.cdtvariables.ICdtVariable, int, java.lang.Object) - */ @Override public ICdtVariable createMacro(ICdtVariable copy, ICConfigurationDescription contextData) { return CdtVariableManager.fUserDefinedMacroSupplier.createMacro(copy, CTX, contextData); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#createMacro(java.lang.String, int, java.lang.String, java.lang.Object) - */ @Override public ICdtVariable createMacro(String macroName, int type, String value, ICConfigurationDescription contextData) { return CdtVariableManager.fUserDefinedMacroSupplier.createMacro(macroName, type, value, CTX, contextData); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#createMacro(java.lang.String, int, java.lang.String[], java.lang.Object) - */ @Override public ICdtVariable createMacro(String macroName, int type, String[] value, ICConfigurationDescription contextData) { return CdtVariableManager.fUserDefinedMacroSupplier.createMacro(macroName, type, value, CTX, contextData); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#deleteAll(java.lang.Object) - */ @Override public void deleteAll(ICConfigurationDescription contextData) { CdtVariableManager.fUserDefinedMacroSupplier.deleteAll(CTX, contextData); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#deleteMacro(java.lang.String, java.lang.Object) - */ @Override public ICdtVariable deleteMacro(String name, ICConfigurationDescription contextData) { return CdtVariableManager.fUserDefinedMacroSupplier.deleteMacro(name, CTX, contextData); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.cdtvariables.IUserVarSupplier#getMacros(java.lang.Object) - */ @Override public ICdtVariable[] getMacros(ICConfigurationDescription contextData) { return CdtVariableManager.fUserDefinedMacroSupplier.getMacros(CTX, contextData); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java index 58462f3525d..c223b70ad5f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java @@ -65,35 +65,23 @@ public class InternalASTServiceProvider implements IASTServiceProvider { "GNUC++" //$NON-NLS-1$ }; - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.IASTServiceProvider#getName() - */ public String getName() { // TODO is this a name or an id? return "CDT AST Service"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.IASTServiceProvider#getTranslationUnit() - */ @Override public IASTTranslationUnit getTranslationUnit(IFile fileToParse) throws UnsupportedDialectException { return getTranslationUnit(fileToParse.getLocation().toOSString(), fileToParse, SavedCodeReaderFactory.getInstance(), null); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.IASTServiceProvider#getTranslationUnit(org.eclipse.cdt.core.dom.ICodeReaderFactory) - */ @Override public IASTTranslationUnit getTranslationUnit(IFile fileToParse, ICodeReaderFactory fileCreator) throws UnsupportedDialectException { return getTranslationUnit(fileToParse.getLocation().toOSString(), fileToParse, fileCreator, null); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.IASTServiceProvider#getTranslationUnit(org.eclipse.cdt.core.dom.ICodeReaderFactory, org.eclipse.cdt.core.dom.IParserConfiguration) - */ @Override public IASTTranslationUnit getTranslationUnit(IFile fileToParse, ICodeReaderFactory fileCreator, IParserConfiguration configuration) throws UnsupportedDialectException { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java index 5b0a009d056..fecc6c1449b 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java @@ -28,18 +28,12 @@ import org.eclipse.cdt.core.parser.ParserUtil; import org.eclipse.cdt.internal.core.parser.EmptyIterator; import org.eclipse.core.runtime.CoreException; -/** - * @author jcamelon - */ @Deprecated public class PartialWorkingCopyCodeReaderFactory extends AbstractCodeReaderFactory { private final IWorkingCopyProvider provider; private ICodeReaderCache cache = null; - /** - * @param provider - */ public PartialWorkingCopyCodeReaderFactory(IWorkingCopyProvider provider, IIncludeFileResolutionHeuristics heuristics) { super(heuristics); @@ -47,17 +41,11 @@ public class PartialWorkingCopyCodeReaderFactory extends AbstractCodeReaderFacto cache = SavedCodeReaderFactory.getInstance().getCodeReaderCache(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getUniqueIdentifier() - */ @Override public int getUniqueIdentifier() { return CDOM.PARSE_WORKING_COPY_WITH_SAVED_INCLUSIONS; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForTranslationUnit(java.lang.String) - */ @Override public CodeReader createCodeReaderForTranslationUnit(String path) { return checkWorkingCopyThenCache(path); @@ -74,9 +62,6 @@ public class PartialWorkingCopyCodeReaderFactory extends AbstractCodeReaderFacto return cache.get(path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String) - */ @Override public CodeReader createCodeReaderForInclusion(String path) { return cache.get(path); @@ -94,9 +79,6 @@ public class PartialWorkingCopyCodeReaderFactory extends AbstractCodeReaderFacto return Arrays.asList(provider.getWorkingCopies()).iterator(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getCodeReaderCache() - */ @Override public ICodeReaderCache getCodeReaderCache() { return cache; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java index 87269696234..bf995f159ee 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java @@ -73,17 +73,11 @@ public class SavedCodeReaderFactory extends AbstractCodeReaderFactory { } } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getUniqueIdentifier() - */ @Override public int getUniqueIdentifier() { return CDOM.PARSE_SAVED_RESOURCES; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForTranslationUnit(java.lang.String) - */ @Override public CodeReader createCodeReaderForTranslationUnit(String path) { return cache.get(path); @@ -93,9 +87,6 @@ public class SavedCodeReaderFactory extends AbstractCodeReaderFactory { return new CodeReader(tu.getResource().getLocation().toOSString(), tu.getContents()); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String) - */ @Override public CodeReader createCodeReaderForInclusion(String path) { return cache.get(path); @@ -107,9 +98,6 @@ public class SavedCodeReaderFactory extends AbstractCodeReaderFactory { return cache.get(astPath, ifl); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String) - */ @Override public ICodeReaderCache getCodeReaderCache() { return cache; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java index 8cb726c1896..371e2048ea2 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/BuildSystemEnvironmentSupplier.java @@ -55,9 +55,6 @@ public class BuildSystemEnvironmentSupplier implements ICoreEnvironmentVariableS fStartData = level; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariable(java.lang.String, java.lang.Object, boolean) - */ @Override public IEnvironmentVariable getVariable(String variableName, ICConfigurationDescription cfg, boolean resolveMacros) { @@ -71,9 +68,6 @@ public class BuildSystemEnvironmentSupplier implements ICoreEnvironmentVariableS return filterVariables(super.getVariables(cfg, resolveMacros)); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableProvider#getContextInfo(java.lang.Object) - */ @Override public IEnvironmentContextInfo getContextInfo(Object level) { IEnvironmentContextInfo startInfo = getStartInfo(); @@ -153,9 +147,6 @@ public class BuildSystemEnvironmentSupplier implements ICoreEnvironmentVariableS } } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableSupplier#getVariable() - */ @Override public IEnvironmentVariable getVariable(String name, Object context) { if (context == null) @@ -175,9 +166,6 @@ public class BuildSystemEnvironmentSupplier implements ICoreEnvironmentVariableS return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableSupplier#getVariables() - */ @Override public IEnvironmentVariable[] getVariables(Object context) { if (context == null) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/DefaultEnvironmentContextInfo.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/DefaultEnvironmentContextInfo.java index fc7dd0de00d..d0a77e31eb3 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/DefaultEnvironmentContextInfo.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/DefaultEnvironmentContextInfo.java @@ -57,9 +57,6 @@ public class DefaultEnvironmentContextInfo implements IEnvironmentContextInfo { return suppliers; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.envvar.IContextInfo#getNext() - */ @Override public IEnvironmentContextInfo getNext() { DefaultEnvironmentContextInfo next = null; @@ -71,9 +68,6 @@ public class DefaultEnvironmentContextInfo implements IEnvironmentContextInfo { return next; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.envvar.IContextInfo#getSuppliers() - */ @Override public ICoreEnvironmentVariableSupplier[] getSuppliers() { if (fContextSuppliers == null) @@ -85,9 +79,6 @@ public class DefaultEnvironmentContextInfo implements IEnvironmentContextInfo { fContextSuppliers = suppliers; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.envvar.IContextInfo#getContext() - */ @Override public Object getContext() { return fContextObject; diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/EclipseEnvironmentSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/EclipseEnvironmentSupplier.java index c55644236fe..6cae943b149 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/EclipseEnvironmentSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/EclipseEnvironmentSupplier.java @@ -28,9 +28,6 @@ import org.eclipse.cdt.utils.spawner.EnvironmentReader; */ public class EclipseEnvironmentSupplier implements ICoreEnvironmentVariableSupplier { - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableSupplier#getVariable() - */ @Override public IEnvironmentVariable getVariable(String name, Object context) { if (context == null) { @@ -42,9 +39,6 @@ public class EclipseEnvironmentSupplier implements ICoreEnvironmentVariableSuppl return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableSupplier#getVariables() - */ @Override public IEnvironmentVariable[] getVariables(Object context) { if (context == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java index 41ae8f30745..5eb844b6ad3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java @@ -20,65 +20,41 @@ import org.eclipse.cdt.core.IAddressFactory2; public class Addr32Factory implements IAddressFactory2 { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#getZero() - */ @Override public IAddress getZero() { return Addr32.ZERO; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#getMax() - */ @Override public IAddress getMax() { return Addr32.MAX; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String) - */ @Override public IAddress createAddress(String addr) { return createAddress(addr, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean) - */ @Override public IAddress createAddress(String addr, boolean truncate) { return new Addr32(addr, truncate); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int) - */ @Override public IAddress createAddress(String addr, int radix) { return createAddress(addr, radix, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean) - */ @Override public IAddress createAddress(String addr, int radix, boolean truncate) { return new Addr32(addr, radix, truncate); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger) - */ @Override public IAddress createAddress(BigInteger addr) { return createAddress(addr, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean) - */ @Override public IAddress createAddress(BigInteger addr, boolean truncate) { return new Addr32(addr.longValue(), truncate); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java index 7477ade9b47..a03b91a3be4 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java @@ -20,65 +20,41 @@ import org.eclipse.cdt.core.IAddressFactory2; public class Addr64Factory implements IAddressFactory2 { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#getZero() - */ @Override public IAddress getZero() { return Addr64.ZERO; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#getMax() - */ @Override public IAddress getMax() { return Addr64.MAX; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String) - */ @Override public IAddress createAddress(String addr) { return createAddress(addr, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean) - */ @Override public IAddress createAddress(String addr, boolean truncate) { return new Addr64(addr, truncate); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int) - */ @Override public IAddress createAddress(String addr, int radix) { return createAddress(addr, radix, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean) - */ @Override public IAddress createAddress(String addr, int radix, boolean truncate) { return new Addr64(addr, radix, truncate); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger) - */ @Override public IAddress createAddress(BigInteger addr) { return createAddress(addr, true); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean) - */ @Override public IAddress createAddress(BigInteger addr, boolean truncate) { return new Addr64(addr, truncate); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java index fa8489d8a6d..8e6cfb4892d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java @@ -48,9 +48,6 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO super(parser, path, type); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbol(long) - */ @Override public ISymbol getSymbol(IAddress addr) { ISymbol[] syms = getSymbols(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java index 45f193cc385..ff46be844b3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java @@ -23,16 +23,10 @@ import org.eclipse.core.runtime.Path; public class DefaultGnuToolFactory implements IGnuToolFactory { protected ICExtension fExtension; - /** - * - */ public DefaultGnuToolFactory(ICExtension ext) { fExtension = ext; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.IGnuToolProvider#getAddr2line(org.eclipse.core.runtime.IPath) - */ @Override public Addr2line getAddr2line(IPath path) { IPath addr2LinePath = getAddr2linePath(); @@ -46,9 +40,6 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { return addr2line; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.IGnuToolProvider#getCPPFilt() - */ @Override public CPPFilt getCPPFilt() { IPath cppFiltPath = getCPPFiltPath(); @@ -62,9 +53,6 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { return cppfilt; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath) - */ @Override public Objdump getObjdump(IPath path) { IPath objdumpPath = getObjdumpPath(); @@ -79,9 +67,6 @@ public class DefaultGnuToolFactory implements IGnuToolFactory { return objdump; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath) - */ @Override public NM getNM(IPath path) { IPath nmPath = getNMPath(); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java index 29e603b099e..381365fcaf3 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java @@ -53,33 +53,21 @@ public class Symbol implements ISymbol { this.sourceFile = null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getBinarObject() - */ @Override public IBinaryObject getBinaryObject() { return binary; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getFilename() - */ @Override public IPath getFilename() { return sourceFile; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getName() - */ @Override public String getName() { return name; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getType() - */ @Override public int getType() { return type; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java index c0aa1d2a457..a7966ebe148 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/cdtvariables/SupplierBasedCdtVariableSubstitutor.java @@ -62,9 +62,6 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor fIsList = true; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() - */ @Override public String getStringValue() throws CdtVariableException { // if(!fIsDefined) @@ -74,9 +71,6 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor return fStringValue; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringListValue() - */ @Override public String[] getStringListValue() throws CdtVariableException { // if(!fIsDefined) @@ -235,9 +229,6 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor return result; } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroSubstitutor#resolveToString(java.lang.String) - */ @Override public String resolveToString(String macroName) throws CdtVariableException { return resolveToString(new MacroDescriptor(macroName, fContextInfo)); @@ -274,9 +265,6 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor return des.fMacro != null ? resolveMacro(des.fMacro) : resolveMacro(des.fName); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroSubstitutor#resolveToStringList(java.lang.String) - */ @Override public String[] resolveToStringList(String macroName) throws CdtVariableException { return resolveToStringList(new MacroDescriptor(macroName, fContextInfo)); @@ -419,9 +407,6 @@ public class SupplierBasedCdtVariableSubstitutor implements IVariableSubstitutor return fResolvedMacros.remove(name); } - /* (non-Javadoc) - * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroSubstitutor#getMacroContextInfo() - */ public IVariableContextInfo getMacroContextInfo() { return fContextInfo; } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java index 1fd36166157..2187b83971d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser.java @@ -66,9 +66,6 @@ public class CygwinPEParser extends PEParser { return new DefaultCygwinToolFactory(this); } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser64.java index 3cd81bd001b..2e774c4b17a 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEParser64.java @@ -64,9 +64,6 @@ public class CygwinPEParser64 extends PEParser64 { return new DefaultCygwinToolFactory(this); } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java index d239d5f051e..3aae202adda 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol.java @@ -59,9 +59,6 @@ class CygwinSymbol extends Symbol { super(binary, name, type, addr, size); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) - */ @Override public int getLineNumber(long offset) { int line = -1; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol64.java index a279918ab2c..e4bb287d347 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinSymbol64.java @@ -61,9 +61,6 @@ class CygwinSymbol64 extends Symbol { super(binary, name, type, addr, size); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) - */ @Override public int getLineNumber(long offset) { int line = -1; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject64.java index 699a49e9f89..e9ea46dd712 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject64.java @@ -53,9 +53,6 @@ public class PEBinaryObject64 extends BinaryObjectAdapter { super(parser, p, type); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getName() - */ @Override public String getName() { if (header != null) { @@ -64,9 +61,6 @@ public class PEBinaryObject64 extends BinaryObjectAdapter { return super.getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() - */ @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { @@ -190,9 +184,6 @@ public class PEBinaryObject64 extends BinaryObjectAdapter { } } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser64.java index 0071af23500..4497c6a68be 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser64.java @@ -32,17 +32,11 @@ import org.eclipse.core.runtime.IPath; */ public class PEParser64 extends AbstractCExtension implements IBinaryParser { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { @@ -99,9 +93,6 @@ public class PEParser64 extends AbstractCExtension implements IBinaryParser { return "PE"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public boolean isBinary(byte[] array, IPath path) { boolean isBin = PE64.isExeHeader(array) || AR.isARHeader(array); @@ -134,9 +125,6 @@ public class PEParser64 extends AbstractCExtension implements IBinaryParser { return isBin; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize() - */ @Override public int getHintBufferSize() { return 512; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java index c37e6e9cbc9..7169856000f 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/TypeNumber.java @@ -48,9 +48,6 @@ public class TypeNumber { return super.equals(obj); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return fileno * 10 + typeno; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java index 0a58348f5c6..b3aacd773cd 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java @@ -70,9 +70,6 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { return null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCompilationUnit(java.lang.String, long) - */ @Override public void enterCompilationUnit(String name, long address) { DebugSym sym = new DebugSym(); @@ -84,9 +81,6 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { list.add(sym); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCompilationUnit(long) - */ @Override public void exitCompilationUnit(long address) { if (currentCU != null) { @@ -95,23 +89,14 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { currentCU = null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterInclude(java.lang.String) - */ @Override public void enterInclude(String name) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitInclude() - */ @Override public void exitInclude() { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterFunction(java.lang.String, int, boolean, long) - */ @Override public void enterFunction(String name, DebugType type, boolean isGlobal, long address) { DebugSym sym = new DebugSym(); @@ -125,9 +110,6 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { list.add(sym); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitFunction(long) - */ @Override public void exitFunction(long address) { if (currentFunction != null) { @@ -136,23 +118,14 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { currentFunction = null; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCodeBlock(long) - */ @Override public void enterCodeBlock(long offset) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCodeBlock(long) - */ @Override public void exitCodeBlock(long offset) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptStatement(int, long) - */ @Override public void acceptStatement(int line, long address) { DebugSym sym = new DebugSym(); @@ -172,30 +145,18 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { list.add(sym); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptIntegerConst(java.lang.String, long) - */ @Override public void acceptIntegerConst(String name, int value) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptFloatConst(java.lang.String, double) - */ @Override public void acceptFloatConst(String name, double value) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeConst(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, int) - */ @Override public void acceptTypeConst(String name, DebugType type, int value) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptParameter(java.lang.String, int, int, long) - */ @Override public void acceptParameter(String name, DebugType type, DebugParameterKind kind, long offset) { DebugSym sym = new DebugSym(); @@ -208,9 +169,6 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { list.add(sym); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptVariable(java.lang.String, int, int, long) - */ @Override public void acceptVariable(String name, DebugType type, DebugVariableKind kind, long address) { DebugSym sym = new DebugSym(); @@ -223,16 +181,10 @@ public class DebugSymsRequestor implements IDebugEntryRequestor { list.add(sym); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptCaughtException(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, long) - */ @Override public void acceptCaughtException(String name, DebugType type, long address) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeDef(java.lang.String, org.eclipse.cdt.utils.debug.DebugType) - */ @Override public void acceptTypeDef(String name, DebugType type) { } diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java index 9f180c39e58..83f98d52085 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java @@ -61,9 +61,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { fElfAttributes = elfAttributes; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getName() - */ @Override public String getName() { if (header != null) { @@ -72,9 +69,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return super.getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() - */ @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { @@ -83,9 +77,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return super.getContents(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbols() - */ @Override public ISymbol[] getSymbols() { // Call the hasChanged first, to initialize the timestamp @@ -99,9 +90,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return symbols; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getBinaryObjectInfo() - */ @Override protected BinaryObjectInfo getBinaryObjectInfo() { // Call the hasChanged first, to initialize the timestamp @@ -219,9 +207,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { @@ -239,9 +224,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return addressFactory; } - /* - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#isLittleEndian() - */ @Override public boolean isLittleEndian() { if (fElfAttributes != null) { @@ -250,9 +232,6 @@ public class ElfBinaryObject extends BinaryObjectAdapter { return super.isLittleEndian(); } - /* - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getCPU() - */ @Override public String getCPU() { if (fElfAttributes != null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java index 0bcdb51465f..a6b8c563dc1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java @@ -33,13 +33,8 @@ import org.eclipse.cdt.utils.elf.Elf.PHdr; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -/** - */ public class ElfParser extends AbstractCExtension implements IBinaryParser { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); @@ -95,25 +90,16 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser { return binary; } - /** - * @see org.eclipse.cdt.core.IBinaryParser#getFormat() - */ @Override public String getFormat() { return "ELF"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public boolean isBinary(byte[] array, IPath path) { return Elf.isElfHeader(array) || AR.isARHeader(array); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() - */ @Override public int getHintBufferSize() { return 128; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java index d0c40e2022c..7f4d4e9c12a 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java @@ -142,9 +142,6 @@ public class GNUElfBinaryObject extends ElfBinaryObject { return stream; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfBinaryObject#loadSymbols(org.eclipse.cdt.utils.elf.ElfHelper) - */ @Override protected void loadSymbols(ElfHelper helper) throws IOException { symbolLoadingAddr2line = getAddr2line(false); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java index 3c1523847e7..fc64a18ec66 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java @@ -19,55 +19,34 @@ import org.eclipse.cdt.utils.DefaultGnuToolFactory; import org.eclipse.cdt.utils.IGnuToolFactory; import org.eclipse.core.runtime.IPath; -/** - * GNUElfParser - */ public class GNUElfParser extends ElfParser { private IGnuToolFactory toolFactory; - /** - * @see org.eclipse.cdt.core.IBinaryParser#getFormat() - */ @Override public String getFormat() { return "GNU ELF"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryCore(org.eclipse.core.runtime.IPath) - */ @Override protected IBinaryObject createBinaryCore(IPath path) throws IOException { return new GNUElfBinaryObject(this, path, IBinaryFile.CORE); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryExecutable(org.eclipse.core.runtime.IPath) - */ @Override protected IBinaryExecutable createBinaryExecutable(IPath path) throws IOException { return new GNUElfBinaryExecutable(this, path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryObject(org.eclipse.core.runtime.IPath) - */ @Override protected IBinaryObject createBinaryObject(IPath path) throws IOException { return new GNUElfBinaryObject(this, path, IBinaryFile.OBJECT); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryShared(org.eclipse.core.runtime.IPath) - */ @Override protected IBinaryShared createBinaryShared(IPath path) throws IOException { return new GNUElfBinaryShared(this, path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.elf.parser.ElfParser#createBinaryArchive(org.eclipse.core.runtime.IPath) - */ @Override protected IBinaryArchive createBinaryArchive(IPath path) throws IOException { return new GNUElfBinaryArchive(this, path); diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java index 056fd1a0f00..e85425dd8b2 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUSymbol.java @@ -31,9 +31,6 @@ public class GNUSymbol extends Symbol { super(binary, name, type, addr, size); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) - */ @Override public int getLineNumber(long offset) { int line = -1; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java index 59cb96bcee0..1bf78ab259a 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java @@ -75,9 +75,6 @@ public class MachOBinaryObject extends BinaryObjectAdapter { super(parser, path, type); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getBinaryObjectInfo() - */ @Override protected BinaryObjectInfo getBinaryObjectInfo() { // we don't use this method @@ -85,9 +82,6 @@ public class MachOBinaryObject extends BinaryObjectAdapter { return new BinaryObjectInfo(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() - */ @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { @@ -108,9 +102,6 @@ public class MachOBinaryObject extends BinaryObjectAdapter { return null; } - /** - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getName() - */ @Override public String getName() { if (header != null) { @@ -119,9 +110,6 @@ public class MachOBinaryObject extends BinaryObjectAdapter { return super.getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java index e59087fae4c..342ec03a0c1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java @@ -78,9 +78,6 @@ public class MachOBinaryObject64 extends BinaryObjectAdapter { super(parser, path, type); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getBinaryObjectInfo() - */ @Override protected BinaryObjectInfo getBinaryObjectInfo() { // we don't use this method @@ -88,9 +85,6 @@ public class MachOBinaryObject64 extends BinaryObjectAdapter { return new BinaryObjectInfo(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents() - */ @Override public InputStream getContents() throws IOException { if (getPath() != null && header != null) { @@ -111,9 +105,6 @@ public class MachOBinaryObject64 extends BinaryObjectAdapter { return null; } - /** - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getName() - */ @Override public String getName() { if (header != null) { @@ -122,9 +113,6 @@ public class MachOBinaryObject64 extends BinaryObjectAdapter { return super.getName(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java index 8e39552a16d..348813add1f 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java @@ -31,9 +31,6 @@ import org.eclipse.core.runtime.Path; */ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); @@ -86,33 +83,21 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser { return binary; } - /** - * @see org.eclipse.cdt.core.IBinaryParser#getFormat() - */ @Override public String getFormat() { return "MACHO"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public boolean isBinary(byte[] array, IPath path) { return MachO64.isMachOHeader(array) || AR.isARHeader(array); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize() - */ @Override public int getHintBufferSize() { return 128; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.IGnuToolProvider#getCPPFilt() - */ public CPPFilt getCPPFilt() { IPath cppFiltPath = getCPPFiltPath(); CPPFilt cppfilt = null; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java index 53cee864579..f75fd043283 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java @@ -43,9 +43,6 @@ public class SOMBinaryArchive extends BinaryFile implements IBinaryArchive { children = new ArrayList<>(5); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() - */ @Override public IBinaryObject[] getObjects() { if (hasChanged()) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java index f83cfe673d0..646b8f5679d 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java @@ -300,9 +300,6 @@ public class SOMBinaryObject extends BinaryObjectAdapter { return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java index ec5e913c386..15726fa12a5 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java @@ -33,9 +33,6 @@ import org.eclipse.core.runtime.IPath; public class SOMParser extends AbstractCExtension implements IBinaryParser { private DefaultGnuToolFactory toolFactory; - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException { if (path == null) { @@ -83,33 +80,21 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser { return binary; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath) - */ @Override public IBinaryFile getBinary(IPath path) throws IOException { return getBinary(null, path); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getFormat() - */ @Override public String getFormat() { return "SOM"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath) - */ @Override public boolean isBinary(byte[] hints, IPath path) { return SOM.isSOMHeader(hints) || AR.isARHeader(hints); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize() - */ @Override public int getHintBufferSize() { return 512; // size of file header diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SomSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SomSymbol.java index 9db0cd5e549..aa04d490ac1 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SomSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SomSymbol.java @@ -54,9 +54,6 @@ public class SomSymbol extends Symbol { super(binary, name, type, addr, size); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getLineNumber(long) - */ @Override public int getLineNumber(long offset) { int line = -1; diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java index 38790d0050f..a425cde72cf 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java @@ -43,9 +43,6 @@ public class XCOFFBinaryArchive extends BinaryFile implements IBinaryArchive { children = new ArrayList<>(5); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects() - */ @Override public IBinaryObject[] getObjects() { if (hasChanged()) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java index 28022da9b01..da955ee9fbc 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java @@ -94,9 +94,6 @@ public class XCOFFBinaryObject extends BinaryObjectAdapter { return info; } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getName() - */ @Override public String getName() { if (header != null) { @@ -302,9 +299,6 @@ public class XCOFFBinaryObject extends BinaryObjectAdapter { return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.BinaryObjectAdapter#getAddressFactory() - */ @Override public IAddressFactory getAddressFactory() { if (addressFactory == null) { diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCoffSymbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCoffSymbol.java index a2e25985765..d1caf448b0f 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCoffSymbol.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCoffSymbol.java @@ -61,9 +61,6 @@ public class XCoffSymbol extends Symbol { super(binary, name, type, addr, size); } - /* (non-Javadoc) - * @see org.eclipse.cdt.utils.Symbol#getLineNumber(long) - */ @Override public int getLineNumber(long offset) { int line = -1; diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java index 34287001699..d85f4a2e959 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagConnectionImpl.java @@ -27,17 +27,11 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple protected String connection = null; - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection) - */ @Override public final void setDefaultDeviceConnection(String connection) { this.connection = connection; } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, java.util.Collection) - */ @Override public void doRemote(String connection, Collection commands) { String cmd = ""; //$NON-NLS-1$ @@ -52,9 +46,6 @@ public class DefaultGDBJtagConnectionImpl extends DefaultGDBJtagDeviceImpl imple } } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDeviceConnection() - */ @Override public String getDefaultDeviceConnection() { return connection; diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java index fc5b02278ed..ac5d4b38b16 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/DefaultGDBJtagDeviceImpl.java @@ -29,35 +29,23 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { */ protected static final String LINESEP = System.getProperty("line.separator"); //$NON-NLS-1$ - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doDelay(int, java.util.Collection) - */ @Override public void doDelay(int delay, Collection commands) { String cmd = "monitor delay " + String.valueOf(delay * 1000); //$NON-NLS-1$ addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doReset(java.util.Collection) - */ @Override public void doReset(Collection commands) { String cmd = "monitor reset run"; //$NON-NLS-1$ addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultDelay() - */ @Override public int getDefaultDelay() { return 0; } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doRemote(java.lang.String, int, java.util.Collection) - */ @Override public void doRemote(String ip, int port, Collection commands) { // The CLI version (target remote) does not let us know @@ -69,18 +57,12 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doHalt(java.util.Collection) - */ @Override public void doHalt(Collection commands) { String cmd = "monitor halt"; //$NON-NLS-1$ addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doContinue(java.util.Collection) - */ @Override public void doContinue(Collection commands) { // The CLI version "continue" causes GDB to block and would not be @@ -93,17 +75,11 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadImage(java.lang.String, java.lang.String, java.util.Collection) - */ @Override public void doLoadImage(String imageFileName, String imageOffset, Collection commands) { addCmd(commands, "load " + escapeScpaces(imageFileName) + ' ' + imageOffset); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doLoadSymbol(java.lang.String, java.lang.String, java.util.Collection) - */ @Override public void doLoadSymbol(String symbolFileName, String symbolOffset, Collection commands) { String file = escapeScpaces(symbolFileName); @@ -121,18 +97,12 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { return file; } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doSetPC(java.lang.String, java.util.Collection) - */ @Override public void doSetPC(String pc, Collection commands) { String cmd = "set $pc=0x" + pc; //$NON-NLS-1$ addCmd(commands, cmd); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#doStopAt(java.lang.String, java.util.Collection) - */ @Override public void doStopAt(String stopAt, Collection commands) { String cmd = "-break-insert -t -f " + stopAt; //$NON-NLS-1$ @@ -146,17 +116,11 @@ public class DefaultGDBJtagDeviceImpl implements IGDBJtagDevice { commands.add(cmd + LINESEP); } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultIpAddress() - */ @Override public String getDefaultIpAddress() { return "localhost"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.IGDBJtagDevice#getDefaultPortNumber() - */ @Override public String getDefaultPortNumber() { return "10000"; //$NON-NLS-1$ diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java index b3d1a183216..f12d3e1db91 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/jtagdevice/GenericDevice.java @@ -18,23 +18,14 @@ import java.util.Collection; public class GenericDevice extends DefaultGDBJtagDeviceImpl { - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doDelay(int, java.util.Collection) - */ @Override public void doDelay(int delay, Collection commands) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doHalt(java.util.Collection) - */ @Override public void doHalt(Collection commands) { } - /* (non-Javadoc) - * @see org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.DefaultGDBJtagDeviceImpl#doReset(java.util.Collection) - */ @Override public void doReset(Collection commands) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java index f115b5356bd..967c0652186 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java @@ -77,18 +77,12 @@ public class UIPlugin extends AbstractUIPlugin { return traceHandler; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { plugin = null; @@ -97,9 +91,6 @@ public class UIPlugin extends AbstractUIPlugin { super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry registry) { super.initializeImageRegistry(registry); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java index 32df2bf63fa..7b2ad0a6fa4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/controls/LocalWizardConfigurationPanel.java @@ -48,9 +48,6 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration super(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -86,9 +83,6 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration setControl(panel); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) - */ @Override public void setupData(Map data) { if (data == null) @@ -99,9 +93,6 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration setEncoding(value); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) - */ @Override public void extractData(Map data) { // set the terminal connector id for local terminal @@ -121,57 +112,36 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) - */ @Override protected void fillSettingsForHost(String host) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) - */ @Override protected void saveSettingsForHost(boolean add) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() - */ @Override public boolean isValid() { return true; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { // Save the encodings widget values doSaveEncodingsWidgetValues(settings, idPrefix); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { // Restore the encodings widget values doRestoreEncodingsWidgetValues(settings, idPrefix); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() - */ @Override protected String getHostFromSettings() { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isWithHostList() - */ @Override public boolean isWithHostList() { return false; @@ -192,8 +162,7 @@ public class LocalWizardConfigurationPanel extends AbstractExtendedConfiguration return ((org.eclipse.core.resources.IResource) element); } if (element instanceof IAdaptable) { - return (org.eclipse.core.resources.IResource) ((IAdaptable) element) - .getAdapter(org.eclipse.core.resources.IResource.class); + return ((IAdaptable) element).getAdapter(org.eclipse.core.resources.IResource.class); } } return null; diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java index c1f9291b28f..6eb25538ae3 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherDelegate.java @@ -65,25 +65,16 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { private final IMementoHandler mementoHandler = new LocalMementoHandler(); - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() - */ @Override public boolean needsUserConfiguration() { return false; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) - */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { return new LocalWizardConfigurationPanel(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); @@ -255,9 +246,6 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { return "Local"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) - */ @Override public Object getAdapter(Class adapter) { if (IMementoHandler.class.equals(adapter)) { @@ -296,9 +284,6 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { return new File(shell); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) - */ @Override public ITerminalConnector createTerminalConnector(Map properties) { Assert.isNotNull(properties); @@ -368,7 +353,7 @@ public class LocalLauncherDelegate extends AbstractLauncherDelegate { } // Set the ECLIPSE_HOME and ECLIPSE_WORKSPACE environment variables - List envpList = new ArrayList(); + List envpList = new ArrayList<>(); if (envp != null) envpList.addAll(Arrays.asList(envp)); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java index fa2a9c1d2b2..18a1c9acb70 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java @@ -33,9 +33,6 @@ import org.eclipse.ui.handlers.HandlerUtil; */ public class LocalLauncherHandler extends AbstractHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { // Get the current selection @@ -69,7 +66,7 @@ public class LocalLauncherHandler extends AbstractHandler { // Launch the local terminal if (delegate != null) { - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, delegate.getId()); properties.put(ITerminalsConnectorConstants.PROP_SELECTION, selection); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java index d334b946ae9..50d9e3e1a34 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalMementoHandler.java @@ -22,18 +22,12 @@ import org.eclipse.ui.IMemento; */ public class LocalMementoHandler implements IMementoHandler { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void saveState(IMemento memento, Map properties) { Assert.isNotNull(memento); Assert.isNotNull(properties); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void restoreState(IMemento memento, Map properties) { Assert.isNotNull(memento); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java index 68469eba7e6..c7865a0876c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java @@ -86,9 +86,6 @@ public class ProcessConnector extends AbstractStreamsConnector { return process; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl) - */ @Override public void connect(ITerminalControl control) { Assert.isNotNull(control); @@ -157,7 +154,7 @@ public class ProcessConnector extends AbstractStreamsConnector { st.quoteChar('"'); st.quoteChar('\''); - List argv = new ArrayList(); + List argv = new ArrayList<>(); int ttype = st.nextToken(); while (ttype != StreamTokenizer.TT_EOF) { argv.add(st.sval); @@ -231,17 +228,11 @@ public class ProcessConnector extends AbstractStreamsConnector { return "xterm"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() - */ @Override public boolean isLocalEcho() { return settings.isLocalEcho(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector#doDisconnect() - */ @Override public void doDisconnect() { // Stop monitoring the process @@ -274,43 +265,26 @@ public class ProcessConnector extends AbstractStreamsConnector { fControl.setState(TerminalState.CLOSED); } - // ***** Process Connector settings handling ***** - - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setDefaultSettings() - */ @Override public void setDefaultSettings() { settings.load(new NullSettingsStore()); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() - */ @Override public String getSettingsSummary() { return settings.getImage() != null ? settings.getImage() : ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) - */ @Override public void load(ISettingsStore store) { settings.load(store); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) - */ @Override public void save(ISettingsStore store) { settings.save(store); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#setTerminalSize(int, int) - */ @Override public void setTerminalSize(int newWidth, int newHeight) { if (width != newWidth || height != newHeight) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java index 493c9d50b3d..89c114365c6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessLauncherDelegate.java @@ -33,25 +33,16 @@ import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; @SuppressWarnings("restriction") public class ProcessLauncherDelegate extends AbstractLauncherDelegate { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() - */ @Override public boolean needsUserConfiguration() { return false; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) - */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); @@ -64,9 +55,6 @@ public class ProcessLauncherDelegate extends AbstractLauncherDelegate { } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) - */ @Override public ITerminalConnector createTerminalConnector(Map properties) { Assert.isNotNull(properties); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java index 58f59e88682..e32b905c6b2 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessSettingsPage.java @@ -57,9 +57,6 @@ public class ProcessSettingsPage extends AbstractSettingsPage { this.settings = settings; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); @@ -168,9 +165,6 @@ public class ProcessSettingsPage extends AbstractSettingsPage { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#saveSettings() - */ @Override public void saveSettings() { settings.setImage(processImageSelectorControl.getText()); @@ -180,9 +174,6 @@ public class ProcessSettingsPage extends AbstractSettingsPage { settings.setProcess(null); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#loadSettings() - */ @Override public void loadSettings() { processImageSelectorControl.setText(settings.getImage()); @@ -191,9 +182,6 @@ public class ProcessSettingsPage extends AbstractSettingsPage { processWorkingDirControl.setText(settings.getWorkingDir()); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#validateSettings() - */ @Override public boolean validateSettings() { // The settings are considered valid if the selected process image can be read. diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java index 6965fb78e45..64c735dd7d5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java @@ -65,27 +65,18 @@ public class UIPlugin extends AbstractUIPlugin { return traceHandler; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry registry) { super.initializeImageRegistry(registry); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java index a3fc1a3afaa..b85e25876b3 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java @@ -65,27 +65,18 @@ public class UIPlugin extends AbstractUIPlugin { return traceHandler; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry registry) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java index 4736cf44c4d..1870da86733 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/controls/TelnetWizardConfigurationPanel.java @@ -48,9 +48,6 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio super(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -90,9 +87,6 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio setControl(panel); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setupData(java.util.Map) - */ @Override public void setupData(Map data) { if (data == null || telnetSettings == null || telnetSettingsPage == null) @@ -124,9 +118,6 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio telnetSettingsPage.loadSettings(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#extractData(java.util.Map) - */ @Override public void extractData(Map data) { if (data == null) @@ -144,9 +135,6 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio data.put(ITerminalsConnectorConstants.PROP_ENCODING, getEncoding()); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) - */ @Override protected void fillSettingsForHost(String host) { if (host != null && host.length() != 0) { @@ -177,16 +165,13 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) - */ @Override protected void saveSettingsForHost(boolean add) { String host = getHostFromSettings(); if (host != null && host.length() != 0) { Map hostSettings = hostSettingsMap.get(host); if (hostSettings == null && !add) { - hostSettings = new HashMap(); + hostSettings = new HashMap<>(); hostSettingsMap.put(host, hostSettings); } if (hostSettings != null) { @@ -203,26 +188,17 @@ public class TelnetWizardConfigurationPanel extends AbstractExtendedConfiguratio } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() - */ @Override public boolean isValid() { return isEncodingValid() && telnetSettingsPage.validateSettings(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { saveSettingsForHost(true); super.doSaveWidgetValues(settings, idPrefix); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() - */ @Override protected String getHostFromSettings() { telnetSettingsPage.saveSettings(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java index bee62f3e874..ae5d921041e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetMementoHandler.java @@ -23,9 +23,6 @@ import org.eclipse.ui.IMemento; */ public class TelnetMementoHandler implements IMementoHandler { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#saveState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void saveState(IMemento memento, Map properties) { Assert.isNotNull(memento); @@ -45,9 +42,6 @@ public class TelnetMementoHandler implements IMementoHandler { (String) properties.get(ITerminalsConnectorConstants.PROP_ENCODING)); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IMementoHandler#restoreState(org.eclipse.ui.IMemento, java.util.Map) - */ @Override public void restoreState(IMemento memento, Map properties) { Assert.isNotNull(memento); diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java index 9f96e7b28c4..6950116e1ac 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java @@ -47,18 +47,12 @@ public class TerminalPlugin extends AbstractUIPlugin { return plugin; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { plugin = null; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java index 22afb9ac7e8..d66b4bcd32c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java @@ -99,9 +99,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { fTerminal = terminal; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#clearAll() - */ + @Override public void clearAll() { synchronized (fTerminal) { // clear the history @@ -115,9 +113,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setDimensions(int, int) - */ + @Override public void setDimensions(int lines, int cols) { synchronized (fTerminal) { if (lines == fLines && cols == fColumns) @@ -158,9 +154,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#insertCharacters(int) - */ + @Override public void insertCharacters(int charactersToInsert) { synchronized (fTerminal) { int line = toAbsoluteLine(fCursorLine); @@ -177,9 +171,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseToEndOfScreen() - */ + @Override public void eraseToEndOfScreen() { synchronized (fTerminal) { eraseLineToEnd(); @@ -190,9 +182,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseToCursor() - */ + @Override public void eraseToCursor() { synchronized (fTerminal) { for (int line = toAbsoluteLine(0); line < toAbsoluteLine(fCursorLine); line++) { @@ -202,9 +192,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseAll() - */ + @Override public void eraseAll() { synchronized (fTerminal) { for (int line = toAbsoluteLine(0); line < toAbsoluteLine(fLines); line++) { @@ -213,18 +201,14 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseLine() - */ + @Override public void eraseLine() { synchronized (fTerminal) { fTerminal.cleanLine(toAbsoluteLine(fCursorLine)); } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseLineToEnd() - */ + @Override public void eraseLineToEnd() { synchronized (fTerminal) { int line = toAbsoluteLine(fCursorLine); @@ -234,9 +218,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#eraseLineToCursor() - */ + @Override public void eraseLineToCursor() { synchronized (fTerminal) { int line = toAbsoluteLine(fCursorLine); @@ -246,9 +228,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#insertLines(int) - */ + @Override public void insertLines(int n) { synchronized (fTerminal) { if (!isCusorInScrollingRegion()) @@ -260,9 +240,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#deleteCharacters(int) - */ + @Override public void deleteCharacters(int n) { synchronized (fTerminal) { int line = toAbsoluteLine(fCursorLine); @@ -278,9 +256,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#deleteLines(int) - */ + @Override public void deleteLines(int n) { synchronized (fTerminal) { if (!isCusorInScrollingRegion()) @@ -296,27 +272,21 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { return fScrollRegion.contains(fCursorLine); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getDefaultStyle() - */ + @Override public Style getDefaultStyle() { synchronized (fTerminal) { return fDefaultStyle; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setDefaultStyle(org.eclipse.tm.terminal.model.Style) - */ + @Override public void setDefaultStyle(Style defaultStyle) { synchronized (fTerminal) { fDefaultStyle = defaultStyle; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getStyle() - */ + @Override public Style getStyle() { synchronized (fTerminal) { if (fStyle == null) @@ -325,18 +295,14 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setStyle(org.eclipse.tm.terminal.model.Style) - */ + @Override public void setStyle(Style style) { synchronized (fTerminal) { fStyle = style; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#appendString(java.lang.String) - */ + @Override public void appendString(String buffer) { synchronized (fTerminal) { char[] chars = buffer.toCharArray(); @@ -394,36 +360,28 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#processNewline() - */ + @Override public void processNewline() { synchronized (fTerminal) { doNewline(); } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getCursorLine() - */ + @Override public int getCursorLine() { synchronized (fTerminal) { return fCursorLine; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getCursorColumn() - */ + @Override public int getCursorColumn() { synchronized (fTerminal) { return fCursorColumn; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setCursor(int, int) - */ + @Override public void setCursor(int targetLine, int targetColumn) { synchronized (fTerminal) { setCursorLine(targetLine); @@ -431,9 +389,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setCursorColumn(int) - */ + @Override public void setCursorColumn(int targetColumn) { synchronized (fTerminal) { if (targetColumn < 0) @@ -449,9 +405,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#setCursorLine(int) - */ + @Override public void setCursorLine(int targetLine) { synchronized (fTerminal) { if (targetLine < 0) @@ -466,36 +420,36 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getLines() - */ + @Override public int getLines() { synchronized (fTerminal) { return fLines; } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.emulator.IVT100EmulatorBackend#getColumns() - */ + @Override public int getColumns() { synchronized (fTerminal) { return fColumns; } } + @Override public void setVT100LineWrapping(boolean enable) { fVT100LineWrapping = enable; } + @Override public boolean isVT100LineWrapping() { return fVT100LineWrapping; } + @Override public void setInsertMode(boolean enable) { fInsertMode = enable; } + @Override public void setScrollRegion(int top, int bottom) { if (top < 0 || bottom < 0) fScrollRegion = ScrollRegion.FULL_WINDOW; @@ -503,6 +457,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { fScrollRegion = new ScrollRegion(top, bottom); } + @Override public void scrollUp(int n) { assert n > 0; synchronized (fTerminal) { @@ -512,6 +467,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend { } } + @Override public void scrollDown(int n) { assert n > 0; synchronized (fTerminal) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java index cd325c25874..cde56fdd270 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java @@ -252,9 +252,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return fConnectors; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy() - */ @Override public void copy() { copy(DND.CLIPBOARD); @@ -269,9 +266,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#paste() - */ @Override public void paste() { paste(DND.CLIPBOARD); @@ -312,9 +306,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return true; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#selectAll() - */ @Override public void selectAll() { getCtlText().selectAll(); @@ -323,9 +314,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#sendKey(char) - */ @Override public void sendKey(char character) { Event event; @@ -342,9 +330,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC fKeyHandler.keyPressed(keyEvent); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#clearTerminal() - */ @Override public void clearTerminal() { // The TerminalText object does all text manipulation. @@ -355,9 +340,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getClipboard() - */ @Override public Clipboard getClipboard() { return fClipboard; @@ -374,41 +356,26 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return txt; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setFocus() - */ @Override public void setFocus() { getCtlText().setFocus(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isEmpty() - */ @Override public boolean isEmpty() { return getCtlText().isEmpty(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isDisposed() - */ @Override public boolean isDisposed() { return getCtlText().isDisposed(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isConnected() - */ @Override public boolean isConnected() { return fState == TerminalState.CONNECTED; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#disposeTerminal() - */ @Override public void disposeTerminal() { Logger.log("entered."); //$NON-NLS-1$ @@ -445,9 +412,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return fConnector; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#disconnectTerminal() - */ @Override public void disconnectTerminal() { Logger.log("entered."); //$NON-NLS-1$ @@ -665,9 +629,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setupTerminal(org.eclipse.swt.widgets.Composite) - */ @Override public void setupTerminal(Composite parent) { Assert.isNotNull(parent); @@ -700,10 +661,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC } } - /* - * (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#updatePreferences() - */ private void updatePreferences() { int bufferLineLimit = Platform.getPreferencesService().getInt(TerminalPlugin.PLUGIN_ID, ITerminalConstants.PREF_BUFFERLINES, 0, null); @@ -718,10 +675,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC setFont(ITerminalConstants.FONT_DEFINITION); } - /* - * (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#setFont(java.lang.String) - */ @Override public void setFont(String fontName) { Font font = JFaceResources.getFont(fontName); @@ -734,9 +687,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC getTerminalText().fontChanged(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#setFont(org.eclipse.swt.graphics.Font) - */ @Override @Deprecated public void setFont(Font font) { @@ -825,9 +775,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, id); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#displayTextInTerminal(java.lang.String) - */ @Override public void displayTextInTerminal(String text) { writeToTerminal("\r\n" + text + "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -865,9 +812,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setMsg(java.lang.String) - */ @Override public void setMsg(String msg) { fMsg = msg; @@ -877,16 +821,10 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC return fMsg; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getCtlText() - */ protected TextCanvas getCtlText() { return fCtlText; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#getTerminalText() - */ public VT100Emulator getTerminalText() { return fTerminalText; } @@ -912,8 +850,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC if (getState() == TerminalState.CONNECTED) captureKeyEvents(true); - IContextService contextService = (IContextService) PlatformUI.getWorkbench() - .getAdapter(IContextService.class); + IContextService contextService = PlatformUI.getWorkbench().getAdapter(IContextService.class); editContextActivation = contextService.activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$ } @@ -925,17 +862,14 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC // Restore the command context to its previous value. - IContextService contextService = (IContextService) PlatformUI.getWorkbench() - .getAdapter(IContextService.class); + IContextService contextService = PlatformUI.getWorkbench().getAdapter(IContextService.class); contextService.deactivateContext(editContextActivation); } @SuppressWarnings("cast") protected void captureKeyEvents(boolean capture) { - IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench() - .getAdapter(IBindingService.class); - IContextService contextService = (IContextService) PlatformUI.getWorkbench() - .getAdapter(IContextService.class); + IBindingService bindingService = PlatformUI.getWorkbench().getAdapter(IBindingService.class); + IContextService contextService = PlatformUI.getWorkbench().getAdapter(IContextService.class); boolean enableKeyFilter = !capture; if (bindingService.isKeyFilterEnabled() != enableKeyFilter) @@ -1247,15 +1181,13 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC */ @SuppressWarnings("cast") private void processKeyBinding(KeyEvent event, int accelerator) { - IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench() - .getAdapter(IBindingService.class); + IBindingService bindingService = PlatformUI.getWorkbench().getAdapter(IBindingService.class); KeyStroke keyStroke = SWTKeySupport.convertAcceleratorToKeyStroke(accelerator); Binding binding = bindingService.getPerfectMatch(KeySequence.getInstance(keyStroke)); if (binding != null) { ParameterizedCommand cmd = binding.getParameterizedCommand(); if (cmd != null) { - IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench() - .getAdapter(IHandlerService.class); + IHandlerService handlerService = PlatformUI.getWorkbench().getAdapter(IHandlerService.class); Event cmdEvent = new Event(); cmdEvent.type = SWT.KeyDown; cmdEvent.display = event.display; @@ -1393,17 +1325,11 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC fCtlText.setInvertedColors(invert); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setConnectOnEnterIfClosed(boolean) - */ @Override public final void setConnectOnEnterIfClosed(boolean on) { connectOnEnterIfClosed = on; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#isConnectOnEnterIfClosed() - */ @Override public final boolean isConnectOnEnterIfClosed() { return connectOnEnterIfClosed; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java index a4975cfac66..c1b4638c5dc 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java @@ -145,9 +145,7 @@ public class SnapshotChanges implements ISnapshotChanges { return size; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#markLineChanged(int) - */ + @Override public void markLineChanged(int line) { if (!isInInterestWindow(line)) return; @@ -164,9 +162,7 @@ public class SnapshotChanges implements ISnapshotChanges { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#markLinesChanged(int, int) - */ + @Override public void markLinesChanged(int line, int n) { if (n <= 0 || !isInInterestWindow(line, n)) return; @@ -186,13 +182,12 @@ public class SnapshotChanges implements ISnapshotChanges { markLineChanged(line + n - 1); } + @Override public void markCursorChanged() { fCursorHasChanged = true; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#convertScrollingIntoChanges() - */ + @Override public void convertScrollingIntoChanges() { markLinesChanged(fScrollWindowStartLine, fScrollWindowSize); fScrollWindowStartLine = 0; @@ -200,9 +195,7 @@ public class SnapshotChanges implements ISnapshotChanges { fScrollWindowShift = 0; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#hasChanged() - */ + @Override public boolean hasChanged() { if (fFirstChangedLine != Integer.MAX_VALUE || fLastChangedLine > 0 || fScrollWindowShift != 0 || fDimensionsChanged || fCursorHasChanged) @@ -210,25 +203,27 @@ public class SnapshotChanges implements ISnapshotChanges { return false; } + @Override public void markDimensionsChanged() { fDimensionsChanged = true; } + @Override public boolean hasDimensionsChanged() { return fDimensionsChanged; } + @Override public boolean hasTerminalChanged() { return fTerminalHasChanged; } + @Override public void setTerminalChanged() { fTerminalHasChanged = true; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#scroll(int, int, int) - */ + @Override public void scroll(int startLine, int size, int shift) { size = fitSizeToWindow(startLine, size); startLine = fitLineToWindow(startLine); @@ -311,9 +306,7 @@ public class SnapshotChanges implements ISnapshotChanges { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#setAllChanged(int) - */ + @Override public void setAllChanged(int height) { fScrollWindowStartLine = 0; fScrollWindowSize = 0; @@ -324,44 +317,32 @@ public class SnapshotChanges implements ISnapshotChanges { setChangedLinesLength(0); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#getFirstChangedLine() - */ + @Override public int getFirstChangedLine() { return fFirstChangedLine; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#getLastChangedLine() - */ + @Override public int getLastChangedLine() { return fLastChangedLine; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#getScrollWindowStartLine() - */ + @Override public int getScrollWindowStartLine() { return fScrollWindowStartLine; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#getScrollWindowSize() - */ + @Override public int getScrollWindowSize() { return fScrollWindowSize; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#getScrollWindowShift() - */ + @Override public int getScrollWindowShift() { return fScrollWindowShift; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#copyChangedLines(org.eclipse.tm.terminal.model.ITerminalTextData, org.eclipse.tm.terminal.model.ITerminalTextData) - */ + @Override public void copyChangedLines(ITerminalTextData dest, ITerminalTextData source) { int n = Math.min(fLastChangedLine + 1, source.getHeight()); for (int i = fFirstChangedLine; i < n; i++) { @@ -370,14 +351,17 @@ public class SnapshotChanges implements ISnapshotChanges { } } + @Override public int getInterestWindowSize() { return fInterestWindowSize; } + @Override public int getInterestWindowStartLine() { return fInterestWindowStartLine; } + @Override public void setInterestWindow(int startLine, int size) { int oldStartLine = fInterestWindowStartLine; int oldSize = fInterestWindowSize; @@ -412,9 +396,7 @@ public class SnapshotChanges implements ISnapshotChanges { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ISnapshotChanges#hasLineChanged(int) - */ + @Override public boolean hasLineChanged(int line) { if (line < fChangedLines.length) return fChangedLines[line]; diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java index 6dad9798f93..7d3d5a7f88e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java @@ -73,10 +73,12 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { throw new RuntimeException(); } + @Override public void detach() { fTerminal.removeSnapshot(this); } + @Override public boolean isOutOfDate() { // this is called from fTerminal, therefore we lock on fTerminal synchronized (fTerminal) { @@ -84,9 +86,7 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#snapshot() - */ + @Override public void updateSnapshot(boolean detectScrolling) { // make sure terminal does not change while we make the snapshot synchronized (fTerminal) { @@ -121,69 +121,67 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { } } + @Override public char getChar(int line, int column) { return fSnapshot.getChar(line, column); } + @Override public int getHeight() { return fSnapshot.getHeight(); } + @Override public LineSegment[] getLineSegments(int line, int column, int len) { return fSnapshot.getLineSegments(line, column, len); } + @Override public Style getStyle(int line, int column) { return fSnapshot.getStyle(line, column); } + @Override public int getWidth() { return fSnapshot.getWidth(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#getFirstChangedLine() - */ + @Override public int getFirstChangedLine() { return fCurrentChanges.getFirstChangedLine(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#getLastChangedLine() - */ + @Override public int getLastChangedLine() { return fCurrentChanges.getLastChangedLine(); } + @Override public boolean hasLineChanged(int line) { return fCurrentChanges.hasLineChanged(line); } + @Override public boolean hasDimensionsChanged() { return fCurrentChanges.hasDimensionsChanged(); } + @Override public boolean hasTerminalChanged() { return fCurrentChanges.hasTerminalChanged(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#getScrollChangeY() - */ + @Override public int getScrollWindowStartLine() { return fCurrentChanges.getScrollWindowStartLine(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#getScrollChangeN() - */ + @Override public int getScrollWindowSize() { return fCurrentChanges.getScrollWindowSize(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.model.ITerminalTextDataSnapshot#getScrollChangeShift() - */ + @Override public int getScrollWindowShift() { return fCurrentChanges.getScrollWindowShift(); } @@ -248,36 +246,43 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { } } + @Override public ITerminalTextDataSnapshot makeSnapshot() { return fSnapshot.makeSnapshot(); } + @Override synchronized public void addListener(SnapshotOutOfDateListener listener) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.addAll(Arrays.asList(fListener)); list.add(listener); fListener = list.toArray(new SnapshotOutOfDateListener[list.size()]); } + @Override synchronized public void removeListener(SnapshotOutOfDateListener listener) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.addAll(Arrays.asList(fListener)); list.remove(listener); fListener = list.toArray(new SnapshotOutOfDateListener[list.size()]); } + @Override public String toString() { return fSnapshot.toString(); } + @Override public int getInterestWindowSize() { return fInterestWindowSize; } + @Override public int getInterestWindowStartLine() { return fInterestWindowStartLine; } + @Override public void setInterestWindow(int startLine, int size) { assert startLine >= 0 || throwRuntimeException(); assert size >= 0 || throwRuntimeException(); @@ -288,26 +293,32 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { notifyListers(); } + @Override public char[] getChars(int line) { return fSnapshot.getChars(line); } + @Override public Style[] getStyles(int line) { return fSnapshot.getStyles(line); } + @Override public int getCursorColumn() { return fSnapshot.getCursorColumn(); } + @Override public int getCursorLine() { return fSnapshot.getCursorLine(); } + @Override public ITerminalTextData getTerminalTextData() { return fTerminal; } + @Override public boolean isWrappedLine(int line) { return fSnapshot.isWrappedLine(line); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java index 83a9ca0dd35..2ab5b22025a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java @@ -50,23 +50,17 @@ public class TerminalTextDataStore implements ITerminalTextData { throw new RuntimeException(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getWidth() - */ + @Override public int getWidth() { return fWidth; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getHeight() - */ + @Override public int getHeight() { return fHeight; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setDimensions(int, int) - */ + @Override public void setDimensions(int height, int width) { assert height >= 0 || throwRuntimeException(); assert width >= 0 || throwRuntimeException(); @@ -109,9 +103,7 @@ public class TerminalTextDataStore implements ITerminalTextData { return newArray; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getLineSegments(int, int, int) - */ + @Override public LineSegment[] getLineSegments(int line, int column, int len) { // get the styles and chars for this line Style[] styles = fStyle[line]; @@ -132,7 +124,7 @@ public class TerminalTextDataStore implements ITerminalTextData { // and create the line segments Style style = styles[column]; - List segments = new ArrayList(); + List segments = new ArrayList<>(); for (int i = column; i < n; i++) { if (styles[i] != style) { segments.add(new LineSegment(col, new String(chars, col, i - col), style)); @@ -146,9 +138,7 @@ public class TerminalTextDataStore implements ITerminalTextData { return segments.toArray(new LineSegment[segments.size()]); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int) - */ + @Override public char getChar(int line, int column) { assert column < fWidth || throwRuntimeException(); if (fChars[line] == null || column >= fChars[line].length) @@ -156,9 +146,7 @@ public class TerminalTextDataStore implements ITerminalTextData { return fChars[line][column]; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getStyle(int, int) - */ + @Override public Style getStyle(int line, int column) { assert column < fWidth || throwRuntimeException(); if (fStyle[line] == null || column >= fStyle[line].length) @@ -181,25 +169,19 @@ public class TerminalTextDataStore implements ITerminalTextData { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setChar(int, int, char, org.eclipse.tm.internal.terminal.text.Style) - */ + @Override public void setChar(int line, int column, char c, Style style) { ensureLineLength(line, column + 1); fChars[line][column] = c; fStyle[line][column] = style; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setChars(int, int, char[], org.eclipse.tm.internal.terminal.text.Style) - */ + @Override public void setChars(int line, int column, char[] chars, Style style) { setChars(line, column, chars, 0, chars.length, style); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setChars(int, int, char[], int, int, org.eclipse.tm.internal.terminal.text.Style) - */ + @Override public void setChars(int line, int column, char[] chars, int start, int len, Style style) { ensureLineLength(line, column + len); for (int i = 0; i < len; i++) { @@ -208,9 +190,7 @@ public class TerminalTextDataStore implements ITerminalTextData { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#scroll(int, int, int) - */ + @Override public void scroll(int startLine, int size, int shift) { assert startLine + size <= getHeight() || throwRuntimeException(); if (shift < 0) { @@ -249,6 +229,7 @@ public class TerminalTextDataStore implements ITerminalTextData { * @return a text representation of the object. * Lines are separated by '\n'. No style information is returned. */ + @Override public String toString() { StringBuffer buff = new StringBuffer(); for (int line = 0; line < getHeight(); line++) { @@ -261,10 +242,12 @@ public class TerminalTextDataStore implements ITerminalTextData { return buff.toString(); } + @Override public ITerminalTextDataSnapshot makeSnapshot() { throw new UnsupportedOperationException(); } + @Override public void addLine() { if (fMaxHeight > 0 && getHeight() < fMaxHeight) { setDimensions(getHeight() + 1, getWidth()); @@ -273,6 +256,7 @@ public class TerminalTextDataStore implements ITerminalTextData { } } + @Override public void copy(ITerminalTextData source) { fWidth = source.getWidth(); int n = source.getHeight(); @@ -288,24 +272,28 @@ public class TerminalTextDataStore implements ITerminalTextData { fCursorColumn = source.getCursorColumn(); } + @Override public void copyRange(ITerminalTextData source, int sourceStartLine, int destStartLine, int length) { for (int i = 0; i < length; i++) { copyLine(source, i + sourceStartLine, i + destStartLine); } } + @Override public void copyLine(ITerminalTextData source, int sourceLine, int destLine) { fChars[destLine] = source.getChars(sourceLine); fStyle[destLine] = source.getStyles(sourceLine); fWrappedLines.set(destLine, source.isWrappedLine(sourceLine)); } + @Override public char[] getChars(int line) { if (fChars[line] == null) return null; return fChars[line].clone(); } + @Override public Style[] getStyles(int line) { if (fStyle[line] == null) return null; @@ -318,40 +306,49 @@ public class TerminalTextDataStore implements ITerminalTextData { fWrappedLines.clear(line); } + @Override public void setMaxHeight(int height) { fMaxHeight = height; } + @Override public int getMaxHeight() { return fMaxHeight; } + @Override public void cleanLine(int line) { fChars[line] = null; fStyle[line] = null; fWrappedLines.clear(line); } + @Override public int getCursorColumn() { return fCursorColumn; } + @Override public int getCursorLine() { return fCursorLine; } + @Override public void setCursorColumn(int column) { fCursorColumn = column; } + @Override public void setCursorLine(int line) { fCursorLine = line; } + @Override public boolean isWrappedLine(int line) { return fWrappedLines.get(line); } + @Override public void setWrappedLine(int line) { fWrappedLines.set(line); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java index 89b0d8ad095..324de7a1e2b 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java @@ -36,17 +36,13 @@ public abstract class AbstractSettingsPage implements ISettingsPage, IMessagePro // Flag to control the control decorations private boolean hasDecoration = false; - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#addListener(org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage.Listener) - */ + @Override public void addListener(Listener listener) { Assert.isNotNull(listener); listeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#removeListener(org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage.Listener) - */ + @Override public void removeListener(Listener listener) { Assert.isNotNull(listener); listeners.remove(listener); @@ -67,16 +63,12 @@ public abstract class AbstractSettingsPage implements ISettingsPage, IMessagePro } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessage() - */ + @Override public final String getMessage() { return message; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType() - */ + @Override public final int getMessageType() { return messageType; } diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java index 16e6432f826..dc7d3b668ec 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/NullSettingsStore.java @@ -16,25 +16,16 @@ package org.eclipse.tm.internal.terminal.provisional.api; */ public class NullSettingsStore implements ISettingsStore { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String) - */ @Override public String get(String key) { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String, java.lang.String) - */ @Override public String get(String key, String defaultValue) { return defaultValue; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#put(java.lang.String, java.lang.String) - */ @Override public void put(String key, String value) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java index a4116fae971..954eeeb48fc 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java @@ -37,20 +37,17 @@ public class TextLineRenderer implements ILinelRenderer { fModel = model; } - /* (non-Javadoc) - * @see com.imagicus.thumbs.view.ICellRenderer#getCellWidth() - */ + @Override public int getCellWidth() { return fStyleMap.getFontWidth(); } - /* (non-Javadoc) - * @see com.imagicus.thumbs.view.ICellRenderer#getCellHeight() - */ + @Override public int getCellHeight() { return fStyleMap.getFontHeight(); } + @Override public void drawLine(ITextCanvasModel model, GC gc, int line, int x, int y, int colFirst, int colLast) { if (line < 0 || line >= getTerminalText().getHeight() || colFirst >= getTerminalText().getWidth() || colFirst - colLast == 0) { @@ -100,6 +97,7 @@ public class TextLineRenderer implements ILinelRenderer { } + @Override public Color getDefaultBackgroundColor() { // null == default style return fStyleMap.getBackgroundColor(null); @@ -166,14 +164,17 @@ public class TextLineRenderer implements ILinelRenderer { return fModel.getTerminalText(); } + @Override public void onFontChange() { fStyleMap.updateFont(); } + @Override public void updateFont(String fontName) { fStyleMap.updateFont(fontName); } + @Override public void setInvertedColors(boolean invert) { fStyleMap.setInvertedColors(invert); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java index 524737f6c10..633c0a8cb12 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalContextPropertiesProviderFactory.java @@ -40,7 +40,7 @@ public final class TerminalContextPropertiesProviderFactory { private static boolean contributionsLoaded = false; // The list of all loaded contributions - private static final List contributions = new ArrayList(); + private static final List contributions = new ArrayList<>(); // The proxy used to achieve lazy class loading and plug-in activation private static class Proxy implements IExecutableExtension { @@ -59,9 +59,6 @@ public final class TerminalContextPropertiesProviderFactory { protected Proxy() { } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) - */ @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java index 4c309299909..4184e1b9438 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/activator/CoreBundleActivator.java @@ -40,17 +40,11 @@ public class CoreBundleActivator implements BundleActivator { return "org.eclipse.tm.terminal.view.core"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext bundleContext) throws Exception { CoreBundleActivator.context = bundleContext; } - /* (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext bundleContext) throws Exception { CoreBundleActivator.context = null; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java index 2294a57d074..7e0f46ce6db 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/internal/PropertyTester.java @@ -18,9 +18,6 @@ import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactor */ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { - /* (non-Javadoc) - * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) - */ @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java index f6446b53d13..dade3502b13 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/AbstractAction.java @@ -64,17 +64,11 @@ public abstract class AbstractAction extends AbstractTerminalAction { return parent; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getParent().getActiveTerminalViewControl(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() - */ @Override public void run() { // Get the active tab item from the tab folder manager @@ -100,13 +94,12 @@ public abstract class AbstractAction extends AbstractTerminalAction { @SuppressWarnings("cast") protected void executeCommand(Object data) { // Get the command service from the workbench - ICommandService service = (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class); + ICommandService service = PlatformUI.getWorkbench().getAdapter(ICommandService.class); if (service != null && getCommandId() != null) { // Get the command final Command command = service.getCommand(getCommandId()); if (command != null && command.isDefined()) { - IHandlerService handlerSvc = (IHandlerService) PlatformUI.getWorkbench() - .getService(IHandlerService.class); + IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class); Assert.isNotNull(handlerSvc); // Construct a selection element @@ -143,9 +136,6 @@ public abstract class AbstractAction extends AbstractTerminalAction { */ protected abstract String getCommandId(); - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { // Ignore the flag given from outside. We have to decide ourself diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java index 7194e3cff1e..46e4e985fe4 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java @@ -50,21 +50,17 @@ public class NewTerminalViewAction extends AbstractTerminalAction { setEnabled(true); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() - */ @SuppressWarnings("cast") @Override public void run() { - ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); + ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class); Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.command.newview") //$NON-NLS-1$ : null; if (command != null && command.isDefined() && command.isEnabled()) { try { ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null); Assert.isNotNull(pCmd); - IHandlerService handlerSvc = (IHandlerService) PlatformUI.getWorkbench() - .getService(IHandlerService.class); + IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class); Assert.isNotNull(handlerSvc); handlerSvc.executeCommandInContext(pCmd, null, handlerSvc.getCurrentState()); } catch (Exception e) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java index d3e95225de4..622c8876a99 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/SelectEncodingAction.java @@ -46,9 +46,6 @@ public class SelectEncodingAction extends AbstractTerminalAction { (ImageDescriptor) null, (ImageDescriptor) null, true); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() - */ @Override public void run() { ITerminalViewControl target = getTarget(); @@ -67,9 +64,6 @@ public class SelectEncodingAction extends AbstractTerminalAction { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { setEnabled(aboutToShow && getTarget() != null && getTarget().getState() == TerminalState.CONNECTED); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java index 1f73877888f..25e1b3352ca 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/TabScrollLockAction.java @@ -36,9 +36,6 @@ public class TabScrollLockAction extends AbstractTerminalAction { UIPlugin.getImageDescriptor(ImageConsts.ACTION_ScrollLock_Disabled), true); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run() - */ @Override public void run() { ITerminalViewControl target = getTarget(); @@ -48,9 +45,6 @@ public class TabScrollLockAction extends AbstractTerminalAction { } } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { setEnabled(aboutToShow && getTarget() != null && getTarget().getState() == TerminalState.CONNECTED); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java index 92fafeeac5e..dd7e97b1d66 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/ToggleCommandFieldAction.java @@ -45,9 +45,6 @@ public class ToggleCommandFieldAction extends AbstractTerminalAction { setChecked(handler != null && handler.hasCommandInputField()); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IAction#run() - */ @Override public void run() { TabCommandFieldHandler handler = getCommandFieldHandler(); @@ -57,9 +54,6 @@ public class ToggleCommandFieldAction extends AbstractTerminalAction { setChecked(handler != null && handler.hasCommandInputField()); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { TabCommandFieldHandler handler = getCommandFieldHandler(); @@ -77,7 +71,7 @@ public class ToggleCommandFieldAction extends AbstractTerminalAction { protected TabCommandFieldHandler getCommandFieldHandler() { TabCommandFieldHandler handler = null; // Get the active tab item from the tab folder manager - TabFolderManager manager = (TabFolderManager) view.getAdapter(TabFolderManager.class); + TabFolderManager manager = view.getAdapter(TabFolderManager.class); if (manager != null) { // If we have the active tab item, we can get the active terminal control CTabItem activeTabItem = manager.getActiveTabItem(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java index d399630248f..059fbf0f615 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java @@ -103,9 +103,6 @@ public class UIPlugin extends AbstractUIPlugin { return traceHandler; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -133,7 +130,7 @@ public class UIPlugin extends AbstractUIPlugin { * To be safe, we determine the still opened terminals on shutdown * separately here in the preShutdown. */ - final List saveables = new ArrayList(); + final List saveables = new ArrayList<>(); // Get the tab folder CTabFolder tabFolder = (CTabFolder) ((TerminalsView) part).getAdapter(CTabFolder.class); @@ -195,9 +192,6 @@ public class UIPlugin extends AbstractUIPlugin { } } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { if (windowListener != null && PlatformUI.getWorkbench() != null) { @@ -215,9 +209,6 @@ public class UIPlugin extends AbstractUIPlugin { super.stop(context); } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) - */ @Override protected void initializeImageRegistry(ImageRegistry registry) { Bundle bundle = getBundle(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java index ea5e12c5c21..e95b8dc05ba 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java @@ -33,7 +33,7 @@ import org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel; * which should share the same UI space. */ public class ConfigurationPanelControl implements IConfigurationPanelContainer, IMessageProvider { - private final Map configurationPanels = new Hashtable(); + private final Map configurationPanels = new Hashtable<>(); private String message = null; private int messageType = IMessageProvider.NONE; @@ -62,9 +62,6 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, super(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -76,9 +73,6 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, setControl(panel); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#isValid() - */ @Override public boolean isValid() { return false; @@ -137,9 +131,6 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer#validate() - */ @Override public void validate() { } @@ -260,7 +251,7 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, return; } IConfigurationPanel configPanel = getActiveConfigurationPanel(); - Map data = new HashMap(); + Map data = new HashMap<>(); if (configPanel != null) configPanel.extractData(data); configPanel = getConfigurationPanel(key); @@ -398,17 +389,11 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessage() - */ @Override public final String getMessage() { return message; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType() - */ @Override public final int getMessageType() { return messageType; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java index 888a70d3f9a..8ac25cfc3cf 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/PropertyTester.java @@ -25,9 +25,6 @@ import org.eclipse.tm.terminal.view.ui.tabs.TabFolderManager; */ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester { - /* (non-Javadoc) - * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) - */ @SuppressWarnings("cast") @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { @@ -42,8 +39,7 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester if ("canDisconnect".equals(property) && receiver instanceof ITerminalsView) { //$NON-NLS-1$ CTabItem tabItem = null; - TabFolderManager manager = (TabFolderManager) ((ITerminalsView) receiver) - .getAdapter(TabFolderManager.class); + TabFolderManager manager = ((ITerminalsView) receiver).getAdapter(TabFolderManager.class); if (manager != null) { tabItem = manager.getActiveTabItem(); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java index d2f99e5fe70..116e1dd4dd5 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/SettingsStore.java @@ -22,11 +22,8 @@ import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; * within memory. */ public class SettingsStore implements ISettingsStore { - private final Map settings = new HashMap(); + private final Map settings = new HashMap<>(); - /** - * Constructor. - */ public SettingsStore() { } @@ -39,9 +36,6 @@ public class SettingsStore implements ISettingsStore { return settings; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String, java.lang.String) - */ @Override public final String get(String key, String defaultValue) { Assert.isNotNull(key); @@ -49,18 +43,12 @@ public class SettingsStore implements ISettingsStore { return value != null ? value : defaultValue; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#get(java.lang.String) - */ @Override public final String get(String key) { Assert.isNotNull(key); return settings.get(key) instanceof String ? (String) settings.get(key) : null; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore#put(java.lang.String, java.lang.String) - */ @Override public final void put(String key, String value) { Assert.isNotNull(key); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java index acc173f4e4e..efb9395decd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/EncodingSelectionDialog.java @@ -52,9 +52,6 @@ public class EncodingSelectionDialog extends TrayDialog { super(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupPanel(org.eclipse.swt.widgets.Composite) - */ @Override public void setupPanel(Composite parent) { Composite panel = new Composite(parent, SWT.NONE); @@ -71,39 +68,24 @@ public class EncodingSelectionDialog extends TrayDialog { setControl(panel); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#saveSettingsForHost(boolean) - */ @Override protected void saveSettingsForHost(boolean add) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#fillSettingsForHost(java.lang.String) - */ @Override protected void fillSettingsForHost(String host) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getHostFromSettings() - */ @Override protected String getHostFromSettings() { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#getEncoding() - */ @Override public String getEncoding() { return super.getEncoding(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#setEncoding(java.lang.String) - */ @Override public void setEncoding(String encoding) { super.setEncoding(encoding); @@ -122,9 +104,6 @@ public class EncodingSelectionDialog extends TrayDialog { setHelpAvailable(true); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected final Control createDialogArea(Composite parent) { if (contextHelpId != null) { @@ -199,9 +178,6 @@ public class EncodingSelectionDialog extends TrayDialog { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { // Save the selected encoding @@ -210,9 +186,6 @@ public class EncodingSelectionDialog extends TrayDialog { super.okPressed(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() - */ @Override protected void cancelPressed() { // Reset the encoding diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java index e9b8a427da7..446169e9999 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/dialogs/LaunchTerminalSettingsDialog.java @@ -67,10 +67,10 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { /* default */ SettingsPanelControl settings; // Map the label added to the combo box to the corresponding launcher delegate. - /* default */ final Map label2delegate = new HashMap(); + /* default */ final Map label2delegate = new HashMap<>(); // Map the label added to the combo box to the corresponding launcher properties for external executables. - /* default */ final Map> label2properties = new HashMap>(); + /* default */ final Map> label2properties = new HashMap<>(); // The data object containing the currently selected settings private Map data = null; @@ -86,24 +86,15 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { */ protected class SettingsPanelControl extends ConfigurationPanelControl { - /** - * Constructor. - */ public SettingsPanelControl() { setPanelIsGroup(true); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl#getGroupLabel() - */ @Override public String getGroupLabel() { return Messages.LaunchTerminalSettingsDialog_group_label; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.controls.ConfigurationPanelControl#showConfigurationPanel(java.lang.String) - */ @Override public void showConfigurationPanel(String key) { // Check if we have to create the panel first @@ -134,9 +125,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { super.showConfigurationPanel(key); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer#validate() - */ @Override public void validate() { LaunchTerminalSettingsDialog.this.validate(); @@ -187,9 +175,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { return selection; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#close() - */ @Override public boolean close() { dispose(); @@ -207,17 +192,11 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { dialogSettings = null; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#isResizable() - */ @Override protected boolean isResizable() { return true; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(Composite parent) { Control composite = super.createContents(parent); @@ -228,9 +207,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { return composite; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected final Control createDialogArea(Composite parent) { if (contextHelpId != null) { @@ -319,7 +295,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { // Get the old panel IConfigurationPanel oldPanel = settings.getActiveConfigurationPanel(); // Extract the current settings in an special properties container - Map data = new HashMap(); + Map data = new HashMap<>(); if (oldPanel != null) oldPanel.extractData(data); // Clean out settings which are never passed between the panels @@ -422,7 +398,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { * @return The list of terminal launcher delegate labels or an empty list. */ protected List getTerminals() { - List items = new ArrayList(); + List items = new ArrayList<>(); ILauncherDelegate localLauncher = null; @@ -504,7 +480,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { if (selection != null && selection.isEmpty()) selection = null; - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put(ITerminalsConnectorConstants.PROP_PROCESS_PATH, path); properties.put(ITerminalsConnectorConstants.PROP_PROCESS_ARGS, args); properties.put(ITerminalsConnectorConstants.PROP_TRANSLATE_BACKSLASHES_ON_PASTE, @@ -589,9 +565,6 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { IConfigurationPanel panel = this.settings.getActiveConfigurationPanel(); @@ -606,7 +579,7 @@ public class LaunchTerminalSettingsDialog extends TrayDialog { mb.open(); return; } - data = new HashMap(); + data = new HashMap<>(); // Store the id of the selected delegate String terminalLabel = terminals != null ? terminals.getText() : singleDelegateLabel; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java index 457a5d05d63..7be55c9c147 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/DisconnectTerminalCommandHandler.java @@ -27,9 +27,6 @@ import org.eclipse.ui.handlers.HandlerUtil; */ public class DisconnectTerminalCommandHandler extends AbstractHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @SuppressWarnings("cast") @Override public Object execute(ExecutionEvent event) throws ExecutionException { @@ -45,7 +42,7 @@ public class DisconnectTerminalCommandHandler extends AbstractHandler { if (item == null && HandlerUtil.getActivePart(event) instanceof ITerminalsView) { ITerminalsView view = (ITerminalsView) HandlerUtil.getActivePart(event); - TabFolderManager mgr = (TabFolderManager) view.getAdapter(TabFolderManager.class); + TabFolderManager mgr = view.getAdapter(TabFolderManager.class); if (mgr != null && mgr.getActiveTabItem() != null) { item = mgr.getActiveTabItem(); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java index 91930916de5..e13afc44f5c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/LaunchTerminalCommandHandler.java @@ -40,10 +40,6 @@ import org.eclipse.ui.handlers.HandlerUtil; */ public class LaunchTerminalCommandHandler extends AbstractHandler { - /* - * (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { String commandId = event.getCommand().getId(); @@ -132,7 +128,7 @@ public class LaunchTerminalCommandHandler extends AbstractHandler { } } else if (delegates.length == 1) { ILauncherDelegate delegate = delegates[0]; - Map properties = new HashMap(); + Map properties = new HashMap<>(); // Store the id of the selected delegate properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, delegate.getId()); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java index ec54a1a185a..f9230a597bd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/MaximizeViewHandler.java @@ -19,9 +19,6 @@ import org.eclipse.core.commands.ExecutionException; */ public class MaximizeViewHandler extends AbstractTriggerCommandHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { triggerCommand("org.eclipse.ui.window.maximizePart", null); //$NON-NLS-1$ diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java index 08655f1697f..d73e6a386aa 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java @@ -21,9 +21,6 @@ import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager; */ public class NewTerminalViewHandler extends AbstractTriggerCommandHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { String secondaryId = ConsoleManager.getInstance().getNextTerminalSecondaryId(IUIConstants.ID); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java index b7a1d45dc78..48658dc8e95 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/QuickAccessHandler.java @@ -19,9 +19,6 @@ import org.eclipse.core.commands.ExecutionException; */ public class QuickAccessHandler extends AbstractTriggerCommandHandler { - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { triggerCommand("org.eclipse.ui.window.quickAccess", null); //$NON-NLS-1$ diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java index 3bec3fc7450..810b2211d08 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/LauncherDelegateManager.java @@ -49,7 +49,7 @@ public class LauncherDelegateManager { private boolean initialized = false; // The map containing all loaded contributions - private final Map extensionsMap = new HashMap(); + private final Map extensionsMap = new HashMap<>(); // The extension point comparator private ExtensionPointComparator comparator = null; @@ -143,9 +143,6 @@ public class LauncherDelegateManager { return null; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { // Proxies are equal if they have encapsulate an element @@ -156,9 +153,6 @@ public class LauncherDelegateManager { return super.equals(obj); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { // The hash code of a proxy is the one from the id @@ -181,9 +175,6 @@ public class LauncherDelegateManager { /* default */ static class ExtensionPointComparator implements Comparator { private final static String OWN_PLUGINS_PATTERN = "org.eclipse.tm.terminal."; //$NON-NLS-1$ - /* (non-Javadoc) - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ @Override public int compare(IExtension o1, IExtension o2) { // We ignore any comparisation with null and @@ -252,7 +243,7 @@ public class LauncherDelegateManager { * @return The list of contributed terminal launcher delegates, or an empty array. */ public ILauncherDelegate[] getLauncherDelegates(boolean unique) { - List contributions = new ArrayList(); + List contributions = new ArrayList<>(); for (Proxy launcherDelegate : getExtensions().values()) { ILauncherDelegate instance = unique ? launcherDelegate.newInstance() : launcherDelegate.getInstance(); if (instance != null && !contributions.contains(instance)) { @@ -292,7 +283,7 @@ public class LauncherDelegateManager { */ @SuppressWarnings("cast") public ILauncherDelegate[] getApplicableLauncherDelegates(ISelection selection) { - List applicable = new ArrayList(); + List applicable = new ArrayList<>(); for (ILauncherDelegate delegate : getLauncherDelegates(false)) { Expression enablement = delegate.getEnablement(); @@ -304,8 +295,8 @@ public class LauncherDelegateManager { if (enablement != null) { if (selection != null) { // Set the default variable to selection. - IEvaluationContext currentState = ((IHandlerService) PlatformUI.getWorkbench() - .getService(IHandlerService.class)).getCurrentState(); + IEvaluationContext currentState = PlatformUI.getWorkbench().getService(IHandlerService.class) + .getCurrentState(); EvaluationContext context = new EvaluationContext(currentState, selection); // Set the "selection" variable to the selection. context.addVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME, selection); @@ -376,7 +367,7 @@ public class LauncherDelegateManager { protected IExtension[] getExtensionsSorted(IExtensionPoint point) { Assert.isNotNull(point); - List extensions = new ArrayList(Arrays.asList(point.getExtensions())); + List extensions = new ArrayList<>(Arrays.asList(point.getExtensions())); if (extensions.size() > 0) { Collections.sort(extensions, getExtensionPointComparator()); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java index 20eb1cb2d3d..827ef1cd2bd 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/AbstractWindowListener.java @@ -63,9 +63,6 @@ public abstract class AbstractWindowListener implements IWindowListener { return null; } - /* (non-Javadoc) - * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow) - */ @Override public void windowActivated(IWorkbenchWindow window) { if (!initialized && window != null) { @@ -73,16 +70,10 @@ public abstract class AbstractWindowListener implements IWindowListener { } } - /* (non-Javadoc) - * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow) - */ @Override public void windowDeactivated(IWorkbenchWindow window) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow) - */ @Override public void windowClosed(IWorkbenchWindow window) { // On close, remove the listeners from the window @@ -96,9 +87,6 @@ public abstract class AbstractWindowListener implements IWindowListener { } } - /* (non-Javadoc) - * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow) - */ @Override public void windowOpened(IWorkbenchWindow window) { if (window != null) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java index e7b45903098..ea97ae49409 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchPartListener.java @@ -27,53 +27,35 @@ import org.eclipse.ui.contexts.IContextService; public class WorkbenchPartListener implements IPartListener2 { // The context activations per workbench part reference - private final Map activations = new HashMap(); + private final Map activations = new HashMap<>(); - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partBroughtToTop(IWorkbenchPartReference partRef) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partOpened(IWorkbenchPartReference partRef) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partClosed(IWorkbenchPartReference partRef) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partVisible(IWorkbenchPartReference partRef) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partHidden(IWorkbenchPartReference partRef) { } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference) - */ @SuppressWarnings("cast") @Override public void partActivated(IWorkbenchPartReference partRef) { if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { - IContextService service = (IContextService) part.getSite().getService(IContextService.class); + IContextService service = part.getSite().getService(IContextService.class); if (service != null) { IContextActivation activation = service.activateContext(partRef.getId()); if (activation != null) { @@ -86,16 +68,13 @@ public class WorkbenchPartListener implements IPartListener2 { } } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) - */ @SuppressWarnings("cast") @Override public void partDeactivated(IWorkbenchPartReference partRef) { if ("org.eclipse.tm.terminal.view.ui.TerminalsView".equals(partRef.getId())) { //$NON-NLS-1$ IWorkbenchPart part = partRef.getPart(false); if (part != null && part.getSite() != null) { - IContextService service = (IContextService) part.getSite().getService(IContextService.class); + IContextService service = part.getSite().getService(IContextService.class); if (service != null) { IContextActivation activation = activations.remove(partRef); if (activation != null) { @@ -106,9 +85,6 @@ public class WorkbenchPartListener implements IPartListener2 { } } - /* (non-Javadoc) - * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) - */ @Override public void partInputChanged(IWorkbenchPartReference partRef) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java index d9d953ea39e..dd7bd71ac6f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/listeners/WorkbenchWindowListener.java @@ -19,9 +19,6 @@ import org.eclipse.ui.IPartListener2; */ public class WorkbenchWindowListener extends AbstractWindowListener { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.listeners.AbstractWindowListener#createPartListener() - */ @Override protected IPartListener2 createPartListener() { return new WorkbenchPartListener(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java index ef30e3a12db..4ae4b1c8d0c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/ExternalExecutablesDialog.java @@ -73,9 +73,6 @@ public class ExternalExecutablesDialog extends TrayDialog { setHelpAvailable(true); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected final Control createDialogArea(Composite parent) { if (contextHelpId != null) { @@ -334,9 +331,6 @@ public class ExternalExecutablesDialog extends TrayDialog { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.TrayDialog#createButtonBar(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createButtonBar(Composite parent) { Control control = super.createButtonBar(parent); @@ -344,9 +338,6 @@ public class ExternalExecutablesDialog extends TrayDialog { return control; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createButton(org.eclipse.swt.widgets.Composite, int, java.lang.String, boolean) - */ @Override protected Button createButton(Composite parent, int id, String label, boolean defaultButton) { if (IDialogConstants.OK_ID == id && !edit) { @@ -355,15 +346,12 @@ public class ExternalExecutablesDialog extends TrayDialog { return super.createButton(parent, id, label, defaultButton); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { if (name != null && path != null) { // Extract the executable properties if (executableData == null) - executableData = new HashMap(); + executableData = new HashMap<>(); String value = name.getText(); if (value != null && !"".equals(value.trim())) { //$NON-NLS-1$ @@ -430,7 +418,7 @@ public class ExternalExecutablesDialog extends TrayDialog { if (data == null) { executableData = null; } else { - executableData = new HashMap(data); + executableData = new HashMap<>(data); } } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java index 08db70a38dc..4bd21a70b57 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java @@ -61,21 +61,18 @@ public class ConsoleManager { // Internal perspective listener implementation static class ConsoleManagerPerspectiveListener extends PerspectiveAdapter { - private final List references = new ArrayList(); + private final List references = new ArrayList<>(); - /* (non-Javadoc) - * @see org.eclipse.ui.PerspectiveAdapter#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) - */ @Override public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) { // If the old references list is empty, just return if (references.isEmpty()) return; // Create a copy of the old view references list - List oldReferences = new ArrayList(references); + List oldReferences = new ArrayList<>(references); // Get the current list of view references - List references = new ArrayList(Arrays.asList(page.getViewReferences())); + List references = new ArrayList<>(Arrays.asList(page.getViewReferences())); for (IViewReference reference : oldReferences) { if (references.contains(reference)) continue; @@ -88,9 +85,6 @@ public class ConsoleManager { } - /* (non-Javadoc) - * @see org.eclipse.ui.PerspectiveAdapter#perspectivePreDeactivate(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor) - */ @Override public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) { references.clear(); @@ -290,7 +284,7 @@ public class ConsoleManager { public String getNextTerminalSecondaryId(String id) { Assert.isNotNull(id); - Map terminalViews = new HashMap(); + Map terminalViews = new HashMap<>(); int maxNumber = 0; for (IViewReference ref : getActiveWorkbenchPage().getViewReferences()) { @@ -449,7 +443,7 @@ public class ConsoleManager { ITerminalsView view = (ITerminalsView) part; // Get the tab folder manager associated with the view - TabFolderManager manager = (TabFolderManager) view.getAdapter(TabFolderManager.class); + TabFolderManager manager = view.getAdapter(TabFolderManager.class); if (manager == null) return null; @@ -520,7 +514,7 @@ public class ConsoleManager { return null; // Get the tab folder manager associated with the view - TabFolderManager manager = (TabFolderManager) view.getAdapter(TabFolderManager.class); + TabFolderManager manager = view.getAdapter(TabFolderManager.class); if (manager == null) return null; @@ -546,7 +540,7 @@ public class ConsoleManager { for (IViewReference ref : page.getViewReferences()) { IViewPart part = ref != null ? ref.getView(false) : null; if (part instanceof ITerminalsView) { - CTabFolder tabFolder = (CTabFolder) part.getAdapter(CTabFolder.class); + CTabFolder tabFolder = part.getAdapter(CTabFolder.class); if (tabFolder == null) continue; CTabItem[] candidates = tabFolder.getItems(); @@ -592,7 +586,7 @@ public class ConsoleManager { IViewPart part = ref.getView(true); if (part instanceof ITerminalsView) { // Get the tab folder manager associated with the view - TabFolderManager manager = (TabFolderManager) part.getAdapter(TabFolderManager.class); + TabFolderManager manager = part.getAdapter(TabFolderManager.class); if (manager == null) { continue; } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java index 6b347314f90..60580e93617 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencesInitializer.java @@ -22,15 +22,9 @@ import org.eclipse.tm.terminal.view.ui.interfaces.IPreferenceKeys; */ public class PreferencesInitializer extends AbstractPreferenceInitializer { - /** - * Constructor. - */ public PreferencesInitializer() { } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() - */ @Override public void initializeDefaultPreferences() { ScopedEclipsePreferences prefs = UIPlugin.getScopedPreferences(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java index 43369a4e309..054fcfdb618 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java @@ -42,7 +42,7 @@ public class TerminalService implements ITerminalService { /** * The registered terminal tab dispose listeners. */ - private final ListenerList terminalTabListeners = new ListenerList(); + private final ListenerList terminalTabListeners = new ListenerList<>(); // Flag to remember if the terminal view has been restored or not. private boolean fRestoringView; @@ -85,24 +85,15 @@ public class TerminalService implements ITerminalService { } } - /** - * Constructor - */ public TerminalService() { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#addTerminalTabListener(org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener) - */ @Override public final void addTerminalTabListener(ITerminalTabListener listener) { Assert.isNotNull(listener); terminalTabListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#removeTerminalTabListener(org.eclipse.tm.terminal.view.core.interfaces.ITerminalTabListener) - */ @Override public final void removeTerminalTabListener(ITerminalTabListener listener) { Assert.isNotNull(listener); @@ -261,9 +252,6 @@ public class TerminalService implements ITerminalService { return connector; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#openConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void openConsole(final Map properties, final Done done) { Assert.isNotNull(properties); @@ -302,7 +290,7 @@ public class TerminalService implements ITerminalService { // Determine the terminal encoding String encoding = (String) properties.get(ITerminalsConnectorConstants.PROP_ENCODING); // Create the flags to pass on to openConsole - Map flags = new HashMap(); + Map flags = new HashMap<>(); flags.put("activate", Boolean.TRUE); //$NON-NLS-1$ if (properties.get(ITerminalsConnectorConstants.PROP_FORCE_NEW) instanceof Boolean) { flags.put(ITerminalsConnectorConstants.PROP_FORCE_NEW, @@ -331,9 +319,6 @@ public class TerminalService implements ITerminalService { }, done); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#closeConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void closeConsole(final Map properties, final Done done) { Assert.isNotNull(properties); @@ -351,9 +336,6 @@ public class TerminalService implements ITerminalService { }, done); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.core.interfaces.ITerminalService#terminateConsole(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void terminateConsole(Map properties, Done done) { Assert.isNotNull(properties); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java index a51b39e7665..f687c3cb0fc 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/AbstractStreamsConnector.java @@ -158,9 +158,6 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl { return new OutputStreamMonitor(terminalControl, stderr, lineSeparator); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#doDisconnect() - */ @Override protected void doDisconnect() { // Dispose the streams @@ -180,9 +177,6 @@ public abstract class AbstractStreamsConnector extends TerminalConnectorImpl { super.doDisconnect(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getTerminalToRemoteStream() - */ @Override public OutputStream getTerminalToRemoteStream() { return stdInMonitor; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java index 7fabea68c1d..be216c0d730 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/InputStreamMonitor.java @@ -49,10 +49,10 @@ public class InputStreamMonitor extends OutputStream implements IDisposable { private volatile boolean disposed; // A list of object to dispose if this monitor is disposed - private final List disposables = new ArrayList(); + private final List disposables = new ArrayList<>(); // Queue to buffer the data to write to the output stream - private final Queue queue = new LinkedList(); + private final Queue queue = new LinkedList<>(); // ***** Line separator replacement logic ***** @@ -148,9 +148,6 @@ public class InputStreamMonitor extends OutputStream implements IDisposable { disposables.remove(disposable); } - /* (non-Javadoc) - * @see org.eclipse.ui.services.IDisposable#dispose() - */ @Override public void dispose() { // If already disposed --> return immediately @@ -274,9 +271,6 @@ public class InputStreamMonitor extends OutputStream implements IDisposable { dispose(); } - /* (non-Javadoc) - * @see java.io.OutputStream#write(int) - */ @Override public void write(int b) throws IOException { synchronized (queue) { @@ -285,9 +279,6 @@ public class InputStreamMonitor extends OutputStream implements IDisposable { } } - /* (non-Javadoc) - * @see java.io.OutputStream#write(byte[], int, int) - */ @Override public void write(byte[] b, int off, int len) throws IOException { // Write the whole block to the queue to avoid synchronization diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java index 9384315e796..58176078a33 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsConnector.java @@ -25,9 +25,6 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo // Reference to the streams settings private final StreamsSettings settings; - /** - * Constructor. - */ public StreamsConnector() { this(new StreamsSettings()); } @@ -44,9 +41,6 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo this.settings = settings; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#connect(org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl) - */ @Override public void connect(ITerminalControl control) { Assert.isNotNull(control); @@ -64,25 +58,16 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo control.setState(TerminalState.CONNECTED); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#isLocalEcho() - */ @Override public boolean isLocalEcho() { return settings.isLocalEcho(); } - /* (non-Javadoc) - * @see org.eclipse.ui.services.IDisposable#dispose() - */ @Override public void dispose() { disconnect(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.streams.AbstractStreamsConnector#doDisconnect() - */ @Override public void doDisconnect() { // Dispose the streams @@ -92,11 +77,6 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo fControl.setState(TerminalState.CLOSED); } - // ***** Process Connector settings handling ***** - - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#getSettingsSummary() - */ @Override public String getSettingsSummary() { return ""; //$NON-NLS-1$ @@ -107,17 +87,11 @@ public class StreamsConnector extends AbstractStreamsConnector implements IDispo settings.load(new NullSettingsStore()); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#load(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) - */ @Override public void load(ISettingsStore store) { settings.load(store); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl#save(org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore) - */ @Override public void save(ISettingsStore store) { settings.save(store); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java index d3e6120eb62..6e61ed4dd14 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/StreamsLauncherDelegate.java @@ -33,25 +33,16 @@ import org.eclipse.tm.terminal.view.ui.launcher.AbstractLauncherDelegate; */ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() - */ @Override public boolean needsUserConfiguration() { return false; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) - */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); @@ -64,9 +55,6 @@ public class StreamsLauncherDelegate extends AbstractLauncherDelegate { } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) - */ @Override public ITerminalConnector createTerminalConnector(Map properties) { Assert.isNotNull(properties); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java index 0a44222c8f8..47aa120877a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabCommandFieldHandler.java @@ -45,18 +45,12 @@ public class TabCommandFieldHandler implements IDisposable, IAdaptable { this.item = item; } - /* (non-Javadoc) - * @see org.eclipse.ui.services.IDisposable#dispose() - */ @Override public void dispose() { field = null; history = null; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java index cabdb9c71d7..9cd937e46ba 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabDisposeListener.java @@ -46,9 +46,6 @@ public class TabDisposeListener implements DisposeListener { return parentTabFolderManager; } - /* (non-Javadoc) - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ @Override public void widgetDisposed(DisposeEvent e) { // If a tab item gets disposed, we have to dispose the terminal as well diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java index 8e74303a6f1..eb27127d3ba 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderManager.java @@ -70,12 +70,12 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid /** * List of selection changed listeners. */ - private final List selectionChangedListeners = new ArrayList(); + private final List selectionChangedListeners = new ArrayList<>(); /** * Map of tab command input field handler per tab item */ - private final Map commandFieldHandler = new HashMap(); + private final Map commandFieldHandler = new HashMap<>(); /** * The terminal control selection listener implementation. @@ -107,9 +107,6 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid return terminal; } - /* (non-Javadoc) - * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent) - */ @Override public void widgetDisposed(DisposeEvent e) { // Widget got disposed, check if it is ours @@ -121,9 +118,6 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid } } - /* (non-Javadoc) - * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseDown(MouseEvent e) { // Left button down -> select mode starts @@ -131,9 +125,6 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid selectMode = true; } - /* (non-Javadoc) - * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseUp(MouseEvent e) { if (e.button == 1 && selectMode) { @@ -153,9 +144,6 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid } } - /* (non-Javadoc) - * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent) - */ @Override public void mouseDoubleClick(MouseEvent e) { } @@ -204,7 +192,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid */ @SuppressWarnings("cast") protected final CTabFolder getTabFolder() { - return (CTabFolder) getParentView().getAdapter(CTabFolder.class); + return getParentView().getAdapter(CTabFolder.class); } /** @@ -308,8 +296,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid } // Set the context menu - TabFolderMenuHandler menuHandler = (TabFolderMenuHandler) getParentView() - .getAdapter(TabFolderMenuHandler.class); + TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class); if (menuHandler != null) { Menu menu = (Menu) menuHandler.getAdapter(Menu.class); if (menu != null) { @@ -424,8 +411,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid } // Set the context menu - TabFolderMenuHandler menuHandler = (TabFolderMenuHandler) getParentView() - .getAdapter(TabFolderMenuHandler.class); + TabFolderMenuHandler menuHandler = getParentView().getAdapter(TabFolderMenuHandler.class); if (menuHandler != null) { Menu menu = (Menu) menuHandler.getAdapter(Menu.class); if (menu != null) { @@ -499,7 +485,7 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid // Loop all existing tab items and check the titles. We have to remember // all found titles as modifying the proposal might in turn conflict again // with the title of a tab already checked. - List titles = new ArrayList(); + List titles = new ArrayList<>(); for (CTabItem item : tabFolder.getItems()) { // Get the tab item title titles.add(item.getText()); @@ -747,36 +733,24 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid handler.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (listener != null && !selectionChangedListeners.contains(listener)) selectionChangedListeners.add(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) - */ @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { if (listener != null) selectionChangedListeners.remove(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() - */ @Override public ISelection getSelection() { CTabItem activeTabItem = getActiveTabItem(); return activeTabItem != null ? new StructuredSelection(activeTabItem) : new StructuredSelection(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) - */ @Override public void setSelection(ISelection selection) { if (selection instanceof IStructuredSelection && !selection.isEmpty()) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java index 4736ed651b4..ed49acdecda 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderMenuHandler.java @@ -51,7 +51,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Reference to the tab folder context menu private Menu contextMenu; // The list of actions available within the context menu - private final List contextMenuActions = new ArrayList(); + private final List contextMenuActions = new ArrayList<>(); // The list of invalid context menu contributions "startsWith" expressions /* default */ static final String[] INVALID_CONTRIBUTIONS_STARTS_WITH = { "org.eclipse.cdt", "org.eclipse.ui.edit" //$NON-NLS-1$ //$NON-NLS-2$ @@ -62,9 +62,6 @@ public class TabFolderMenuHandler extends PlatformObject { */ protected class MenuListener implements IMenuListener2 { - /* (non-Javadoc) - * @see org.eclipse.jface.action.IMenuListener2#menuAboutToHide(org.eclipse.jface.action.IMenuManager) - */ @Override public void menuAboutToHide(IMenuManager manager) { // CQ:WIND00192293 and CQ:WIND194204 - don't update actions on menuAboutToHide @@ -72,9 +69,6 @@ public class TabFolderMenuHandler extends PlatformObject { // updateMenuItems(false); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager) - */ @Override public void menuAboutToShow(IMenuManager manager) { removeInvalidContributions(manager); @@ -133,7 +127,7 @@ public class TabFolderMenuHandler extends PlatformObject { */ @SuppressWarnings("cast") protected final CTabFolder getTabFolder() { - return (CTabFolder) getParentView().getAdapter(CTabFolder.class); + return getParentView().getAdapter(CTabFolder.class); } /** @@ -219,9 +213,6 @@ public class TabFolderMenuHandler extends PlatformObject { protected void doCreateContextMenuActions() { // Create and add the copy action add(new TerminalActionCopy() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -236,7 +227,7 @@ public class TabFolderMenuHandler extends PlatformObject { // Determine if pasting to the active tab require backslash translation boolean needsTranslation = false; - TabFolderManager manager = (TabFolderManager) getParentView().getAdapter(TabFolderManager.class); + TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class); if (manager != null) { // If we have the active tab item, we can get the active terminal control CTabItem activeTabItem = manager.getActiveTabItem(); @@ -268,9 +259,6 @@ public class TabFolderMenuHandler extends PlatformObject { super.run(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -279,17 +267,11 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the clear all action add(new TerminalActionClearAll() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { super.updateAction(aboutToShow); @@ -301,9 +283,6 @@ public class TabFolderMenuHandler extends PlatformObject { // Create and add the select all action add(new TerminalActionSelectAll() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -311,10 +290,7 @@ public class TabFolderMenuHandler extends PlatformObject { }); // Create and add the select encoding action - add(new SelectEncodingAction((TabFolderManager) getParentView().getAdapter(TabFolderManager.class)) { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ + add(new SelectEncodingAction(getParentView().getAdapter(TabFolderManager.class)) { @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -332,7 +308,7 @@ public class TabFolderMenuHandler extends PlatformObject { ITerminalViewControl terminal = null; // Get the active tab item from the tab folder manager - TabFolderManager manager = (TabFolderManager) getParentView().getAdapter(TabFolderManager.class); + TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class); if (manager != null) { // If we have the active tab item, we can get the active terminal control CTabItem activeTabItem = manager.getActiveTabItem(); @@ -382,9 +358,6 @@ public class TabFolderMenuHandler extends PlatformObject { } } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java index 6ac1b5560cd..ec893f04a60 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderSelectionListener.java @@ -40,16 +40,10 @@ public class TabFolderSelectionListener implements SelectionListener { return parentTabFolderManager; } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetDefaultSelected(SelectionEvent e) { } - /* (non-Javadoc) - * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) - */ @Override public void widgetSelected(SelectionEvent e) { parentTabFolderManager.fireSelectionChanged(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java index 11ced231239..c21ef38bbe1 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java @@ -205,9 +205,6 @@ public class TabFolderToolbarHandler extends PlatformObject { protected void doCreateToolbarActions() { // Create and add the paste action add(new TerminalActionPaste() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -216,9 +213,6 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the copy action add(new TerminalActionCopy() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -227,9 +221,6 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the scroll lock action add(new TabScrollLockAction() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -238,17 +229,11 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the clear all action add(new TerminalActionClearAll() { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste#updateAction(boolean) - */ @Override public void updateAction(boolean aboutToShow) { super.updateAction(aboutToShow); @@ -260,9 +245,6 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the toggle command input field action add(new ToggleCommandFieldAction(getParentView()) { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -271,9 +253,6 @@ public class TabFolderToolbarHandler extends PlatformObject { // Create and add the new terminal view action add(new NewTerminalViewAction(getParentView()) { - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget() - */ @Override protected ITerminalViewControl getTarget() { return getActiveTerminalViewControl(); @@ -340,9 +319,6 @@ public class TabFolderToolbarHandler extends PlatformObject { } } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java index 688602ffb93..eb93efc1f1f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabTerminalListener.java @@ -75,9 +75,6 @@ public class TabTerminalListener implements ITerminalListener2 { return tabItem; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.ITerminalListener#setState(org.eclipse.tm.internal.terminal.provisional.api.TerminalState) - */ @Override public void setState(final TerminalState state) { // The tab item must have been not yet disposed @@ -148,9 +145,6 @@ public class TabTerminalListener implements ITerminalListener2 { return newTitle != null && !newTitle.equals(oldTitle) ? newTitle : null; } - /* (non-Javadoc) - * @see org.eclipse.tm.internal.terminal.control.ITerminalListener#setTerminalTitle(java.lang.String) - */ @Override public void setTerminalTitle(String title) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java index f39c74357e1..9e936ebdd6c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/OldTerminalsViewHandler.java @@ -39,9 +39,6 @@ public class OldTerminalsViewHandler extends ViewPart { super(); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { replaceWithTerminalsView(); @@ -121,9 +118,6 @@ public class OldTerminalsViewHandler extends ViewPart { }); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { // should not happen, but just in case - replace on focus diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java index a72bf9b458c..6b1ef56456a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java @@ -559,18 +559,12 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa toolbarHandler.initialize(); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { if (pageBookControl != null) pageBookControl.setFocus(); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#switchToEmptyPageControl() - */ @Override public void switchToEmptyPageControl() { if (pageBookControl != null && !pageBookControl.isDisposed() && emptyPageControl != null @@ -579,9 +573,6 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView#switchToTabFolderControl() - */ @Override public void switchToTabFolderControl() { if (pageBookControl != null && !pageBookControl.isDisposed() && tabFolderControl != null @@ -590,9 +581,6 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa } } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#getAdapter(java.lang.Class) - */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Object getAdapter(Class adapter) { @@ -615,9 +603,6 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.ViewPart#saveState(org.eclipse.ui.IMemento) - */ @Override public void saveState(IMemento memento) { super.saveState(memento);