From 01eef6aa4b04c721a265932118c8ab2985da5d59 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 30 Jul 2004 19:11:25 +0000 Subject: [PATCH] 2004-07-30 Alain Magloire Implementation of "Add Include" add the using directive. * icons/full/obj16/using_obj.gif * src/org/eclipse/cdt/internal/ui/CElementImageProvider.java * src/org/eclipse/cdt/internal/ui/CPluginImages.java * src/org/eclipse/cdt/ui/CElementLabelProvider.java --- core/org.eclipse.cdt.ui/ChangeLog | 9 +++++ .../icons/full/obj16/using_obj.gif | Bin 0 -> 194 bytes .../internal/ui/CElementImageProvider.java | 33 +++++++++++------- .../cdt/internal/ui/CPluginImages.java | 2 ++ .../eclipse/cdt/ui/CElementLabelProvider.java | 1 - 5 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 core/org.eclipse.cdt.ui/icons/full/obj16/using_obj.gif diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 105327b0484..5522448bab3 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,12 @@ +2004-07-30 Alain Magloire + + Implementation of "Add Include" add the using directive. + + * icons/full/obj16/using_obj.gif + * src/org/eclipse/cdt/internal/ui/CElementImageProvider.java + * src/org/eclipse/cdt/internal/ui/CPluginImages.java + * src/org/eclipse/cdt/ui/CElementLabelProvider.java + 2004-07-29 Tanya Wolff Part Fix for 69768: CDT wasn't displaying non-English templates. diff --git a/core/org.eclipse.cdt.ui/icons/full/obj16/using_obj.gif b/core/org.eclipse.cdt.ui/icons/full/obj16/using_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..561bdf1cb363417ddb21639e360764a21b3355d6 GIT binary patch literal 194 zcmZ?wbhEHb6krfwIKsfNKYsuG`1$+m_wS#-Ki^MQ)%|NsBbKpar~$->CMAjF^pQVz0{fz^J2N?%Imyo@ZjoYzYPS#143 zFPgaceU?Alfdvx+xOmu_mM|Pp`Nwf##g*w=5$jo*R~?AZ5MponHpO(t`72wrSQxAU DZh=Ch literal 0 HcmV?d00001 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 3b225507906..777d0d12a7e 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 @@ -195,6 +195,9 @@ public class CElementImageProvider { case ICElement.C_NAMESPACE: return CPluginImages.DESC_OBJS_NAMESPACE; + + case ICElement.C_USING: + return CPluginImages.DESC_OBJS_USING; } return null; } @@ -373,7 +376,10 @@ public class CElementImageProvider { case ICElement.C_NAMESPACE: return getNamespaceImageDescriptor(); - + + case ICElement.C_USING: + return getUsingImageDescriptor(); + } return null; } @@ -449,7 +455,7 @@ public class CElementImageProvider { public static ImageDescriptor getEnumeratorImageDescriptor(){ return CPluginImages.DESC_OBJS_ENUMERATOR; } - + public static ImageDescriptor getFieldImageDescriptor(ASTAccessVisibility visibility) { if (visibility == ASTAccessVisibility.PUBLIC) return CPluginImages.DESC_OBJS_PUBLIC_FIELD; @@ -458,17 +464,16 @@ public class CElementImageProvider { return CPluginImages.DESC_OBJS_PRIVATE_FIELD; } - + public static ImageDescriptor getMethodImageDescriptor(ASTAccessVisibility visibility) { if( visibility == ASTAccessVisibility.PUBLIC) return CPluginImages.DESC_OBJS_PUBLIC_METHOD; if( visibility == ASTAccessVisibility.PROTECTED) return CPluginImages.DESC_OBJS_PROTECTED_METHOD; - return CPluginImages.DESC_OBJS_PRIVATE_METHOD; - + return CPluginImages.DESC_OBJS_PRIVATE_METHOD; } - + public static ImageDescriptor getVariableImageDescriptor(){ return getImageDescriptor(ICElement.C_VARIABLE); } @@ -480,27 +485,31 @@ public class CElementImageProvider { public static ImageDescriptor getFunctionImageDescriptor(){ return getImageDescriptor(ICElement.C_FUNCTION); } - + public static ImageDescriptor getVariableDeclarationImageDescriptor(){ return getImageDescriptor(ICElement.C_VARIABLE_DECLARATION); } - + public static ImageDescriptor getFunctionDeclarationImageDescriptor(){ return getImageDescriptor(ICElement.C_FUNCTION_DECLARATION); } - + public static ImageDescriptor getIncludeImageDescriptor(){ return getImageDescriptor(ICElement.C_INCLUDE); } - + public static ImageDescriptor getMacroImageDescriptor(){ return getImageDescriptor(ICElement.C_MACRO); } - + public static ImageDescriptor getNamespaceImageDescriptor(){ return getImageDescriptor(ICElement.C_NAMESPACE); } - + + public static ImageDescriptor getUsingImageDescriptor(){ + return getImageDescriptor(ICElement.C_USING); + } + public static ImageDescriptor getKeywordImageDescriptor(){ return CPluginImages.DESC_OBJS_KEYWORD; } 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 92d04918246..b85fa660001 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,6 +48,7 @@ public class CPluginImages { public static final String IMG_OBJS_LOCAL_VARIABLE= NAME_PREFIX + "variable_local_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CLASS= NAME_PREFIX + "class_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_NAMESPACE= NAME_PREFIX + "namespace_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_USING= NAME_PREFIX + "using_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_STRUCT= NAME_PREFIX + "struct_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_UNION= NAME_PREFIX + "union_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_TYPEDEF= NAME_PREFIX + "typedef_obj.gif"; //$NON-NLS-1$ @@ -114,6 +115,7 @@ public class CPluginImages { public static final ImageDescriptor DESC_OBJS_LOCAL_VARIABLE= createManaged(T_OBJ, IMG_OBJS_LOCAL_VARIABLE); public static final ImageDescriptor DESC_OBJS_CLASS= createManaged(T_OBJ, IMG_OBJS_CLASS); public static final ImageDescriptor DESC_OBJS_NAMESPACE= createManaged(T_OBJ, IMG_OBJS_NAMESPACE); + public static final ImageDescriptor DESC_OBJS_USING = createManaged(T_OBJ, IMG_OBJS_USING); 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); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java index 0f5edb267f7..ed5a9a907db 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java @@ -17,7 +17,6 @@ import org.eclipse.cdt.internal.ui.CElementImageProvider; import org.eclipse.cdt.internal.ui.ErrorTickAdornmentProvider; import org.eclipse.cdt.internal.ui.IAdornmentProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels; -import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.model.WorkbenchLabelProvider;