diff --git a/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif index d1a56087c66..10d652cc04d 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif and b/core/org.eclipse.cdt.ui/icons/obj16/ar_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif new file mode 100644 index 00000000000..c052e662cfa Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/obj16/archives_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif new file mode 100644 index 00000000000..5a08512dcb1 Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/obj16/binaries_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif index d90a29fead8..fe21f448b8c 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif and b/core/org.eclipse.cdt.ui/icons/obj16/exec_dbg_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif index 8174dade2bb..d5f502a9746 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif and b/core/org.eclipse.cdt.ui/icons/obj16/exec_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif b/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif index 8505f9d3c63..c8926a25c00 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif and b/core/org.eclipse.cdt.ui/icons/obj16/includes_container.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif index 4e51447b23b..2f063e59106 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif and b/core/org.eclipse.cdt.ui/icons/obj16/shlib_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif b/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif index 57ba1fbf159..bacc22a65d2 100644 Binary files a/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif and b/core/org.eclipse.cdt.ui/icons/obj16/sroot_obj.gif differ diff --git a/core/org.eclipse.cdt.ui/icons/obj16/wsp_includefolder.gif b/core/org.eclipse.cdt.ui/icons/obj16/wsp_includefolder.gif new file mode 100644 index 00000000000..7336d6c7712 Binary files /dev/null and b/core/org.eclipse.cdt.ui/icons/obj16/wsp_includefolder.gif differ 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 c8366e9a115..e32ba30e1ec 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 @@ -96,11 +96,14 @@ public class CPluginImages { public static final String IMG_OBJS_CEXEC_DEBUG= NAME_PREFIX + "exec_dbg_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CORE= NAME_PREFIX + "core_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_CONTAINER= NAME_PREFIX + "container_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_ARCHIVES_CONTAINER= NAME_PREFIX + "archives_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_BINARIES_CONTAINER= NAME_PREFIX + "binaries_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_OUTPUT_FOLDER= NAME_PREFIX + "output_folder_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_LIBRARY= NAME_PREFIX + "lib_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_INCLUDES_CONTAINER = NAME_PREFIX + "includes_container.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_obj.gif"; //$NON-NLS-1$ - public static final String IMG_OBJS_QUOTE_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_quote_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_QUOTE_INCLUDES_FOLDER = NAME_PREFIX + "hfolder_quote_obj.gif"; //$NON-NLS-1$ + public static final String IMG_OBJS_INCLUDES_FOLDER_WORKSPACE = NAME_PREFIX + "wsp_includefolder.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_ORDER= NAME_PREFIX + "cp_order_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_EXCLUDSION_FILTER_ATTRIB= NAME_PREFIX + "exclusion_filter_attrib.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_SOURCE_ATTACH_ATTRIB = NAME_PREFIX + "source_attach_attrib.gif"; //$NON-NLS-1$ @@ -174,11 +177,14 @@ public class CPluginImages { public static final ImageDescriptor DESC_OBJS_CEXEC_DEBUG= createManaged(T_OBJ, IMG_OBJS_CEXEC_DEBUG); public static final ImageDescriptor DESC_OBJS_CORE= createManaged(T_OBJ, IMG_OBJS_CORE); public static final ImageDescriptor DESC_OBJS_CONTAINER= createManaged(T_OBJ, IMG_OBJS_CONTAINER); + public static final ImageDescriptor DESC_OBJS_ARCHIVES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_ARCHIVES_CONTAINER); + public static final ImageDescriptor DESC_OBJS_BINARIES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_BINARIES_CONTAINER); public static final ImageDescriptor DESC_OBJS_OUTPUT_FOLDER= createManaged(T_OBJ, IMG_OBJS_OUTPUT_FOLDER); public static final ImageDescriptor DESC_OBJS_LIBRARY= createManaged(T_OBJ, IMG_OBJS_LIBRARY); public static final ImageDescriptor DESC_OBJS_INCLUDES_CONTAINER= createManaged(T_OBJ, IMG_OBJS_INCLUDES_CONTAINER); public static final ImageDescriptor DESC_OBJS_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_INCLUDES_FOLDER); - public static final ImageDescriptor DESC_OBJS_QUOTE_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_QUOTE_INCLUDES_FOLDER); + public static final ImageDescriptor DESC_OBJS_QUOTE_INCLUDES_FOLDER= createManaged(T_OBJ, IMG_OBJS_QUOTE_INCLUDES_FOLDER); + public static final ImageDescriptor DESC_OBJS_INCLUDES_FOLDER_WORKSPACE= createManaged(T_OBJ, IMG_OBJS_INCLUDES_FOLDER_WORKSPACE); public static final ImageDescriptor DESC_OBJS_ORDER= createManaged(T_OBJ, IMG_OBJS_ORDER); public static final ImageDescriptor DESC_OBJS_EXCLUSION_FILTER_ATTRIB = createManaged(T_OBJ, IMG_OBJS_EXCLUDSION_FILTER_ATTRIB); public static final ImageDescriptor DESC_OBJS_SOURCE_ATTACH_ATTRIB= createManaged(T_OBJ, IMG_OBJS_SOURCE_ATTACH_ATTRIB); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index 42c00c0ad50..a3ff26b623b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.ui.CElementImageDescriptor; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider; import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; @@ -82,7 +83,7 @@ public class CViewLabelProvider extends AppearanceAwareLabelProvider { IPath path = reference.getPath(); IContainer container = reference.getCModel().getWorkspace().getRoot().getContainerForLocation(path); if (container != null && container.isAccessible()) { - ImageDescriptor desc = CElementImageProvider.getImageDescriptor(ICElement.C_PROJECT); + ImageDescriptor desc = CPluginImages.DESC_OBJS_INCLUDES_FOLDER_WORKSPACE; desc = new CElementImageDescriptor(desc, 0, CElementImageProvider.SMALL_SIZE); return CUIPlugin.getImageDescriptorRegistry().get(desc); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java index 5f7c4297e1e..55578a68b65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 QNX Software Systems and others. + * Copyright (c) 2004, 2007 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs.cpaths; @@ -34,7 +35,7 @@ import org.eclipse.ui.model.IWorkbenchAdapter; class CPElementLabelProvider extends LabelProvider implements IColorProvider { - private final Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170)); + private Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170)); private String fNewLabel, fCreateLabel; private ImageDescriptor fIncludeIcon, fMacroIcon, fLibWSrcIcon, fLibIcon; @@ -71,6 +72,15 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { bShowParentInfo = showParentInfo; } + /* + * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() + */ + public void dispose() { + inDirect.dispose(); + inDirect= null; + super.dispose(); + } + public String getText(Object element) { if (element instanceof CPElement) { return getCPElementText((CPElement)element); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java index 246b4d5bf86..297f7c82991 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation * QNX Software System * Markus Schorn (Wind River Systems) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; @@ -24,7 +25,9 @@ import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.IArchiveContainer; import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.core.model.IBinaryContainer; import org.eclipse.cdt.core.model.IBinaryModule; import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; @@ -288,6 +291,10 @@ public class CElementImageProvider { return CPluginImages.DESC_OBJS_UNKNOWN; } else if (celement instanceof IIncludeReference) { return CPluginImages.DESC_OBJS_INCLUDES_FOLDER; + } else if (celement instanceof IArchiveContainer) { + return CPluginImages.DESC_OBJS_ARCHIVES_CONTAINER; + } else if (celement instanceof IBinaryContainer) { + return CPluginImages.DESC_OBJS_BINARIES_CONTAINER; } return CPluginImages.DESC_OBJS_CONTAINER;