RE: [cdt-patch] C Model Update - show visibility for fields

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

RE: [cdt-patch] C Model Update - show visibility for fields

From: "Amer, Hoda" <hamer@xxxxxxxxxxxx>
Date: Mon, 31 Mar 2003 10:12:48 -0500
Delivered-to: cdt-patch@xxxxxxxxxxx
List-archive: <http://dev.eclipse.org/pipermail/cdt-patch/>
List-help: <mailto:cdt-patch-request@eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/listinfo/cdt-patch>, <mailto:cdt-patch-request@eclipse.org?subject=unsubscribe>

Title: Not Applied: [cdt-patch] C Model Update - show the static elements in outline view

Hi,

Patch has been updated.

It looks like the core patch went through. This is the UI patch only.

Thanks,

Hoda

-----Original Message-----
From: Schaefer, Doug [mailto:dschaefer@xxxxxxxxxxxx]
Sent: Friday, March 28, 2003 4:03 PM
To: 'cdt-patch@xxxxxxxxxxx'
Subject: RE: [cdt-patch] C Model Update - show visibility for fields

Hi, Hoda,

Can you do an update and resubmit this patch. Your last patch made this one break.

Thanks,

Doug Schaefer

Senior Staff Software Engineer

Rational Software - IBM Software Group

Ottawa (Kanata), Ontario, Canada

-----Original Message-----
From: Amer, Hoda [mailto:hamer@xxxxxxxxxxxx]
Sent: Friday, March 28, 2003 1:03 PM
To: 'cdt-patch@xxxxxxxxxxx'
Subject: [cdt-patch] C Model Update - show visibility for fields

This patch :

- Adds icons for fields visibility ( copy to \org.eclipse.cdt.ui\icons\full\obj16)

- Adds C Model elements for templates, enumerations, TypeDefs and Using

- Shows the const decorator for variables and fields icons ( modifies the gif file in \org.eclipse.cdt.ui\icons\full\ovr16).

- Renames icon files for method visibility.

Icons are renamed to method_public_obj.gif, method_protected_obj.gif, method_private_obj.gif

Thanks

Hoda

Index: icons/full/obj16/field_private_obj.gif
===================================================================
RCS file: icons/full/obj16/field_private_obj.gif
diff -N icons/full/obj16/field_private_obj.gif
Binary files /dev/null and field_private_obj.gif differ
Index: icons/full/obj16/field_protected_obj.gif
===================================================================
RCS file: icons/full/obj16/field_protected_obj.gif
diff -N icons/full/obj16/field_protected_obj.gif
Binary files /dev/null and field_protected_obj.gif differ
Index: icons/full/obj16/field_public_obj.gif
===================================================================
RCS file: icons/full/obj16/field_public_obj.gif
diff -N icons/full/obj16/field_public_obj.gif
Binary files /dev/null and field_public_obj.gif differ
Index: icons/full/obj16/method_private_obj.gif
===================================================================
RCS file: icons/full/obj16/method_private_obj.gif
diff -N icons/full/obj16/method_private_obj.gif
Binary files /dev/null and method_private_obj.gif differ
Index: icons/full/obj16/method_protected_obj.gif
===================================================================
RCS file: icons/full/obj16/method_protected_obj.gif
diff -N icons/full/obj16/method_protected_obj.gif
Binary files /dev/null and method_protected_obj.gif differ
Index: icons/full/obj16/method_public_obj.gif
===================================================================
RCS file: icons/full/obj16/method_public_obj.gif
diff -N icons/full/obj16/method_public_obj.gif
Binary files /dev/null and method_public_obj.gif differ
Index: icons/full/obj16/private_m.gif
===================================================================
RCS file: icons/full/obj16/private_m.gif
diff -N icons/full/obj16/private_m.gif
Binary files /tmp/cvsxhvQ2o and /dev/null differ
Index: icons/full/obj16/protected_m.gif
===================================================================
RCS file: icons/full/obj16/protected_m.gif
diff -N icons/full/obj16/protected_m.gif
Binary files /tmp/cvsqVQoTD and /dev/null differ
Index: icons/full/obj16/public_m.gif
===================================================================
RCS file: icons/full/obj16/public_m.gif
diff -N icons/full/obj16/public_m.gif
Binary files /tmp/cvsrPowKS and /dev/null differ
Index: icons/full/ovr16/c_ovr.gif
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/icons/full/ovr16/c_ovr.gif,v
retrieving revision 1.1
diff -u -r1.1 c_ovr.gif
Binary files /tmp/cvsY5lRM8 and c_ovr.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.8
diff -u -r1.8 CElementImageProvider.java
--- src/org/eclipse/cdt/internal/ui/CElementImageProvider.java	31 Mar 2003 03:52:56 -0000	1.8
+++ src/org/eclipse/cdt/internal/ui/CElementImageProvider.java	31 Mar 2003 15:14:33 -0000
@@ -12,6 +12,7 @@
 import org.eclipse.cdt.core.model.IDeclaration;
 import org.eclipse.cdt.core.model.IMember;
 import org.eclipse.cdt.core.model.IMethodDeclaration;
