mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 08:55:25 +02:00
Code Issues Wiki Activity

Made the DOM Indexer the default and put in better names for the indexers.

Browse source
This commit is contained in:
Doug Schaefer 2005-06-10 03:13:25 +00:00
parent 676745b0e6
commit 967a5b1d91
6 changed files with 41 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexer.java
View file

@ -21,6 +21,8 @@ import org.eclipse.core.runtime.IPath;
public class DOMSourceIndexer extends SourceIndexer {
public static String ID = CCorePlugin.PLUGIN_ID + ".domsourceindexer"; //$NON-NLS-1$
public DOMSourceIndexer() {
super();
}

5
core/org.eclipse.cdt.core/plugin.properties
View file

@ -69,8 +69,3 @@ cxxHeaderName=C++ Header File
asmSourceName=Assembly Source File
cdt_pathentry_var.description=CDT PathEntry Variable
CDTIndexer.originalsourceindexer=Original C/C++ Indexer
CDTIndexer.domsourceindexer=DOM AST C/C++ Indexer
CDTIndexer.ctagsindexer=CTags Indexer
CDTIndexer.nullindexer=No Indexer

44
core/org.eclipse.cdt.core/plugin.xml
View file

@ -550,16 +550,6 @@
<extension point="org.eclipse.core.runtime.preferences">
<initializer class="org.eclipse.cdt.internal.core.CCorePreferenceInitializer"/>
</extension>
<extension
name="%CDTIndexer.originalsourceindexer"
id="originalsourceindexer"
point="org.eclipse.cdt.core.CIndexer">
<cextension>
<run
class="org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer">
</run>
</cextension>
</extension>
<extension
name="%CDTIndexer.domsourceindexer"
id="domsourceindexer"
@ -570,18 +560,6 @@
</run>
</cextension>
</extension>
<!-- =================================================================================== -->
<!-- Dynamic Variables -->
<!-- =================================================================================== -->
<extension
point="org.eclipse.core.variables.dynamicVariables">
<variable
name="cdt_pathentry_var"
resolver="org.eclipse.cdt.internal.core.PathEntryVariableResolver"
description="%cdt_pathentry_var.description">
</variable>
</extension>
<extension
id="ctagsindexer"
name="%CDTIndexer.ctagsindexer"
@ -602,5 +580,27 @@
</run>
</cextension>
</extension>
<extension
name="%CDTIndexer.originalsourceindexer"
id="originalsourceindexer"
point="org.eclipse.cdt.core.CIndexer">
<cextension>
<run
class="org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer">
</run>
</cextension>
</extension>
<extension
point="org.eclipse.core.variables.dynamicVariables">
<variable
name="cdt_pathentry_var"
resolver="org.eclipse.cdt.internal.core.PathEntryVariableResolver"
description="%cdt_pathentry_var.description">
</variable>
</extension>
<!-- =================================================================================== -->
<!-- Dynamic Variables -->
<!-- =================================================================================== -->
</plugin>

6
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -318,6 +318,6 @@ indexerPrefName=Indexer
# indexer names
CDTIndexer.originalsourceindexer=Original C/C++ Indexer
CDTIndexer.domsourceindexer=DOM AST C/C++ Indexer
CDTIndexer.ctagsindexer=CTags Indexer
CDTIndexer.nullindexer=No Indexer
CDTIndexer.domsourceindexer=Full C/C++ Indexer (declarations and cross references)
CDTIndexer.ctagsindexer=CTags Indexer (declarations only)
CDTIndexer.nullindexer=No Indexer (search-based features will not work correctly)

22
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -1339,22 +1339,16 @@
</extension>
<extension
point="org.eclipse.cdt.ui.IndexerPage">
<indexerUI
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
indexerID="org.eclipse.cdt.core.originalsourceindexer"
name="%CDTIndexer.originalsourceindexer"
id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
<indexerUI
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
indexerID="org.eclipse.cdt.core.nullindexer"
name="%CDTIndexer.nullindexer"
id="org.eclipse.cdt.ui.nullindexerUI"/>
<!--TODO reverse this <indexerUI
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
indexerID="org.eclipse.cdt.core.domsourceindexer"
name="%CDTIndexer.domsourceindexer"/>
-->
<indexerUI
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
indexerID="org.eclipse.cdt.core.originalsourceindexer"
name="%CDTIndexer.originalsourceindexer"
id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
<indexerUI
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
@ -1365,6 +1359,12 @@
indexerID="org.eclipse.cdt.core.ctagsindexer"
name="%CDTIndexer.ctagsindexer"
id="org.eclipse.cdt.ui.ctagsIndexerUI"/>
<!--TODO reverse this <indexerUI
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
indexerID="org.eclipse.cdt.core.domsourceindexer"
name="%CDTIndexer.domsourceindexer"/>
-->
</extension>
<extension
point="org.eclipse.cdt.ui.completionContributors">

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
View file

@ -18,6 +18,7 @@ import java.util.List;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICDescriptor;
import org.eclipse.cdt.core.ICDescriptorOperation;
import org.eclipse.cdt.internal.core.index.domsourceindexer.DOMSourceIndexer;
import org.eclipse.cdt.internal.ui.CUIMessages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.index.AbstractIndexerPage;
@ -229,7 +230,7 @@ public class IndexerBlock extends AbstractCOptionPage {
String indexerId=prefStore.getString(CCorePlugin.PREF_INDEXER);
String preferredIndexer=null;
if (indexerId.equals("")) { //$NON-NLS-1$
preferredIndexer=getIndexerPageName("org.eclipse.cdt.core.nullindexer"); //$NON-NLS-1$
preferredIndexer=getIndexerPageName(DOMSourceIndexer.ID);
} else {
preferredIndexer=getIndexerPageName(indexerId);
}
@ -237,7 +238,7 @@ public class IndexerBlock extends AbstractCOptionPage {
String[] indexerList = indexersComboBox.getItems();
int selectedIndex = 0;
for (int i=0; i<indexerList.length; i++){
if (indexerList[i].equals(preferredIndexer)) //$NON-NLS-1$
if (indexerList[i].equals(preferredIndexer))
selectedIndex = i;
}