diff options
author | Doug Schaefer | 2006-09-08 18:22:55 +0000 |
---|---|---|
committer | Doug Schaefer | 2006-09-08 18:22:55 +0000 |
commit | c904cb3115c8c217664b2ba3a0f03ebba60fbce3 (patch) | |
tree | 1fc2a62a4af422b9f76b49eedbdba3c02bfd6c42 /core | |
parent | a53cb32a0e9608c05fa4925f1807c3f1ab6fbdb8 (diff) | |
download | org.eclipse.cdt-c904cb3115c8c217664b2ba3a0f03ebba60fbce3.tar.gz org.eclipse.cdt-c904cb3115c8c217664b2ba3a0f03ebba60fbce3.tar.xz org.eclipse.cdt-c904cb3115c8c217664b2ba3a0f03ebba60fbce3.zip |
Bug 156429 - Set the Fast indexer as the default indexer and fixing the naming of the parsers to direct users that this indexer is recommended.
Diffstat (limited to 'core')
4 files changed, 10 insertions, 7 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java index 3476b527b6b..75c9181a5a2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java @@ -25,6 +25,7 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElementDelta; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IElementChangedListener; +import org.eclipse.cdt.internal.core.pdom.indexer.fast.PDOMFastIndexer; import org.eclipse.cdt.internal.core.pdom.indexer.nulli.PDOMNullIndexer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; @@ -154,7 +155,7 @@ public class PDOMManager implements IPDOMManager, IElementChangedListener { public String getDefaultIndexerId() { IPreferencesService prefService = Platform.getPreferencesService(); return prefService.getString(CCorePlugin.PLUGIN_ID, INDEXER_ID_KEY, - PDOMNullIndexer.ID, null); + CCorePlugin.DEFAULT_INDEXER, null); } public void setDefaultIndexerId(String indexerId) { diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index a57acb761f0..90942b399ec 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -40,6 +40,7 @@ import org.eclipse.cdt.internal.core.model.DeltaProcessor; import org.eclipse.cdt.internal.core.model.IBufferFactory; import org.eclipse.cdt.internal.core.model.Util; import org.eclipse.cdt.internal.core.pdom.PDOMManager; +import org.eclipse.cdt.internal.core.pdom.indexer.fast.PDOMFastIndexer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; @@ -82,7 +83,8 @@ public class CCorePlugin extends Plugin { public static final String INDEXER_SIMPLE_ID = "CIndexer"; //$NON-NLS-1$ public static final String INDEXER_UNIQ_ID = PLUGIN_ID + "." + INDEXER_SIMPLE_ID; //$NON-NLS-1$ - public final static String PREF_INDEXER = "indexer"; //$NON-NLS-1$ + public static final String PREF_INDEXER = "indexer"; //$NON-NLS-1$ + public static final String DEFAULT_INDEXER = PDOMFastIndexer.ID; public final static String ERROR_PARSER_SIMPLE_ID = "ErrorParser"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties index 33b0ea11ca2..d7f6539d246 100644 --- a/core/org.eclipse.cdt.ui/plugin.properties +++ b/core/org.eclipse.cdt.ui/plugin.properties @@ -325,9 +325,9 @@ completionContributors=Content Assist Completion Contributor indexerPrefName=Indexer # indexer names -CDTIndexer.domsourceindexer=Full C/C++ Indexer (slow but accurate) -CDTIndexer.nullindexer=No Indexer (search-based features will not work correctly) -CDTIndexer.fastindexer=Fast C/C++ Indexer (faster but less accurate) +CDTIndexer.domsourceindexer=Full C/C++ Indexer (complete parse) +CDTIndexer.nullindexer=No Indexer (search features will not work correctly) +CDTIndexer.fastindexer=Fast C/C++ Indexer (recommended) IndexView.name=C/C++ Index RebuildIndex.name=Rebuild Index diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index f82fc26f892..7820d23541a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -416,8 +416,8 @@ public class IndexerBlock extends AbstractCOptionPage { initialSelected = indexerID; if (selectedIndexerId == null){ - CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, PDOMNullIndexer.ID); - selectedIndexerId = PDOMNullIndexer.ID; + CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, CCorePlugin.DEFAULT_INDEXER); + selectedIndexerId = CCorePlugin.DEFAULT_INDEXER; } //Set the appropriate indexer in the combo box |