+import org.eclipse.cdt.core.model.IField;
 import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
 import org.eclipse.cdt.ui.CElementImageDescriptor;
 import org.eclipse.cdt.ui.CUIPlugin;
@@ -211,6 +212,16 @@
 				return CPluginImages.DESC_OBJS_UNION;
 
 			case ICElement.C_FIELD:
+			IField  field = (IField)celement;
+			switch(field.getVisibility()){
+				case IMember.V_PUBLIC:
+					return CPluginImages.DESC_OBJS_PUBLIC_FIELD;
+				case IMember.V_PROTECTED:
+					return CPluginImages.DESC_OBJS_PROTECTED_FIELD;
+				case IMember.V_PRIVATE:
+					return CPluginImages.DESC_OBJS_PRIVATE_FIELD;
+			}
+			
 			case ICElement.C_VARIABLE:
 				return CPluginImages.DESC_OBJS_FIELD;
 
@@ -258,6 +269,8 @@
 				return CPluginImages.DESC_OBJS_UNION;
 
 			case ICElement.C_FIELD:
+				return CPluginImages.DESC_OBJS_PUBLIC_FIELD;
+
 			case ICElement.C_VARIABLE:
 				return CPluginImages.DESC_OBJS_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.5
diff -u -r1.5 CPluginImages.java
--- src/org/eclipse/cdt/internal/ui/CPluginImages.java	26 Mar 2003 16:02:58 -0000	1.5
+++ src/org/eclipse/cdt/internal/ui/CPluginImages.java	31 Mar 2003 15:14:33 -0000
@@ -48,9 +48,12 @@
 	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_FUNCTION= NAME_PREFIX + "function_obj.gif";
-	public static final String IMG_OBJS_PUBLIC_METHOD= NAME_PREFIX + "public_m.gif";
-	public static final String IMG_OBJS_PROTECTED_METHOD= NAME_PREFIX + "protected_m.gif";
-	public static final String IMG_OBJS_PRIVATE_METHOD= NAME_PREFIX + "private_m.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";
+	public static final String IMG_OBJS_PRIVATE_METHOD= NAME_PREFIX + "method_private_obj.gif";	
+	public static final String IMG_OBJS_PUBLIC_FIELD= NAME_PREFIX + "field_public_obj.gif";
+	public static final String IMG_OBJS_PROTECTED_FIELD= NAME_PREFIX + "field_protected_obj.gif";
+	public static final String IMG_OBJS_PRIVATE_FIELD= NAME_PREFIX + "field_private_obj.gif";	
 	public static final String IMG_OBJS_DECLARATION= NAME_PREFIX + "cdeclaration_obj.gif";
 	public static final String IMG_OBJS_INCLUDE= NAME_PREFIX + "include_obj.gif";
 	public static final String IMG_OBJS_MACRO= NAME_PREFIX + "define_obj.gif";
