1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Bug 321976: Sorting of CElements.

This commit is contained in:
Markus Schorn 2010-08-13 08:47:10 +00:00
parent 992cf58f31
commit 6048a19e1c

View file

@ -9,6 +9,7 @@
* IBM Corporation - initial API and implementation * IBM Corporation - initial API and implementation
* QNX Software System * QNX Software System
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.ui; package org.eclipse.cdt.ui;
@ -78,7 +79,10 @@ public class CElementSorter extends ViewerSorter {
* @since 5.1 * @since 5.1
*/ */
protected static final int TYPES = 35; protected static final int TYPES = 35;
@Deprecated
protected static final int VARIABLEDECLARATIONS = 36; protected static final int VARIABLEDECLARATIONS = 36;
@Deprecated
protected static final int FUNCTIONDECLARATIONS = 37; protected static final int FUNCTIONDECLARATIONS = 37;
protected static final int VARIABLES = 38; protected static final int VARIABLES = 38;
protected static final int VARIABLES_RESERVED = 39; protected static final int VARIABLES_RESERVED = 39;
@ -86,6 +90,7 @@ public class CElementSorter extends ViewerSorter {
protected static final int FUNCTIONS = 41; protected static final int FUNCTIONS = 41;
protected static final int FUNCTIONS_RESERVED = 42; protected static final int FUNCTIONS_RESERVED = 42;
protected static final int FUNCTIONS_SYSTEM = 43; protected static final int FUNCTIONS_SYSTEM = 43;
@Deprecated
protected static final int METHODDECLARATIONS = 44; protected static final int METHODDECLARATIONS = 44;
protected static final int CELEMENTS = 100; protected static final int CELEMENTS = 100;
@ -186,21 +191,18 @@ public class CElementSorter extends ViewerSorter {
case ICElement.C_TEMPLATE_UNION_DECLARATION: case ICElement.C_TEMPLATE_UNION_DECLARATION:
case ICElement.C_ENUMERATION: case ICElement.C_ENUMERATION:
return TYPES; return TYPES;
case ICElement.C_FUNCTION_DECLARATION:
case ICElement.C_TEMPLATE_FUNCTION_DECLARATION:
return FUNCTIONDECLARATIONS;
case ICElement.C_METHOD_DECLARATION:
case ICElement.C_TEMPLATE_METHOD_DECLARATION:
return METHODDECLARATIONS;
case ICElement.C_VARIABLE_DECLARATION: case ICElement.C_VARIABLE_DECLARATION:
return VARIABLEDECLARATIONS;
case ICElement.C_VARIABLE: case ICElement.C_VARIABLE:
case ICElement.C_TEMPLATE_VARIABLE: case ICElement.C_TEMPLATE_VARIABLE:
case ICElement.C_FIELD: case ICElement.C_FIELD:
return VARIABLES + getNameKind(cElement.getElementName()); return VARIABLES + getNameKind(cElement.getElementName());
case ICElement.C_FUNCTION_DECLARATION:
case ICElement.C_FUNCTION: case ICElement.C_FUNCTION:
case ICElement.C_TEMPLATE_FUNCTION_DECLARATION:
case ICElement.C_TEMPLATE_FUNCTION: case ICElement.C_TEMPLATE_FUNCTION:
case ICElement.C_METHOD_DECLARATION:
case ICElement.C_METHOD: case ICElement.C_METHOD:
case ICElement.C_TEMPLATE_METHOD_DECLARATION:
case ICElement.C_TEMPLATE_METHOD: case ICElement.C_TEMPLATE_METHOD:
return FUNCTIONS + getNameKind(cElement.getElementName()); return FUNCTIONS + getNameKind(cElement.getElementName());
case ICElement.C_ARCHIVE: case ICElement.C_ARCHIVE: