mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Derandomized the order of the indexers in the IndexerBlock combo.
This commit is contained in:
parent
20f943f626
commit
0ae1e54512
2 changed files with 14 additions and 11 deletions
|
@ -1339,16 +1339,6 @@
|
||||||
</extension>
|
</extension>
|
||||||
<extension
|
<extension
|
||||||
point="org.eclipse.cdt.ui.IndexerPage">
|
point="org.eclipse.cdt.ui.IndexerPage">
|
||||||
<indexerUI
|
|
||||||
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
|
|
||||||
indexerID="org.eclipse.cdt.core.nullindexer"
|
|
||||||
name="%CDTIndexer.nullindexer"
|
|
||||||
id="org.eclipse.cdt.ui.nullindexerUI"/>
|
|
||||||
<indexerUI
|
|
||||||
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
|
|
||||||
indexerID="org.eclipse.cdt.core.originalsourceindexer"
|
|
||||||
name="%CDTIndexer.originalsourceindexer"
|
|
||||||
id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
|
|
||||||
<indexerUI
|
<indexerUI
|
||||||
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
|
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
|
||||||
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
|
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
|
||||||
|
@ -1359,6 +1349,16 @@
|
||||||
indexerID="org.eclipse.cdt.core.ctagsindexer"
|
indexerID="org.eclipse.cdt.core.ctagsindexer"
|
||||||
name="%CDTIndexer.ctagsindexer"
|
name="%CDTIndexer.ctagsindexer"
|
||||||
id="org.eclipse.cdt.ui.ctagsIndexerUI"/>
|
id="org.eclipse.cdt.ui.ctagsIndexerUI"/>
|
||||||
|
<indexerUI
|
||||||
|
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
|
||||||
|
indexerID="org.eclipse.cdt.core.nullindexer"
|
||||||
|
name="%CDTIndexer.nullindexer"
|
||||||
|
id="org.eclipse.cdt.ui.nullindexerUI"/>
|
||||||
|
<indexerUI
|
||||||
|
class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
|
||||||
|
indexerID="org.eclipse.cdt.core.originalsourceindexer"
|
||||||
|
name="%CDTIndexer.originalsourceindexer"
|
||||||
|
id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
|
||||||
<!--TODO reverse this <indexerUI
|
<!--TODO reverse this <indexerUI
|
||||||
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
|
class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
|
||||||
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
|
id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
|
||||||
|
|
|
@ -69,6 +69,7 @@ public class IndexerBlock extends AbstractCOptionPage {
|
||||||
|
|
||||||
private Combo indexersComboBox;
|
private Combo indexersComboBox;
|
||||||
private HashMap indexerPageMap;
|
private HashMap indexerPageMap;
|
||||||
|
private List indexerPageList;
|
||||||
private String selectedIndexerId = null;
|
private String selectedIndexerId = null;
|
||||||
private Composite parentComposite;
|
private Composite parentComposite;
|
||||||
private ICOptionPage currentPage;
|
private ICOptionPage currentPage;
|
||||||
|
@ -252,6 +253,7 @@ public class IndexerBlock extends AbstractCOptionPage {
|
||||||
*/
|
*/
|
||||||
private void initializeIndexerPageMap() {
|
private void initializeIndexerPageMap() {
|
||||||
indexerPageMap = new HashMap(5);
|
indexerPageMap = new HashMap(5);
|
||||||
|
indexerPageList = new ArrayList(5);
|
||||||
|
|
||||||
IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CUIPlugin.getPluginId(), "IndexerPage"); //$NON-NLS-1$
|
IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CUIPlugin.getPluginId(), "IndexerPage"); //$NON-NLS-1$
|
||||||
IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
|
IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
|
||||||
|
@ -259,6 +261,7 @@ public class IndexerBlock extends AbstractCOptionPage {
|
||||||
if (infos[i].getName().equals("indexerUI")) { //$NON-NLS-1$
|
if (infos[i].getName().equals("indexerUI")) { //$NON-NLS-1$
|
||||||
String id = infos[i].getAttribute("indexerID"); //$NON-NLS-1$
|
String id = infos[i].getAttribute("indexerID"); //$NON-NLS-1$
|
||||||
indexerPageMap.put(id, new IndexerPageConfiguration(infos[i]));
|
indexerPageMap.put(id, new IndexerPageConfiguration(infos[i]));
|
||||||
|
indexerPageList.add(id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -268,7 +271,7 @@ public class IndexerBlock extends AbstractCOptionPage {
|
||||||
* Returns the contributed Indexer Pages as a list
|
* Returns the contributed Indexer Pages as a list
|
||||||
*/
|
*/
|
||||||
protected List getIndexerPageIdList() {
|
protected List getIndexerPageIdList() {
|
||||||
return new ArrayList(indexerPageMap.keySet());
|
return indexerPageList;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue