From 6f839b70112ea7cfc1da3e9aa52710bc80ad263f Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sat, 17 Mar 2012 19:43:24 -0700 Subject: [PATCH] Removed uses of a deprecated method. --- .../internal/pdom/tests/FilesOnReindexTests.java | 2 +- .../ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java index 33d48658c23..c0a85089379 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/FilesOnReindexTests.java @@ -72,7 +72,7 @@ public class FilesOnReindexTests extends PDOMTestBase { void performAssertions(IFile file) throws CoreException { IIndex index = CCorePlugin.getIndexManager().getIndex(project); - assertNotNull(index.getFile(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file))); + assertTrue(index.getFiles(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file)).length != 0); IBinding[] bs = index.findBindings(Pattern.compile("C"), true, IndexFilter.ALL, new NullProgressMonitor()); assertEquals(1, bs.length); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java index c0f5047458b..c8a9ef8cec8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java @@ -43,7 +43,6 @@ import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; @@ -133,13 +132,11 @@ public class BaseUITestCase extends BaseTestCase { continue; index.acquireReadLock(); try { - IIndexFile pfile= index.getFile(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file)); - if (pfile != null && pfile.getTimestamp() >= file.getLocalTimeStamp()) { - return; - } - pfile= index.getFile(ILinkage.C_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file)); - if (pfile != null && pfile.getTimestamp() >= file.getLocalTimeStamp()) { - return; + IIndexFile[] indexFiles= index.getFiles(IndexLocationFactory.getWorkspaceIFL(file)); + for (IIndexFile indexFile : indexFiles) { + if (indexFile != null && indexFile.getTimestamp() >= file.getLocalTimeStamp()) { + return; + } } } finally { index.releaseReadLock();