From dcdd0b1b565dc60ccce01e27cb2b49c7b0be8c4a Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Thu, 12 Oct 2006 16:17:59 +0000 Subject: [PATCH] Introduces constants for the various indexer ids. --- .../tests/suite/AllManagedBuildTests.java | 7 +++--- .../cdt/core/tests/BaseTestFramework.java | 4 ++- .../eclipse/cdt/core/dom/IPDOMManager.java | 6 ++++- .../pdom/indexer/fast/PDOMFastIndexer.java | 4 ++- .../pdom/indexer/nulli/PDOMNullIndexer.java | 3 ++- .../callhierarchy/CallHierarchyBaseTest.java | 3 ++- .../CPPSelectionTestsDOMIndexer.java | 25 +++++++++++-------- .../selection/CSelectionTestsDOMIndexer.java | 23 +++++++++-------- .../text/selection/ResolveBindingTests.java | 3 ++- .../ui/indexview/SetFastIndexerAction.java | 12 ++++----- 10 files changed, 53 insertions(+), 37 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java index 72cd5f1d282..2bb9c8a6abb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java @@ -7,6 +7,7 @@ * * Contributors: * IBM - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.tests.suite; @@ -14,7 +15,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.internal.core.pdom.indexer.nulli.PDOMNullIndexer; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.managedbuilder.core.tests.BuildDescriptionModelTests; import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests; import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests20; @@ -41,9 +42,9 @@ public class AllManagedBuildTests { } public static Test suite() { // May/2005 Turning off all indexing for now because the "original" indexer causes hangs... - CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, PDOMNullIndexer.ID); + CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, IPDOMManager.ID_NO_INDEXER); // We could enable this later... - //CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, "org.eclipse.cdt.core.domsourceindexer"); + //CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, IPDOMManager.ID_FULL_INDEXER); TestSuite suite = new TestSuite( "Test for org.eclipse.cdt.managedbuild.core.tests"); diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java index 2f417058b97..67a12889d2c 100644 --- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java +++ b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/BaseTestFramework.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ /* @@ -20,6 +21,7 @@ import java.io.InputStream; import junit.framework.TestCase; import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; import org.eclipse.cdt.core.testplugin.FileManager; @@ -72,7 +74,7 @@ abstract public class BaseTestFramework extends TestCase { } public void disableIndexing() throws CoreException { - CCorePlugin.getPDOMManager().setIndexerId(cproject, "org.eclipse.cdt.core.nullindexer"); + CCorePlugin.getPDOMManager().setIndexerId(cproject, IPDOMManager.ID_NO_INDEXER); } public BaseTestFramework() diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IPDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IPDOMManager.java index d04d30ddd54..347daa37e9e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IPDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IPDOMManager.java @@ -7,6 +7,7 @@ * * Contributors: * QNX - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.core.dom; @@ -19,7 +20,10 @@ import org.eclipse.core.runtime.CoreException; * */ public interface IPDOMManager { - + public static final String ID_NO_INDEXER= "org.eclipse.cdt.core.nullindexer"; //$NON-NLS-1$ + public static final String ID_FAST_INDEXER= "org.eclipse.cdt.core.fastIndexer"; //$NON-NLS-1$ + public static final String ID_FULL_INDEXER= "org.eclipse.cdt.core.domsourceindexer"; //$NON-NLS-1$ + // Getting the PDOM public IPDOM getPDOM(ICProject project) throws CoreException; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexer.java index 1995d8fd7f1..5a44eb297ea 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/fast/PDOMFastIndexer.java @@ -7,6 +7,7 @@ * * Contributors: * QNX - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.indexer.fast; @@ -14,6 +15,7 @@ package org.eclipse.cdt.internal.core.pdom.indexer.fast; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMIndexer; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.core.runtime.CoreException; @@ -25,7 +27,7 @@ import org.eclipse.core.runtime.CoreException; public class PDOMFastIndexer implements IPDOMIndexer { // Must match extension id - public static final String ID = "org.eclipse.cdt.core.fastIndexer"; + public static final String ID = IPDOMManager.ID_FAST_INDEXER; protected ICProject project; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/nulli/PDOMNullIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/nulli/PDOMNullIndexer.java index 47e1da9e7e6..769dec91088 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/nulli/PDOMNullIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/nulli/PDOMNullIndexer.java @@ -15,6 +15,7 @@ package org.eclipse.cdt.internal.core.pdom.indexer.nulli; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMIndexer; import org.eclipse.cdt.core.dom.IPDOMIndexerTask; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.internal.core.index.IWritableIndex; @@ -29,7 +30,7 @@ import org.eclipse.core.runtime.IProgressMonitor; */ public class PDOMNullIndexer implements IPDOMIndexer { - public static final String ID = "org.eclipse.cdt.core.nullindexer"; //$NON-NLS-1$ + public static final String ID = IPDOMManager.ID_NO_INDEXER; private ICProject project; 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 588ad92f2af..79ab95181f2 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 @@ -20,6 +20,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMIndexer; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.testplugin.CProjectHelper; @@ -41,7 +42,7 @@ public class CallHierarchyBaseTest extends BaseTestCase { protected void setUp() throws CoreException { fCProject= CProjectHelper.createCProject("__chTest__", "bin"); - CCorePlugin.getPDOMManager().setIndexerId(fCProject, "org.eclipse.cdt.core.fastIndexer"); + CCorePlugin.getPDOMManager().setIndexerId(fCProject, IPDOMManager.ID_FAST_INDEXER); IPDOMIndexer indexer = CCorePlugin.getPDOMManager().getIndexer(fCProject); try { indexer.reindex(); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java index 01c4d5d9fdf..3c67dde0978 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsDOMIndexer.java @@ -19,16 +19,6 @@ import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.CCProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; -import org.eclipse.cdt.make.core.MakeProjectNature; -import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; -import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -37,6 +27,19 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.cdt.core.CCProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.make.core.MakeProjectNature; +import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; +import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; + +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; + /** * Test Ctrl_F3/F3 with the DOM Indexer for a C++ project. * @@ -47,7 +50,7 @@ public class CPPSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer { IFile file; NullProgressMonitor monitor; - static final String sourceIndexerID = "org.eclipse.cdt.core.domsourceindexer"; //$NON-NLS-1$ + static final String sourceIndexerID = IPDOMManager.ID_FULL_INDEXER; //$NON-NLS-1$ public CPPSelectionTestsDOMIndexer(String name) { super(name); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java index 8a28937890d..5f83419876d 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CSelectionTestsDOMIndexer.java @@ -16,15 +16,6 @@ import java.io.File; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IASTName; -import org.eclipse.cdt.core.dom.ast.IASTNode; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.testplugin.CProjectHelper; -import org.eclipse.cdt.internal.core.dom.parser.ASTNode; -import org.eclipse.cdt.make.core.MakeProjectNature; -import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; -import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -33,6 +24,18 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.dom.IPDOMManager; +import org.eclipse.cdt.core.dom.ast.IASTName; +import org.eclipse.cdt.core.dom.ast.IASTNode; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.testplugin.CProjectHelper; +import org.eclipse.cdt.make.core.MakeProjectNature; +import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature; +import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector; + +import org.eclipse.cdt.internal.core.dom.parser.ASTNode; + /** * Test Ctrl_F3/F3 with the DOM Indexer for a C project. * @@ -43,7 +46,7 @@ public class CSelectionTestsDOMIndexer extends BaseSelectionTestsIndexer { IFile file; NullProgressMonitor monitor; - static final String sourceIndexerID = "org.eclipse.cdt.core.domsourceindexer"; //$NON-NLS-1$ + static final String sourceIndexerID = IPDOMManager.ID_FULL_INDEXER; public CSelectionTestsDOMIndexer(String name) { super(name); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java index 45357a05311..790b7c659a7 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/ResolveBindingTests.java @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMIndexer; +import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; @@ -49,7 +50,7 @@ public class ResolveBindingTests extends BaseTestCase { protected void setUp() throws Exception { super.setUp(); fCProject= CProjectHelper.createCProject("ResolveBindingTests", "bin"); - CCorePlugin.getPDOMManager().setIndexerId(fCProject, "org.eclipse.cdt.core.fastIndexer"); + CCorePlugin.getPDOMManager().setIndexerId(fCProject, IPDOMManager.ID_FAST_INDEXER); IPDOMIndexer indexer = CCorePlugin.getPDOMManager().getIndexer(fCProject); try { indexer.reindex(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java index caffc795351..3ca673b8eb7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java @@ -7,20 +7,18 @@ * * Contributors: * QNX software Systems - initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ -/** - * - */ package org.eclipse.cdt.internal.ui.indexview; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.TreeViewer; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.dom.IPDOMManager; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.internal.core.pdom.indexer.fast.PDOMFastIndexer; import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.TreeViewer; /** * Sets all selected actions to use the Fast indexer. @@ -39,7 +37,7 @@ public class SetFastIndexerAction extends IndexAction { ICProject[] projects = CoreModel.getDefault().getCModel().getCProjects(); for (int i = 0; i < projects.length; ++i) { try { - manager.setIndexerId(projects[i], PDOMFastIndexer.ID); + manager.setIndexerId(projects[i], IPDOMManager.ID_FAST_INDEXER); } catch (CoreException e) { CUIPlugin.getDefault().log(e); }