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 00000000000..0e292426734 Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/field_private_obj.gif differ 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 00000000000..222116b455c Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/field_protected_obj.gif differ 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 00000000000..630b286c3bd Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/full/obj16/field_public_obj.gif differ 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;