From 5d314c37728977d3b7e02669853cab2981036127 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 31 Mar 2003 15:52:03 +0000 Subject: [PATCH] Patch for Hoda Amer: - 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 --- .../icons/full/obj16/field_private_obj.gif | Bin 0 -> 88 bytes .../icons/full/obj16/field_protected_obj.gif | Bin 0 -> 88 bytes .../icons/full/obj16/field_public_obj.gif | Bin 0 -> 92 bytes .../{private_m.gif => method_private_obj.gif} | Bin ...rotected_m.gif => method_protected_obj.gif} | Bin .../{public_m.gif => method_public_obj.gif} | Bin .../cdt/internal/ui/CElementImageProvider.java | 13 +++++++++++++ .../eclipse/cdt/internal/ui/CPluginImages.java | 17 ++++++++++++----- .../cdt/ui/CElementImageDescriptor.java | 8 ++++---- 9 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/field_private_obj.gif create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/field_protected_obj.gif create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/field_public_obj.gif rename core/org.eclipse.cdt.ui/icons/full/obj16/{private_m.gif => method_private_obj.gif} (100%) rename core/org.eclipse.cdt.ui/icons/full/obj16/{protected_m.gif => method_protected_obj.gif} (100%) rename core/org.eclipse.cdt.ui/icons/full/obj16/{public_m.gif => method_public_obj.gif} (100%) diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/field_private_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/field_private_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..0e29242673408d31f33d7bdab9b7539b9d1f1cb1 GIT binary patch literal 88 zcmZ?wbhEHb6krfwSj50^-`;+{z5V_A`u||S00W9YSr{1@SQvCb0wA>v%(5Q4?))=2 f<@uULqD8yyhLAx|0!zt#(KSn-?kiZM!e9*mvdA2V literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/field_protected_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/field_protected_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..222116b455cb31a27de86bf93f698ca27d8b99d2 GIT binary patch literal 88 zcmZ?wbhEHb6krfwSj52af4}|ydi(l#`~P6T00W9YSr{1@SQvCb0wA>v%(5Q4?))=2 f<(axdrNR2^4KahB27$V?@FdM=`#wx&V6X-N(AymC literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/field_public_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/field_public_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..630b286c3bda32fa480e0e01949bad7409098b66 GIT binary patch literal 92 zcmZ?wbhEHb6krfwSj50!UvF<8Z@>Tk{`vdk|APSo7%2W^VPs%nWzYffKx!G76(e@t m`Dbv-b0LGn8Edx-f(8OD>YYm@IUT>}9*jO)lIzXMU=09r*&bs6 literal 0 HcmV?d00001 diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/private_m.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/method_private_obj.gif similarity index 100% rename from core/org.eclipse.cdt.ui/icons/full/obj16/private_m.gif rename to core/org.eclipse.cdt.ui/icons/full/obj16/method_private_obj.gif diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/protected_m.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/method_protected_obj.gif similarity index 100% rename from core/org.eclipse.cdt.ui/icons/full/obj16/protected_m.gif rename to core/org.eclipse.cdt.ui/icons/full/obj16/method_protected_obj.gif diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/public_m.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/method_public_obj.gif similarity index 100% rename from core/org.eclipse.cdt.ui/icons/full/obj16/public_m.gif rename to core/org.eclipse.cdt.ui/icons/full/obj16/method_public_obj.gif diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java index 1054c1c23da..6626819418e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java @@ -12,6 +12,7 @@ import org.eclipse.cdt.core.model.ICProject; 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 @@ public class CElementImageProvider { 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 @@ public class CElementImageProvider { return CPluginImages.DESC_OBJS_UNION; case ICElement.C_FIELD: + return CPluginImages.DESC_OBJS_PUBLIC_FIELD; + case ICElement.C_VARIABLE: return CPluginImages.DESC_OBJS_FIELD; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java index d92d3acb7b7..36999d02e64 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java @@ -48,9 +48,12 @@ public class CPluginImages { 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 class CPluginImages { 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 class CPluginImages { 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"); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java index 769b07169ea..bfc3f17c620 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java @@ -166,12 +166,12 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { 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;