From 18260611296fd8d74696895068cf6353c4ee4e9d Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Mon, 19 Mar 2007 17:02:27 +0000 Subject: [PATCH] Use IIndexManager instead of PDOMManager wherever possible. --- .../index/tests/EnclosingNamesTest.java | 3 +-- .../tests/IndexBindingResolutionTestBase.java | 13 +++++---- .../internal/index/tests/IndexBugsTests.java | 3 +-- .../index/tests/IndexCompositeTests.java | 3 +-- .../index/tests/IndexIncludeTest.java | 11 ++++---- .../index/tests/TeamSharedIndexTest.java | 3 +-- .../CallHierarchyAcrossProjectsTest.java | 4 +-- .../callhierarchy/CallHierarchyBaseTest.java | 4 +-- .../BasicIncludeBrowserTest.java | 3 +-- .../IncludeBrowserBaseTest.java | 4 +-- .../TypeHierarchyAcrossProjectsTest.java | 4 +-- .../typehierarchy/TypeHierarchyBaseTest.java | 4 +-- .../ui/actions/PDOMUpdateProjectAction.java | 5 ++-- .../indexview/RebuildIndexActionDelegate.java | 27 +++++++++---------- 14 files changed, 36 insertions(+), 55 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EnclosingNamesTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EnclosingNamesTest.java index b3f1ab23717..e2146310d2f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EnclosingNamesTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/EnclosingNamesTest.java @@ -27,7 +27,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -48,7 +47,7 @@ public class EnclosingNamesTest extends BaseTestCase { protected void setUp() throws CoreException { fCProject= CProjectHelper.createCCProject("__encNamesTest__", "bin", IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(fCProject); + CCorePlugin.getIndexManager().reindex(fCProject); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java index a22641d144d..8dee4edca2e 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBindingResolutionTestBase.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.core.resources.IFile; @@ -200,12 +199,12 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase { testData = TestSourceReader.getContentsForTest(b, "parser", IndexBindingResolutionTestBase.this.getClass(), getName(), 2); IFile file = TestSourceReader.createFile(cproject.getProject(), new Path("header.h"), testData[0].toString()); - CCoreInternals.getPDOMManager().setIndexerId(cproject, IPDOMManager.ID_FAST_INDEXER); + CCorePlugin.getIndexManager().setIndexerId(cproject, IPDOMManager.ID_FAST_INDEXER); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); IFile cppfile= TestSourceReader.createFile(cproject.getProject(), new Path("references.c" + (cpp ? "pp" : "")), testData[1].toString()); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); - // ((PDOM)CCoreInternals.getPDOMManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter()); + // ((PDOM)CCorePlugin.getIndexManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter()); index= CCorePlugin.getIndexManager().getIndex(cproject); @@ -274,11 +273,11 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase { IndexerPreferences.set(cproject.getProject(), IndexerPreferences.KEY_INDEX_ALL_FILES, "true"); IndexerPreferences.set(cproject.getProject(), IndexerPreferences.KEY_INDEXER_ID, IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(cproject); + CCorePlugin.getIndexManager().reindex(cproject); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); // System.out.println("Online: "+getName()); - // ((PDOM)CCoreInternals.getPDOMManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter()); + // ((PDOM)CCorePlugin.getIndexManager().getPDOM(cproject)).accept(new PDOMPrettyPrinter()); index= CCorePlugin.getIndexManager().getIndex(cproject); index.acquireReadLock(); @@ -293,11 +292,11 @@ public abstract class IndexBindingResolutionTestBase extends BaseTestCase { IndexerPreferences.set(referenced.getProject(), IndexerPreferences.KEY_INDEX_ALL_FILES, "true"); IndexerPreferences.set(referenced.getProject(), IndexerPreferences.KEY_INDEXER_ID, IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(referenced); + CCorePlugin.getIndexManager().reindex(referenced); //System.out.println("Referenced: "+getName()); assertTrue(CCorePlugin.getIndexManager().joinIndexer(360000, new NullProgressMonitor())); - //((PDOM)CCoreInternals.getPDOMManager().getPDOM(referenced)).accept(new PDOMPrettyPrinter()); + //((PDOM)CCorePlugin.getIndexManager().getPDOM(referenced)).accept(new PDOMPrettyPrinter()); return referenced; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java index b32d062a16a..091bcd2ac49 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexBugsTests.java @@ -51,7 +51,6 @@ import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -76,7 +75,7 @@ public class IndexBugsTests extends BaseTestCase { protected void setUp() throws CoreException { fCProject= CProjectHelper.createCCProject("__bugsTest__", "bin", IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(fCProject); + CCorePlugin.getIndexManager().reindex(fCProject); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java index da5f0ed7fe2..43233f680d4 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java @@ -34,7 +34,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; @@ -460,7 +459,7 @@ class ProjectBuilder { desc.setReferencedProjects( (IProject[]) dependencies.toArray(new IProject[dependencies.size()]) ); result.getProject().setDescription(desc, new NullProgressMonitor()); - CCoreInternals.getPDOMManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER); + CCorePlugin.getIndexManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER); CCorePlugin.getIndexManager().joinIndexer(4000, new NullProgressMonitor()); return result; } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java index a3fe73361e9..60142d2be07 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexIncludeTest.java @@ -30,7 +30,6 @@ import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRunnable; @@ -77,7 +76,7 @@ public class IndexIncludeTest extends IndexTestBase { } public void testFastIndexer() throws Exception { - CCoreInternals.getPDOMManager().setIndexerId(fProject, IPDOMManager.ID_FAST_INDEXER); + CCorePlugin.getIndexManager().setIndexerId(fProject, IPDOMManager.ID_FAST_INDEXER); IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_ALL_FILES, "false"); waitForIndexer(); checkHeader(false); @@ -94,7 +93,7 @@ public class IndexIncludeTest extends IndexTestBase { } public void testFullIndexer() throws Exception { - CCoreInternals.getPDOMManager().setIndexerId(fProject, IPDOMManager.ID_FULL_INDEXER); + CCorePlugin.getIndexManager().setIndexerId(fProject, IPDOMManager.ID_FULL_INDEXER); IndexerPreferences.set(fProject.getProject(), IndexerPreferences.KEY_INDEX_ALL_FILES, "false"); waitForIndexer(); checkHeader(false); @@ -187,7 +186,7 @@ public class IndexIncludeTest extends IndexTestBase { String content = "// comment \n#include \"header20061107.h\"\n"; IFile file= TestSourceReader.createFile(fProject.getProject(), "intermed20061107.h", content); TestSourceReader.createFile(fProject.getProject(), "source20061107.cpp", "#include \"intermed20061107.h\"\n"); - CCoreInternals.getPDOMManager().reindex(fProject); + CCorePlugin.getIndexManager().reindex(fProject); waitForIndexer(); @@ -214,7 +213,7 @@ public class IndexIncludeTest extends IndexTestBase { try { String content = "#if 0\n#include \"inactive20070213.h\"\n#endif\n"; IFile file= TestSourceReader.createFile(fProject.getProject(), "source20070213.cpp", content); - CCoreInternals.getPDOMManager().reindex(fProject); + CCorePlugin.getIndexManager().reindex(fProject); waitForIndexer(); fIndex.acquireReadLock(); @@ -241,7 +240,7 @@ public class IndexIncludeTest extends IndexTestBase { try { String content = "#include \"unresolved20070213.h\"\n"; IFile file= TestSourceReader.createFile(fProject.getProject(), "source20070214.cpp", content); - CCoreInternals.getPDOMManager().reindex(fProject); + CCorePlugin.getIndexManager().reindex(fProject); waitForIndexer(); fIndex.acquireReadLock(); diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java index ff44f6bf023..a42e1216a8c 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/TeamSharedIndexTest.java @@ -31,7 +31,6 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IElementChangedListener; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -52,7 +51,7 @@ public class TeamSharedIndexTest extends IndexTestBase { } private Collection fProjects= new LinkedList(); - private static final IIndexManager fPDOMManager = CCoreInternals.getPDOMManager(); + private static final IIndexManager fPDOMManager = CCorePlugin.getIndexManager(); public TeamSharedIndexTest(String name) { super(name); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java index 057824561f1..81efc250f07 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyAcrossProjectsTest.java @@ -27,8 +27,6 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; -import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.editor.CEditor; @@ -48,7 +46,7 @@ public class CallHierarchyAcrossProjectsTest extends CallHierarchyBaseTest { super.setUp(); fCProject2= CProjectHelper.createCCProject("__chTest_2__", "bin", IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(fCProject2); + CCorePlugin.getIndexManager().reindex(fCProject2); fIndex= CCorePlugin.getIndexManager().getIndex(new ICProject[] {fCProject, fCProject2}); TestScannerProvider.sIncludes= new String[]{fCProject.getProject().getLocation().toOSString(), fCProject2.getProject().getLocation().toOSString()}; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java index e0ea698197a..16eb21b9a61 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/callhierarchy/CallHierarchyBaseTest.java @@ -31,8 +31,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.callhierarchy.CHViewPart; import org.eclipse.cdt.internal.ui.callhierarchy.CallHierarchyUI; import org.eclipse.cdt.internal.ui.editor.CEditor; @@ -50,7 +48,7 @@ public class CallHierarchyBaseTest extends BaseUITestCase { protected void setUp() throws Exception { super.setUp(); fCProject= CProjectHelper.createCCProject("__chTest__", "bin", IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(fCProject); + CCorePlugin.getIndexManager().reindex(fCProject); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java index 5190eb45842..83d2cd16fc8 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java @@ -23,7 +23,6 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; -import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.pdom.indexer.IndexerPreferences; @@ -76,7 +75,7 @@ public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest { ICProject op= CProjectHelper.createCCProject("__ibTest_other__", "bin", IPDOMManager.ID_FAST_INDEXER); try { IndexerPreferences.set(op.getProject(), IndexerPreferences.KEY_INDEX_ALL_FILES, "true"); - CCoreInternals.getPDOMManager().reindex(op); + CCorePlugin.getIndexManager().reindex(op); fIndex= CCorePlugin.getIndexManager().getIndex(new ICProject[] {getProject(), op}); TestScannerProvider.sIncludes= new String[]{op.getProject().getLocation().toOSString()}; diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java index 36ca9d2db7c..f713fbaf0a4 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/IncludeBrowserBaseTest.java @@ -31,8 +31,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.includebrowser.IBViewPart; public class IncludeBrowserBaseTest extends BaseUITestCase { @@ -51,7 +49,7 @@ public class IncludeBrowserBaseTest extends BaseUITestCase { fCProject= CProjectHelper.createCCProject("__ibTest__", "bin", IPDOMManager.ID_FAST_INDEXER); // clear the index - CCoreInternals.getPDOMManager().reindex(fCProject); + CCorePlugin.getIndexManager().reindex(fCProject); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java index bcfc1f30591..8a14ad3b903 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyAcrossProjectsTest.java @@ -29,8 +29,6 @@ import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.TestScannerProvider; -import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.editor.CEditor; @@ -54,7 +52,7 @@ public class TypeHierarchyAcrossProjectsTest extends TypeHierarchyBaseTest { desc.setReferencedProjects(new IProject[]{fCProject.getProject()}); fCProject2.getProject().setDescription(desc, new NullProgressMonitor()); - CCoreInternals.getPDOMManager().reindex(fCProject2); + CCorePlugin.getIndexManager().reindex(fCProject2); fIndex= CCorePlugin.getIndexManager().getIndex(new ICProject[] {fCProject, fCProject2}); TestScannerProvider.sIncludes= new String[]{fCProject.getProject().getLocation().toOSString(), fCProject2.getProject().getLocation().toOSString()}; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java index b4533129e90..c6d9b4cdb90 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/typehierarchy/TypeHierarchyBaseTest.java @@ -38,8 +38,6 @@ import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.tests.BaseUITestCase; -import org.eclipse.cdt.internal.core.CCoreInternals; - import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.typehierarchy.THViewPart; import org.eclipse.cdt.internal.ui.typehierarchy.TypeHierarchyUI; @@ -57,7 +55,7 @@ public class TypeHierarchyBaseTest extends BaseUITestCase { protected void setUp() throws Exception { super.setUp(); fCProject= CProjectHelper.createCCProject("__thTest__", "bin", IPDOMManager.ID_FAST_INDEXER); - CCoreInternals.getPDOMManager().reindex(fCProject); + CCorePlugin.getIndexManager().reindex(fCProject); fIndex= CCorePlugin.getIndexManager().getIndex(fCProject); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/PDOMUpdateProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/PDOMUpdateProjectAction.java index d52dd86bef3..caa56cce32f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/PDOMUpdateProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/PDOMUpdateProjectAction.java @@ -18,11 +18,10 @@ import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.internal.core.CCoreInternals; - public class PDOMUpdateProjectAction implements IObjectActionDelegate { private ISelection selection; @@ -47,7 +46,7 @@ public class PDOMUpdateProjectAction implements IObjectActionDelegate { ICProject project = (ICProject)objs[i]; try { - CCoreInternals.getPDOMManager().reindex(project); + CCorePlugin.getIndexManager().reindex(project); } catch (CoreException e) { CUIPlugin.getDefault().log(e); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/RebuildIndexActionDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/RebuildIndexActionDelegate.java index 8b05f6d7f98..fde0a475c60 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/RebuildIndexActionDelegate.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/RebuildIndexActionDelegate.java @@ -1,16 +1,3 @@ -package org.eclipse.cdt.internal.ui.indexview; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPart; - -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.core.CCoreInternals; - /******************************************************************************* * Copyright (c) 2006 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials @@ -21,6 +8,18 @@ import org.eclipse.cdt.internal.core.CCoreInternals; * Contributors: * QNX - Initial API and implementation *******************************************************************************/ +package org.eclipse.cdt.internal.ui.indexview; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IObjectActionDelegate; +import org.eclipse.ui.IWorkbenchPart; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.ui.CUIPlugin; /** * @author Doug Schaefer @@ -46,7 +45,7 @@ public class RebuildIndexActionDelegate implements IObjectActionDelegate { ICProject project = (ICProject)objs[i]; try { - CCoreInternals.getPDOMManager().reindex(project); + CCorePlugin.getIndexManager().reindex(project); } catch (CoreException e) { CUIPlugin.getDefault().log(e); }