From b5c36e47a5e4754a5073996f03be31e3bb9e6058 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 21 Jul 2011 18:27:37 -0700 Subject: [PATCH] Bug 351271. Code simplification suggested by Markus Schorn. --- .../core/indexer/StandaloneIndexerInputAdapter.java | 5 ----- .../cdt/internal/core/pdom/AbstractIndexerTask.java | 2 +- .../cdt/internal/core/pdom/IndexerInputAdapter.java | 7 ------- .../core/pdom/indexer/ProjectIndexerInputAdapter.java | 6 ------ 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java index 0d7612f957e..3dcc9c10df4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java @@ -74,11 +74,6 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter { return false; } - @Override - public boolean isIndexedUnconditionally(Object tu) { - return false; - } - @Override public boolean isIndexedUnconditionally(IIndexFileLocation ifl) { return false; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index 522658a6cd7..52c0ed51bdc 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -485,7 +485,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { final boolean isExcludedSource= isSourceUnit && !fIndexFilesWithoutConfiguration && !fResolver.isFileBuildConfigured(tu); if ((isSourceUnit && !isExcludedSource) || fIndexHeadersWithoutContext != UnusedHeaderStrategy.skip || - fResolver.isIndexedUnconditionally(tu)) { + fResolver.isIndexedUnconditionally(ifl)) { // Headers or sources required with a specific linkage AbstractLanguage[] langs= fResolver.getLanguages(tu, fIndexHeadersWithoutContext == UnusedHeaderStrategy.useBoth); for (AbstractLanguage lang : langs) { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/IndexerInputAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/IndexerInputAdapter.java index 3d520888515..26efb9e36b3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/IndexerInputAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/IndexerInputAdapter.java @@ -55,13 +55,6 @@ public abstract class IndexerInputAdapter extends ASTFilePathResolver { */ public abstract boolean isIndexedOnlyIfIncluded(Object tu); - /** - * Checks whether the given translation unit should be indexed unconditionally. - * @param tu An ITranslationUnit or a file location in String form. - * @return {@code true} if the translation unit should be indexed unconditionally. - */ - public abstract boolean isIndexedUnconditionally(Object tu); - /** * Checks whether the given file should be indexed unconditionally. * @param ifl The Location of the file. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerInputAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerInputAdapter.java index 37441912ecc..2c712127471 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerInputAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerInputAdapter.java @@ -242,12 +242,6 @@ public class ProjectIndexerInputAdapter extends IndexerInputAdapter { return tu instanceof PotentialTranslationUnit; } - @Override - public boolean isIndexedUnconditionally(Object tuo) { - ITranslationUnit tu= (ITranslationUnit) tuo; - return isIndexedUnconditionally(IndexLocationFactory.getIFL(tu)); - } - @Override public boolean isIndexedUnconditionally(IIndexFileLocation ifl) { return CCoreInternals.getPDOMManager().isFileIndexedUnconditionally(ifl);