mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 270103 - [Project Explorer] Sorting is broken with Eclipse 3.5 M6

Browse source
This commit is contained in:
Anton Leherbauer 2009-03-26 16:06:23 +00:00
parent 7c51979037
commit f1060ced59
1 changed files with 48 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2558,14 +2558,12 @@
priority="normal"> priority="normal">
<triggerPoints> <triggerPoints>
<or> <or>
<adapt type="org.eclipse.core.resources.IProject">
<test
property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.core.cnature"/>
</adapt>
<instanceof value="org.eclipse.core.resources.IResource"/>
<instanceof value="org.eclipse.cdt.core.model.ICElement"/> <instanceof value="org.eclipse.cdt.core.model.ICElement"/>
<instanceof value="org.eclipse.cdt.ui.CElementGrouping"/> <instanceof value="org.eclipse.cdt.ui.CElementGrouping"/>
<and>
<instanceof value="org.eclipse.core.resources.IResource"/>
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</and>
</or> </or>
</triggerPoints> </triggerPoints>
<possibleChildren> <possibleChildren>
@ -2580,7 +2578,18 @@
suppressedExtensionId="org.eclipse.ui.navigator.resourceContent"/> suppressedExtensionId="org.eclipse.ui.navigator.resourceContent"/>
<commonSorter <commonSorter
class="org.eclipse.cdt.ui.CElementSorter" class="org.eclipse.cdt.ui.CElementSorter"
id="org.eclipse.cdt.ui.commonSorter"/> id="org.eclipse.cdt.ui.commonSorter">
<parentExpression>
<or>
<instanceof value="org.eclipse.cdt.core.model.ICElement"/>
<instanceof value="org.eclipse.cdt.ui.CElementGrouping"/>
<and>
<instanceof value="org.eclipse.core.resources.IResource"/>
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</and>
</or>
</parentExpression>
</commonSorter>
<actionProvider <actionProvider
class="org.eclipse.cdt.internal.ui.navigator.CNavigatorOpenActionProvider" class="org.eclipse.cdt.internal.ui.navigator.CNavigatorOpenActionProvider"
id="org.eclipse.cdt.ui.navigator.actions.open" id="org.eclipse.cdt.ui.navigator.actions.open"
@ -2588,11 +2597,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject"> <and>
<test <instanceof value="org.eclipse.core.resources.IProject"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</actionProvider> </actionProvider>
@ -2603,11 +2611,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject"> <and>
<test <instanceof value="org.eclipse.core.resources.IProject"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</actionProvider> </actionProvider>
@ -2616,13 +2623,9 @@
id="org.eclipse.cdt.ui.navigator.actions.search"> id="org.eclipse.cdt.ui.navigator.actions.search">
<enablement> <enablement>
<and> <and>
<instanceof <instanceof value="org.eclipse.cdt.core.model.ISourceReference" />
value="org.eclipse.cdt.core.model.ISourceReference">
</instanceof>
<not> <not>
<instanceof <instanceof value="org.eclipse.cdt.core.model.ITranslationUnit" />
value="org.eclipse.cdt.core.model.ITranslationUnit">
</instanceof>
</not> </not>
</and> </and>
</enablement> </enablement>
@ -2641,10 +2644,8 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<instanceof value="org.eclipse.core.resources.IFile" />
<instanceof value="org.eclipse.core.resources.IFolder" />
<and> <and>
<instanceof value="org.eclipse.core.resources.IProject" /> <instanceof value="org.eclipse.core.resources.IResource" />
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/> <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</and> </and>
</or> </or>
@ -2657,10 +2658,8 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<instanceof value="org.eclipse.core.resources.IFile" />
<instanceof value="org.eclipse.core.resources.IFolder" />
<and> <and>
<instanceof value="org.eclipse.core.resources.IProject" /> <instanceof value="org.eclipse.core.resources.IResource" />
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/> <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
</and> </and>
</or> </or>
@ -2688,11 +2687,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject"> <and>
<test <instanceof value="org.eclipse.core.resources.IProject"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</commonWizard> </commonWizard>
@ -2704,11 +2702,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject"> <and>
<test <instanceof value="org.eclipse.core.resources.IProject"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</commonWizard> </commonWizard>
@ -2720,11 +2717,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IContainer"> <and>
<test <instanceof value="org.eclipse.core.resources.IContainer"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</commonWizard> </commonWizard>
@ -2736,11 +2732,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IProject"> <and>
<test <instanceof value="org.eclipse.core.resources.IProject"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.ccnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</commonWizard> </commonWizard>
@ -2751,11 +2746,10 @@
<enablement> <enablement>
<or> <or>
<instanceof value="org.eclipse.cdt.core.model.ICElement" /> <instanceof value="org.eclipse.cdt.core.model.ICElement" />
<adapt type="org.eclipse.core.resources.IContainer"> <and>
<test <instanceof value="org.eclipse.core.resources.IContainer"/>
property="org.eclipse.core.resources.projectNature" <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
value="org.eclipse.cdt.core.cnature"/> </and>
</adapt>
</or> </or>
</enablement> </enablement>
</commonWizard> </commonWizard>