@@ -75,7 +78,10 @@
 	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);
-	public static final ImageDescriptor DESC_OBJS_PRIVATE_METHOD= createManaged(T_OBJ, IMG_OBJS_PRIVATE_METHOD);	
+	public static final ImageDescriptor DESC_OBJS_PRIVATE_METHOD= createManaged(T_OBJ, IMG_OBJS_PRIVATE_METHOD);
+	public static final ImageDescriptor DESC_OBJS_PUBLIC_FIELD= createManaged(T_OBJ, IMG_OBJS_PUBLIC_FIELD);
+	public static final ImageDescriptor DESC_OBJS_PROTECTED_FIELD= createManaged(T_OBJ, IMG_OBJS_PROTECTED_FIELD);
+	public static final ImageDescriptor DESC_OBJS_PRIVATE_FIELD= createManaged(T_OBJ, IMG_OBJS_PRIVATE_FIELD);			
 	public static final ImageDescriptor DESC_OBJS_DECLARARION= createManaged(T_OBJ, IMG_OBJS_DECLARATION);
 	public static final ImageDescriptor DESC_OBJS_INCLUDE= createManaged(T_OBJ, IMG_OBJS_INCLUDE);
 	public static final ImageDescriptor DESC_OBJS_MACRO= createManaged(T_OBJ, IMG_OBJS_MACRO);
@@ -103,7 +109,8 @@
 	public static final String IMG_EDIT_PROPERTIES= NAME_PREFIX + "prop_edt.gif";
 	public static final ImageDescriptor DESC_OBJS_TEMPLATE= createManaged(T_OBJ, IMG_OBJS_TEMPLATE);
 	
-	public static final ImageDescriptor DESC_OVR_STATIC= create(T_OVR, "static_co.gif");//$NON-NLS-1$
+	public static final ImageDescriptor DESC_OVR_STATIC= create(T_OVR, "static_co.gif");
+	public static final ImageDescriptor DESC_OVR_CONSTANT= create(T_OVR, "c_ovr.gif");
 
 	public static final ImageDescriptor DESC_OVR_WARNING= create(T_OVR, "warning_co.gif");
 	public static final ImageDescriptor DESC_OVR_ERROR= create(T_OVR, "error_co.gif");
Index: src/org/eclipse/cdt/ui/CElementImageDescriptor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java,v
retrieving revision 1.2
diff -u -r1.2 CElementImageDescriptor.java
--- src/org/eclipse/cdt/ui/CElementImageDescriptor.java	28 Mar 2003 21:05:24 -0000	1.2
+++ src/org/eclipse/cdt/ui/CElementImageDescriptor.java	31 Mar 2003 15:14:33 -0000
@@ -166,12 +166,12 @@
 			data= CPluginImages.DESC_OVR_ABSTRACT.getImageData();
 			x-= data.width;
 			drawImage(data, x, 0);
-		}
-		if ((fFlags & FINAL) != 0) {
-			data= CPluginImages.DESC_OVR_FINAL.getImageData();
+		}*/
+		if ((fFlags & CONSTANT) != 0) {
+			data= CPluginImages.DESC_OVR_CONSTANT.getImageData();
 			x-= data.width;
 			drawImage(data, x, 0);
-		}*/
+		}
 		if ((fFlags & STATIC) != 0) {
 			data= CPluginImages.DESC_OVR_STATIC.getImageData();
 			x-= data.width;

Attachment: c_ovr.gif
Description: GIF image

Attachment: field_protected_obj.gif
Description: GIF image

Attachment: field_private_obj.gif
Description: GIF image

Attachment: field_public_obj.gif
Description: GIF image

Prev by Date: [cdt-patch] 1.0.1 Parser "Big Hammer" Fix
Next by Date: Applied: [cdt-patch] C Model Update - show visibility for fields
Previous by thread: RE: [cdt-patch] C Model Update - show visibility for fields
Next by thread: [cdt-patch] new ICPathEntry in core
Index(es):
- Date
- Thread

Breadcrumbs