| [cdt-patch] UI patch - some new icons and a fix for the displaye d test |
New icons for enumerations, enumerators, and typedefs. A small fix for CElementLableProvider.getText() Thanks, Hoda
Index: icons/full/obj16/enum_obj.gif
===================================================================
RCS file: icons/full/obj16/enum_obj.gif
diff -N icons/full/obj16/enum_obj.gif
Binary files /dev/null and enum_obj.gif differ
Index: icons/full/obj16/enumerator_obj.gif
===================================================================
RCS file: icons/full/obj16/enumerator_obj.gif
diff -N icons/full/obj16/enumerator_obj.gif
Binary files /dev/null and enumerator_obj.gif differ
Index: icons/full/obj16/typedef_obj.gif
===================================================================
RCS file: icons/full/obj16/typedef_obj.gif
diff -N icons/full/obj16/typedef_obj.gif
Binary files /dev/null and typedef_obj.gif differ
Index: src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java,v
retrieving revision 1.9
diff -u -r1.9 CElementImageProvider.java
--- src/org/eclipse/cdt/internal/ui/CElementImageProvider.java 31 Mar 2003 15:52:03 -0000 1.9
+++ src/org/eclipse/cdt/internal/ui/CElementImageProvider.java 1 Apr 2003 16:43:24 -0000
@@ -211,6 +211,15 @@
case ICElement.C_UNION:
return CPluginImages.DESC_OBJS_UNION;
+ case ICElement.C_TYPEDEF:
+ return CPluginImages.DESC_OBJS_TYPEDEF;
+
+ case ICElement.C_ENUMERATION:
+ return CPluginImages.DESC_OBJS_ENUMERATION;
+
+ case ICElement.C_ENUMERATOR:
+ return CPluginImages.DESC_OBJS_ENUMERATOR;
+
case ICElement.C_FIELD:
IField field = (IField)celement;
switch(field.getVisibility()){
@@ -267,6 +276,15 @@
case ICElement.C_UNION:
return CPluginImages.DESC_OBJS_UNION;
+
+ case ICElement.C_TYPEDEF:
+ return CPluginImages.DESC_OBJS_TYPEDEF;
+
+ case ICElement.C_ENUMERATION:
+ return CPluginImages.DESC_OBJS_ENUMERATION;
+
+ case ICElement.C_ENUMERATOR:
+ return CPluginImages.DESC_OBJS_ENUMERATOR;
case ICElement.C_FIELD:
return CPluginImages.DESC_OBJS_PUBLIC_FIELD;
Index: src/org/eclipse/cdt/internal/ui/CPluginImages.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java,v
retrieving revision 1.6
diff -u -r1.6 CPluginImages.java
--- src/org/eclipse/cdt/internal/ui/CPluginImages.java 31 Mar 2003 15:52:03 -0000 1.6
+++ src/org/eclipse/cdt/internal/ui/CPluginImages.java 1 Apr 2003 16:43:24 -0000
@@ -47,6 +47,9 @@
public static final String IMG_OBJS_CLASS= NAME_PREFIX + "class_obj.gif";
public static final String IMG_OBJS_STRUCT= NAME_PREFIX + "struct_obj.gif";
public static final String IMG_OBJS_UNION= NAME_PREFIX + "union_obj.gif";
+ public static final String IMG_OBJS_TYPEDEF= NAME_PREFIX + "typedef_obj.gif";
+ public static final String IMG_OBJS_ENUMERATION= NAME_PREFIX + "enum_obj.gif";
+ public static final String IMG_OBJS_ENUMERATOR= NAME_PREFIX + "enumerator_obj.gif";
public static final String IMG_OBJS_FUNCTION= NAME_PREFIX + "function_obj.gif";
public static final String IMG_OBJS_PUBLIC_METHOD= NAME_PREFIX + "method_public_obj.gif";
public static final String IMG_OBJS_PROTECTED_METHOD= NAME_PREFIX + "method_protected_obj.gif";
@@ -75,6 +78,9 @@
public static final ImageDescriptor DESC_OBJS_CLASS= createManaged(T_OBJ, IMG_OBJS_CLASS);
public static final ImageDescriptor DESC_OBJS_STRUCT= createManaged(T_OBJ, IMG_OBJS_STRUCT);
public static final ImageDescriptor DESC_OBJS_UNION= createManaged(T_OBJ, IMG_OBJS_UNION);
+ public static final ImageDescriptor DESC_OBJS_TYPEDEF= createManaged(T_OBJ, IMG_OBJS_TYPEDEF);
+ public static final ImageDescriptor DESC_OBJS_ENUMERATION= createManaged(T_OBJ, IMG_OBJS_ENUMERATION);
+ public static final ImageDescriptor DESC_OBJS_ENUMERATOR= createManaged(T_OBJ, IMG_OBJS_ENUMERATOR);
public static final ImageDescriptor DESC_OBJS_FUNCTION= createManaged(T_OBJ, IMG_OBJS_FUNCTION);
public static final ImageDescriptor DESC_OBJS_PUBLIC_METHOD= createManaged(T_OBJ, IMG_OBJS_PUBLIC_METHOD);
public static final ImageDescriptor DESC_OBJS_PROTECTED_METHOD= createManaged(T_OBJ, IMG_OBJS_PROTECTED_METHOD);
Index: src/org/eclipse/cdt/ui/CElementLabelProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java,v
retrieving revision 1.6
diff -u -r1.6 CElementLabelProvider.java
--- src/org/eclipse/cdt/ui/CElementLabelProvider.java 31 Mar 2003 20:47:28 -0000 1.6
+++ src/org/eclipse/cdt/ui/CElementLabelProvider.java 1 Apr 2003 16:43:23 -0000
@@ -60,16 +60,24 @@
String name;
switch(celem.getElementType()){
+ case ICElement.C_FIELD:
+ case ICElement.C_VARIABLE:
+ case ICElement.C_VARIABLE_DECLARATION:
+ IVariableDeclaration vDecl = (IVariableDeclaration) celem;
+ name = vDecl.getElementName();
+ name += " : ";
+ name += vDecl.getTypeName();
+ break;
case ICElement.C_FUNCTION:
case ICElement.C_FUNCTION_DECLARATION:
case ICElement.C_METHOD:
case ICElement.C_METHOD_DECLARATION:
- IFunctionDeclaration fdecl = (IFunctionDeclaration) celem;
- name = fdecl.getSignature();
+ IFunctionDeclaration fDecl = (IFunctionDeclaration) celem;
+ name = fDecl.getSignature();
break;
case ICElement.C_STRUCT:
case ICElement.C_ENUMERATION:
- if(celem.getElementName() != null){
+ if((celem.getElementName() != null) && (celem.getElementName().length() > 0)){
name = celem.getElementName();
} else {
IVariableDeclaration varDecl = (IVariableDeclaration) celem;
Attachment:
enum_obj.gif
Description: GIF image
Attachment:
typedef_obj.gif
Description: GIF image
Attachment:
enumerator_obj.gif
Description: GIF image
