mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +02:00
Code Issues Wiki Activity

bug 88402: UI plugins should share common images

Browse source
This commit is contained in:
Andrew Gvozdev 2010-11-05 16:05:04 +00:00
parent f1742086d1
commit d320195a9e
58 changed files with 273 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
View file

@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.cdt.make.internal.ui.scannerconfig;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.resource.CompositeImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
@ -49,13 +49,13 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
public DiscoveredElementLabelProvider() {
fRegistry = CUIPlugin.getImageDescriptorRegistry();
fContainerImage = CPluginImages.DESC_OBJS_LIBRARY;
fIncludeGroupIcon = CPluginImages.DESC_OBJS_INCLUDES_CONTAINER;
fMacroGroupIcon = CPluginImages.DESC_OBJS_MACRO;
fIncludeAndMacrosFileGroupIcon = CPluginImages.DESC_OBJS_INCLUDE;
fIncludeIcon = CPluginImages.DESC_OBJS_INCLUDES_FOLDER;
// fQuoteIncludeIcon = CPluginImages.DESC_OBJS_QUOTE_INCLUDES_FOLDER;
fIncludeAndMacrosFileIcon = CPluginImages.DESC_OBJS_TUNIT_HEADER;
fContainerImage = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LIBRARY);
fIncludeGroupIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
fMacroGroupIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO);
fIncludeAndMacrosFileGroupIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDE);
fIncludeIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
// fQuoteIncludeIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_QUOTE_INCLUDES_FOLDER);
fIncludeAndMacrosFileIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
fMacroIcon = fMacroGroupIcon;
}
@ -195,7 +195,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
protected void drawOverlays() {
ImageData data = null;
if (showRemoved) {
data = CPluginImages.DESC_OVR_ERROR.getImageData();
data = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OVR_ERROR).getImageData();
drawImage(data, 0, 0);
}
}

8
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
View file

@ -15,7 +15,6 @@ import java.util.Arrays;
import java.util.Collections;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.managedbuilder.core.BuildListComparator;
import org.eclipse.cdt.managedbuilder.core.IBuildObject;
import org.eclipse.cdt.managedbuilder.core.IBuilder;
@ -38,6 +37,7 @@ import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolChainModificationManager;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;
@ -70,9 +70,9 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
private static final Color red = Display.getDefault().getSystemColor(SWT.COLOR_RED);
private static final String SPACE = " "; //$NON-NLS-1$
static private final Image IMG_WARNING = CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_WARNING);
static private final Image IMG_ERROR = CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_ERROR);
static private final Image IMG_INFO = CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_INFO);
static private final Image IMG_WARNING = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_WARNING);
static private final Image IMG_ERROR = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_ERROR);
static private final Image IMG_INFO = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_INFO);
private Text text;
private Button b_dispCompatible;

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSelectionDialog.java
View file

@ -16,7 +16,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.managedbuilder.core.BuildListComparator;
import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
import org.eclipse.cdt.managedbuilder.core.IModificationStatus;
@ -28,6 +27,7 @@ import org.eclipse.cdt.managedbuilder.tcmodification.CompatibilityStatus;
import org.eclipse.cdt.managedbuilder.tcmodification.IModificationOperation;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolListModification;
import org.eclipse.cdt.managedbuilder.tcmodification.IToolModification;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.JFaceResources;
@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Text;
public class ToolSelectionDialog extends Dialog {
static private final Image IMG_ARROW = CPluginImages.get(CPluginImages.IMG_PREFERRED);
static private final Image IMG_ARROW = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_PREFERRED);
static private final String EMPTY_STR = ""; //$NON-NLS-1$
static private final int COL_WIDTH = 300;
static private Font boldFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT);

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java
View file

@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.ui.wizards;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;
import org.eclipse.cdt.managedbuilder.core.IInputType;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.wizards.CNewWizard;
import org.eclipse.cdt.ui.wizards.IWizardItemsListListener;
import org.eclipse.jface.wizard.IWizard;
@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
public abstract class AbstractCWizard extends CNewWizard {
protected static final Image IMG0 = CPluginImages.get(CPluginImages.IMG_OBJS_CFOLDER);
protected static final Image IMG0 = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CFOLDER);
protected static final Image IMG1 = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CAT);
protected static final Image IMG2 = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_TOOL);

4
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
View file

@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.SortedMap;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyManager;
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType;
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
@ -23,6 +22,7 @@ import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
import org.eclipse.jface.wizard.IWizard;
@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.Image;
* @noinstantiate This class is not intended to be instantiated by clients.
*/
public class ManagedBuildWizard extends AbstractCWizard {
private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
private static final Image IMG = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CONTAINER);
public static final String OTHERS_LABEL = Messages.CNewWizard_0;
/**

31
core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoLabelProvider.java
View file

@ -29,11 +29,10 @@ import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IVariableDeclaration;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.core.model.FunctionDeclaration;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* @noextend This class is not intended to be subclassed by clients.
*/
@ -46,20 +45,20 @@ public class TypeInfoLabelProvider extends LabelProvider {
public static final int SHOW_PARAMETERS= 0x10;
public static final int SHOW_RETURN_TYPE= 0x20;
private static final Image HEADER_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT_HEADER);
private static final Image SOURCE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT);
private static final Image NAMESPACE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_NAMESPACE);
private static final Image TEMPLATE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TEMPLATE);
private static final Image CLASS_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_CLASS);
private static final Image STRUCT_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_STRUCT);
private static final Image TYPEDEF_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_TYPEDEF);
private static final Image UNION_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_UNION);
private static final Image ENUM_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_ENUMERATION);
private static final Image FUNCTION_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_FUNCTION);
private static final Image VARIABLE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_VARIABLE);
private static final Image VARIABLE_LOCAL_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_LOCAL_VARIABLE);
private static final Image MACRO_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
private static final Image UNKNOWN_TYPE_ICON= CPluginImages.get(CPluginImages.IMG_OBJS_UNKNOWN_TYPE);
private static final Image HEADER_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
private static final Image SOURCE_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TUNIT);
private static final Image NAMESPACE_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_NAMESPACE);
private static final Image TEMPLATE_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TEMPLATE);
private static final Image CLASS_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CLASS);
private static final Image STRUCT_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_STRUCT);
private static final Image TYPEDEF_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TYPEDEF);
private static final Image UNION_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_UNION);
private static final Image ENUM_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_ENUMERATION);
private static final Image FUNCTION_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_FUNCTION);
private static final Image VARIABLE_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
private static final Image VARIABLE_LOCAL_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_LOCAL_VARIABLE);
private static final Image MACRO_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_MACRO);
private static final Image UNKNOWN_TYPE_ICON= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_UNKNOWN_TYPE);
private int fFlags;

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
View file

@ -270,12 +270,11 @@ public class CPluginImages {
@Deprecated public static final ImageDescriptor DESC_OBJS_IMPORT_SETTINGS = createManaged(T_OBJ, IMG_OBJS_IMPORT_SETTINGS);
/** @deprecated as of CDT 8.0. Use {@link CDTSharedImages#getImageDescriptor(String)}. */
@Deprecated public static final ImageDescriptor DESC_OBJS_EXPORT_SETTINGS = createManaged(T_OBJ, IMG_OBJS_EXPORT_SETTINGS);
/** @deprecated as of CDT 8.0. Use {@link CDTSharedImages#getImageDescriptor(String)}. */
@Deprecated public static final ImageDescriptor DESC_OVR_PATH_INHERIT= createUnManaged(T_OVR, "path_inherit_co.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OVR_PATH_INHERIT = createUnManaged(T_OVR, "path_inherit_co.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OBJS_OVERRIDES = createUnManaged(T_OBJ, "over_co.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OBJS_IMPLEMENTS = createUnManaged(T_OBJ, "implm_co.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OBJS_SHADOWS= createUnManaged(T_OBJ, "shad_co.gif"); //$NON-NLS-1$
public static final ImageDescriptor DESC_OBJS_SHADOWS = createUnManaged(T_OBJ, "shad_co.gif"); //$NON-NLS-1$
/** @deprecated as of CDT 8.0. Use {@link CDTSharedImages#getImageDescriptor(String)}. */
@Deprecated public static final ImageDescriptor DESC_OBJS_FIXABLE_PROBLEM= createManaged(T_OBJ, IMG_OBJS_FIXABLE_PROBLEM);

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java
View file

@ -13,9 +13,6 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.buildconsole;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IBuildConsoleManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.swt.graphics.Color;
import org.eclipse.ui.console.AbstractConsole;
@ -23,6 +20,10 @@ import org.eclipse.ui.console.IConsoleConstants;
import org.eclipse.ui.console.IConsoleView;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IBuildConsoleManager;
public class BuildConsole extends AbstractConsole {
/**
@ -47,7 +48,7 @@ public class BuildConsole extends AbstractConsole {
private Color fBackground;
public BuildConsole(IBuildConsoleManager manager, String name, String id) {
super(name, CPluginImages.DESC_BUILD_CONSOLE);
super(name, CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_VIEW_BUILD_CONSOLE));
fConsoleManager = manager;
fConsoleName = name;
fConsoleId = id;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
View file

@ -24,10 +24,10 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IIncludeReference;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
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;
@ -102,7 +102,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 = CPluginImages.DESC_OBJS_INCLUDES_FOLDER_WORKSPACE;
ImageDescriptor desc = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER_WORKSPACE);
desc = new CElementImageDescriptor(desc, 0, CElementImageProvider.SMALL_SIZE);
return CUIPlugin.getImageDescriptorRegistry().get(desc);
}

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java
View file

@ -18,10 +18,9 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IIncludeReference;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementGrouping;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* IncludeRefContainer
*/
@ -74,7 +73,7 @@ public class IncludeRefContainer extends CElementGrouping {
*/
@Override
public ImageDescriptor getImageDescriptor(Object object) {
return CPluginImages.DESC_OBJS_INCLUDES_CONTAINER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
}
/* (non-Javadoc)

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java
View file

@ -11,11 +11,12 @@
package org.eclipse.cdt.internal.ui.cview;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.IIncludeReference;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementGrouping;
import org.eclipse.jface.resource.ImageDescriptor;
/**
* @author User
@ -56,7 +57,7 @@ public class IncludeReferenceProxy extends CElementGrouping {
*/
@Override
public ImageDescriptor getImageDescriptor(Object object) {
return CPluginImages.DESC_OBJS_INCLUDES_FOLDER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
}
/* (non-Javadoc)

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java
View file

@ -21,10 +21,9 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.ILibraryReference;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementGrouping;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* VirtualGrouping
*/
@ -82,7 +81,7 @@ public class LibraryRefContainer extends CElementGrouping {
*/
@Override
public ImageDescriptor getImageDescriptor(Object object) {
return CPluginImages.DESC_OBJS_LIBRARY;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LIBRARY);
}
/* (non-Javadoc)

46
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
View file

@ -11,13 +11,6 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.dialogs.cpaths;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.model.IPathEntryContainer;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@ -33,6 +26,15 @@ import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.ide.IDE;
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.IPathEntry;
import org.eclipse.cdt.core.model.IPathEntryContainer;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
/**
* @deprecated as of CDT 4.0. This class was used for property pages
* for 3.X style projects.
@ -59,16 +61,16 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider {
fCreateLabel = CPathEntryMessages.CPElementLabelProvider_willbecreated;
fRegistry = CUIPlugin.getImageDescriptorRegistry();
fLibIcon = CPluginImages.DESC_OBJS_ARCHIVE;
fLibWSrcIcon = CPluginImages.DESC_OBJS_ARCHIVE_WSRC;
fIncludeIcon = CPluginImages.DESC_OBJS_INCLUDES_FOLDER;
fQuoteIncludeIcon = CPluginImages.DESC_OBJS_QUOTE_INCLUDES_FOLDER;
fIncludeFileIcon = CPluginImages.DESC_OBJS_TUNIT_HEADER;
fMacroIcon = CPluginImages.DESC_OBJS_MACRO;
fMacrosFileIcon = CPluginImages.DESC_OBJS_TUNIT_HEADER;
fFolderImage = CPluginImages.DESC_OBJS_SOURCE_ROOT;
fOutputImage = CPluginImages.DESC_OBJS_CONTAINER;
fContainerImage = CPluginImages.DESC_OBJS_LIBRARY;
fLibIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ARCHIVE);
fLibWSrcIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ARCHIVE);
fIncludeIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
fQuoteIncludeIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_QUOTE_INCLUDES_FOLDER);
fIncludeFileIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
fMacroIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO);
fMacrosFileIcon = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
fFolderImage = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SOURCE_ROOT);
fOutputImage = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CONTAINER);
fContainerImage = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LIBRARY);
IWorkbench workbench = CUIPlugin.getDefault().getWorkbench();
@ -385,23 +387,23 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider {
} else if (element instanceof CPElementAttribute) {
String key = ((CPElementAttribute)element).getKey();
if (key.equals(CPElement.SOURCEATTACHMENT)) {
return fRegistry.get(CPluginImages.DESC_OBJS_SOURCE_ATTACH_ATTRIB);
return fRegistry.get(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SOURCE_ATTACH_ATTRIB));
} else if (key.equals(CPElement.EXCLUSION)) {
return CPluginImages.get(CPluginImages.IMG_OBJS_EXCLUDSION_FILTER_ATTRIB);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_EXCLUSION_FILTER_ATTRIB);
}
} else if (element instanceof IPathEntry) {
return getImage(CPElement.createFromExisting((IPathEntry)element, null));
} else if (element instanceof CPElementGroup) {
switch ( ((CPElementGroup)element).getEntryKind()) {
case IPathEntry.CDT_INCLUDE :
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
case IPathEntry.CDT_MACRO :
return fRegistry.get(fMacroIcon);
case IPathEntry.CDT_INCLUDE_FILE :
case IPathEntry.CDT_MACRO_FILE :
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDE);
case IPathEntry.CDT_LIBRARY :
return CPluginImages.get(CPluginImages.IMG_OBJS_LIBRARY);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_LIBRARY);
case -1 :
IResource res = ((CPElementGroup)element).getResource();
IWorkbenchAdapter adapter = (IWorkbenchAdapter)res.getAdapter(IWorkbenchAdapter.class);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
View file

@ -53,10 +53,10 @@ import org.eclipse.cdt.core.model.IIncludeEntry;
import org.eclipse.cdt.core.model.IMacroEntry;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementContentProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
@ -221,7 +221,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
}
@Override

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
View file

@ -54,10 +54,10 @@ import org.eclipse.cdt.core.model.IIncludeEntry;
import org.eclipse.cdt.core.model.IMacroEntry;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementContentProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
@ -268,7 +268,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
}
@Override

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java
View file

@ -43,9 +43,9 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IContainerEntry;
import org.eclipse.cdt.core.model.ILibraryEntry;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
@ -111,7 +111,7 @@ public class CPathLibraryEntryPage extends CPathBasePage {
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_ARCHIVE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_ARCHIVE);
}
public void init(ICProject cproject) {

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java
View file

@ -20,7 +20,8 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
@ -63,7 +64,7 @@ public class CPathOrderExportPage extends CPathBasePage {
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_ORDER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_ORDER);
}
/*
* @see BuildPathBasePage#getSelection

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java
View file

@ -45,9 +45,9 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
@ -107,7 +107,7 @@ public class CPathOutputEntryPage extends CPathBasePage {
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CONTAINER);
}
public void init(ICProject cproject) {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java
View file

@ -44,9 +44,9 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
@ -106,7 +106,7 @@ public class CPathSourceEntryPage extends CPathBasePage {
@Override
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_SOURCE_ROOT);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SOURCE_ROOT);
}
public void init(ICProject cproject) {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java
View file

@ -40,9 +40,9 @@ import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceComparator;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
@ -65,7 +65,7 @@ public class ExclusionPatternDialog extends StatusDialog {
@Override
public Image getImage(Object element) {
ImageDescriptorRegistry registry= CUIPlugin.getImageDescriptorRegistry();
return registry.get(CPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB);
return registry.get(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_EXCLUSION_FILTER_ATTRIB));
}
@Override

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
View file

@ -60,7 +60,7 @@ import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IncludesGrouping;
import org.eclipse.cdt.ui.PreferenceConstants;
@ -80,6 +80,7 @@ import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener;
import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup;
import org.eclipse.cdt.internal.ui.util.ProblemTreeViewer;
import org.eclipse.cdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.eclipse.cdt.internal.ui.viewsupport.CElementLabels;
import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider;
import org.eclipse.cdt.internal.ui.viewsupport.DecoratingCLabelProvider;
@ -223,8 +224,8 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
setDescription(ActionMessages.MacroGroupingAction_description);
setToolTipText(ActionMessages.MacroGroupingAction_tooltip);
CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_HIDE_MACROS);
this.setImageDescriptor(CPluginImages.DESC_OBJS_MACRO);
this.setDisabledImageDescriptor(CPluginImages.DESC_OBJS_MACRO);
this.setImageDescriptor(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO));
this.setDisabledImageDescriptor(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO));
boolean enabled= isMacroGroupingEnabled();

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
View file

@ -28,6 +28,7 @@ import org.eclipse.ui.actions.ActionGroup;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup;
import org.eclipse.cdt.ui.actions.GenerateActionGroup;
@ -168,8 +169,8 @@ public class CContentOutlinePage extends AbstractCModelOutlinePage {
super(ActionMessages.NamespacesGroupingAction_label);
setDescription(ActionMessages.NamespacesGroupingAction_description);
setToolTipText(ActionMessages.NamespacesGroupingAction_tooltip);
this.setImageDescriptor(CPluginImages.DESC_OBJS_NAMESPACE);
this.setDisabledImageDescriptor(CPluginImages.DESC_OBJS_NAMESPACE);
this.setImageDescriptor(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_NAMESPACE));
this.setDisabledImageDescriptor(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_NAMESPACE));
boolean enabled= isNamspacesGroupingEnabled();
setChecked(enabled);

25
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CTemplatesPage.java
View file

@ -12,17 +12,8 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.editor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@ -39,22 +30,26 @@ import org.eclipse.jface.text.templates.Template;
import org.eclipse.jface.text.templates.TemplateContextType;
import org.eclipse.jface.text.templates.TemplateProposal;
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.texteditor.templates.AbstractTemplatesPage;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.corext.template.c.CContextType;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.ui.text.ICPartitions;
import org.eclipse.cdt.internal.corext.template.c.CContext;
import org.eclipse.cdt.internal.corext.template.c.CContextType;
import org.eclipse.cdt.internal.ui.preferences.CSourcePreviewerUpdater;
import org.eclipse.cdt.internal.ui.preferences.EditTemplateDialog;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.CTextTools;
import org.eclipse.cdt.internal.ui.text.SimpleCSourceViewerConfiguration;
import org.eclipse.cdt.internal.ui.text.template.TemplateVariableProcessor;
@ -217,7 +212,7 @@ public class CTemplatesPage extends AbstractTemplatesPage {
*/
@Override
protected Image getImage(Template template) {
return CPluginImages.get(CPluginImages.IMG_OBJS_TEMPLATE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TEMPLATE);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBLabelProvider.java
View file

@ -24,10 +24,10 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Display;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementImageDescriptor;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.viewsupport.ImageImageDescriptor;
public class IBLabelProvider extends LabelProvider implements IColorProvider {
@ -47,7 +47,7 @@ public class IBLabelProvider extends LabelProvider implements IColorProvider {
if (element instanceof IBNode) {
IBNode node= (IBNode) element;
ITranslationUnit tu= node.getRepresentedTranslationUnit();
Image image= tu != null ? fCLabelProvider.getImage(tu) : CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT_HEADER);
Image image= tu != null ? fCLabelProvider.getImage(tu) : CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
return decorateImage(image, node);
}
return super.getImage(element);

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java
View file

@ -40,13 +40,13 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance;
import org.eclipse.cdt.core.model.ICContainer;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPDeferredClassInstance;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNamedNode;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
/**
@ -70,14 +70,14 @@ public class IndexLabelProvider extends LabelProvider {
}
ImageDescriptor desc= null;
if (element instanceof ICProject)
desc = CPluginImages.DESC_OBJS_SEARCHHIERPROJECT;
desc = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SEARCHPROJECT);
else if (element instanceof ICContainer)
desc = CPluginImages.DESC_OBJS_SEARCHHIERFODLER;
desc = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SEARCHFOLDER);
else if (element instanceof ITranslationUnit) {
ITranslationUnit tu = (ITranslationUnit)element;
desc = tu.isHeaderUnit()
? CPluginImages.DESC_OBJS_TUNIT_HEADER
: CPluginImages.DESC_OBJS_TUNIT;
? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_HEADER)
: CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT);
}
if (desc != null)

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchLabelProvider.java
View file

@ -28,12 +28,12 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.cdt.core.index.IIndexFileLocation;
import org.eclipse.cdt.core.index.IndexLocationFactory;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoLabelProvider;
import org.eclipse.cdt.internal.core.dom.parser.ASTProblem;
import org.eclipse.cdt.internal.core.model.TranslationUnit;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.search.LineSearchElement.Match;
import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider;
@ -70,7 +70,7 @@ public class PDOMSearchLabelProvider extends LabelProvider implements IStyledLab
LineSearchElement lineSearchElement = (LineSearchElement) element;
ICElement enclosingElement = lineSearchElement.getMatches()[0].getEnclosingElement();
if (!fPage.isShowEnclosingDefinitions() || enclosingElement == null)
return CPluginImages.get(CPluginImages.IMG_OBJS_SEARCH_LINE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCH_LINE);
element = enclosingElement;
}
@ -78,21 +78,21 @@ public class PDOMSearchLabelProvider extends LabelProvider implements IStyledLab
return fTypeInfoLabelProvider.getImage(((TypeInfoSearchElement)element).getTypeInfo());
if (element instanceof ProblemSearchElement) {
return CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_WARNING);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_WARNING);
}
if (element instanceof IIndexFileLocation
|| element instanceof URI) {
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDE);
}
if (element == IPDOMSearchContentProvider.URI_CONTAINER) {
// TODO: perhaps a better icon?
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_CONTAINER);
}
if (element instanceof IPath) {
return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_FOLDER);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
}
if (element instanceof IStatus) {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchListLabelProvider.java
View file

@ -17,8 +17,8 @@ import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.cdt.core.index.IndexLocationFactory;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.util.Messages;
import org.eclipse.cdt.internal.ui.viewsupport.ColoringLabelProvider;
@ -45,7 +45,7 @@ public class PDOMSearchListLabelProvider extends ColoringLabelProvider {
String location = IndexLocationFactory.getPath(lineElement.getLocation()).toString();
int lineNumber = lineElement.getLineNumber();
cell.setText(Messages.format(CSearchMessages.CSearchResultCollector_location, location, lineNumber));
cell.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_SEARCH_LINE));
cell.setImage(CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCH_LINE));
}
break;
case PDOMSearchViewPage.DEFINITION_COLUMN_INDEX:

12
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/MarkerResolutionProposal.java
View file

@ -13,21 +13,17 @@ package org.eclipse.cdt.internal.ui.text.correction;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.IMarkerResolution;
import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.internal.ui.CPluginImages;
public class MarkerResolutionProposal implements ICCompletionProposal {
private IMarkerResolution fResolution;
private IMarker fMarker;
@ -91,7 +87,7 @@ public class MarkerResolutionProposal implements ICCompletionProposal {
if (fResolution instanceof ICCompletionProposal) {
return ((ICCompletionProposal) fResolution).getImage();
}
return CPluginImages.get(CPluginImages.IMG_CORRECTION_CHANGE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_CHANGE);
}
/* (non-Javadoc)

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/QuickAssistLightBulbUpdater.java
View file

@ -44,12 +44,12 @@ import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.editor.ASTProvider;
import org.eclipse.cdt.internal.ui.util.EditorUtility;
import org.eclipse.cdt.internal.ui.viewsupport.ISelectionListenerWithAST;
@ -87,7 +87,7 @@ public class QuickAssistLightBulbUpdater {
private Image getImage() {
if (fImage == null) {
fImage= CPluginImages.get(CPluginImages.IMG_OBJS_QUICK_ASSIST);
fImage= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_QUICK_ASSIST);
}
return fImage;
}

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/LinkedNamesAssistProposal.java
View file

@ -28,10 +28,10 @@ import org.eclipse.jface.text.contentassist.ICompletionProposalExtension6;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.link.LinkedModeModel;
import org.eclipse.jface.text.link.LinkedModeUI;
import org.eclipse.jface.text.link.LinkedPosition;
import org.eclipse.jface.text.link.LinkedPositionGroup;
import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
import org.eclipse.jface.text.link.LinkedPosition;
import org.eclipse.jface.text.link.LinkedPositionGroup;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@ -46,12 +46,12 @@ import org.eclipse.cdt.core.dom.ast.IASTNodeSelector;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.editor.ASTProvider;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.editor.EditorHighlightingSynchronizer;
@ -275,7 +275,7 @@ public class LinkedNamesAssistProposal implements ICCompletionProposal, IComplet
* @see ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_CORRECTION_LINKED_RENAME);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_LINKED_RENAME);
}
/*

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/RenameRefactoringProposal.java
View file

@ -11,22 +11,20 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.text.correction.proposals;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension6;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.refactoring.actions.CRenameAction;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.internal.corext.util.Messages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
import org.eclipse.cdt.internal.ui.text.correction.CorrectionCommandHandler;
@ -101,7 +99,7 @@ public class RenameRefactoringProposal implements ICCompletionProposal, IComplet
* @see ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_CORRECTION_LINKED_RENAME);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_LINKED_RENAME);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/AddWordProposal.java
View file

@ -23,12 +23,12 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.texteditor.spelling.SpellingProblem;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.ui.text.IInvocationContext;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker;
@ -150,7 +150,7 @@ public class AddWordProposal implements ICCompletionProposal {
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_CORRECTION_ADD);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_ADD);
}
/*

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/DisableSpellCheckingProposal.java
View file

@ -19,11 +19,10 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.texteditor.spelling.SpellingService;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.ui.text.IInvocationContext;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* Proposal to disable spell checking.
@ -76,7 +75,7 @@ public class DisableSpellCheckingProposal implements ICCompletionProposal {
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_NLS_NEVER_TRANSLATE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_NLS_NEVER_TRANSLATE);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java
View file

@ -24,11 +24,11 @@ import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext;
import org.eclipse.cdt.ui.text.contentassist.ICompletionProposalComputer;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker;
@ -77,7 +77,7 @@ public final class WordCompletionProposalComputer implements ICompletionProposal
word.setRank(word.getRank() + PREFIX_RANK_SHIFT);
result.add(new CCompletionProposal(text, start, candidate.length(),
CPluginImages.get(CPluginImages.IMG_CORRECTION_RENAME), text, word.getRank()) {
CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_RENAME), text, word.getRank()) {
/*
* @see org.eclipse.cdt.internal.ui.text.java.JavaCompletionProposal#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
*/

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCorrectionProposal.java
View file

@ -18,10 +18,10 @@ import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.ui.text.IInvocationContext;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.IHtmlTagConstants;
/**
@ -115,7 +115,7 @@ public class WordCorrectionProposal implements ICCompletionProposal {
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_CORRECTION_RENAME);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CORRECTION_RENAME);
}
/*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordIgnoreProposal.java
View file

@ -20,10 +20,10 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.texteditor.spelling.SpellingProblem;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.ui.text.IInvocationContext;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
import org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker;
@ -90,7 +90,7 @@ public class WordIgnoreProposal implements ICCompletionProposal {
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
*/
public Image getImage() {
return CPluginImages.get(CPluginImages.IMG_OBJS_NLS_NEVER_TRANSLATE);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_NLS_NEVER_TRANSLATE);
}
/*
* @see org.eclipse.cdt.ui.text.java.IJavaCompletionProposal#getRelevance()

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java
View file

@ -41,13 +41,13 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.ICCompletionProposal;
import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContext;
import org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.text.c.hover.SourceViewerInformationControl;
import org.eclipse.cdt.internal.ui.text.contentassist.RelevanceConstants;
@ -160,7 +160,7 @@ public class TemplateEngine {
Template[] templates= CUIPlugin.getDefault().getTemplateStore().getTemplates();
Image image= CPluginImages.get(CPluginImages.IMG_OBJS_TEMPLATE);
Image image= CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_TEMPLATE);
if (selection.y == 0) {
for (int i= 0; i != templates.length; i++)
if (context.canEvaluate(templates[i]))

119
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
View file

@ -47,13 +47,12 @@ import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.model.ITemplate;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.parser.ast.ASTAccessVisibility;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementImageDescriptor;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.core.model.CModelManager;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* Default strategy of the C plugin for the construction of C element icons.
@ -129,7 +128,7 @@ public class CElementImageProvider {
if (!CCorePlugin.showSourceRootsAtTopOfProject() &&
element instanceof ICContainer && isParentOfSourceRoot(element)) {
descriptor = CPluginImages.DESC_OBJS_SOURCE2_ROOT;
descriptor = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SOURCE2_ROOT);
} else {
descriptor= getCImageDescriptor((ICElement) element, flags);
}
@ -141,18 +140,18 @@ public class CElementImageProvider {
CoreModel.isValidTranslationUnitName(null, name)) {
if (CoreModel.isValidCHeaderUnitName(null, name) ||
CoreModel.isValidCXXHeaderUnitName(null, name))
descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE_H;
descriptor = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_RESOURCE_H);
else if (CoreModel.isValidASMSourceUnitName(null, name))
descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE_A;
descriptor = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_RESOURCE_A);
else
descriptor = CPluginImages.DESC_OBJS_TUNIT_RESOURCE;
descriptor = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_RESOURCE);
Point size= useSmallSize(flags) ? SMALL_SIZE : BIG_SIZE;
descriptor = new CElementImageDescriptor(descriptor, 0, size);
}
} else if (!CCorePlugin.showSourceRootsAtTopOfProject() &&
element instanceof IFolder && isParentOfSourceRoot(element)) {
descriptor = CPluginImages.DESC_OBJS_SOURCE2_ROOT;
descriptor = CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SOURCE2_ROOT);
}
if (descriptor == null && element instanceof IAdaptable) {
descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
@ -194,61 +193,61 @@ public class CElementImageProvider {
public static ImageDescriptor getImageDescriptor(int type) {
switch (type) {
case ICElement.C_VCONTAINER:
return CPluginImages.DESC_OBJS_CONTAINER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CONTAINER);
case ICElement.C_BINARY:
return CPluginImages.DESC_OBJS_BINARY;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_BINARY);
case ICElement.C_ARCHIVE:
return CPluginImages.DESC_OBJS_ARCHIVE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ARCHIVE);
case ICElement.C_UNIT:
return CPluginImages.DESC_OBJS_TUNIT;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT);
case ICElement.C_CCONTAINER:
//return DESC_OBJ_FOLDER;
return CPluginImages.DESC_OBJS_CFOLDER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CFOLDER);
case ICElement.C_PROJECT:
return DESC_OBJ_PROJECT;
case ICElement.C_STRUCT:
case ICElement.C_TEMPLATE_STRUCT:
return CPluginImages.DESC_OBJS_STRUCT;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_STRUCT);
case ICElement.C_CLASS:
case ICElement.C_TEMPLATE_CLASS:
return CPluginImages.DESC_OBJS_CLASS;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CLASS);
case ICElement.C_UNION:
case ICElement.C_TEMPLATE_UNION:
return CPluginImages.DESC_OBJS_UNION;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_UNION);
case ICElement.C_TYPEDEF:
return CPluginImages.DESC_OBJS_TYPEDEF;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TYPEDEF);
case ICElement.C_ENUMERATION:
return CPluginImages.DESC_OBJS_ENUMERATION;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ENUMERATION);
case ICElement.C_ENUMERATOR:
return CPluginImages.DESC_OBJS_ENUMERATOR;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ENUMERATOR);
case ICElement.C_FIELD:
return CPluginImages.DESC_OBJS_PUBLIC_FIELD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PUBLIC_FIELD);
case ICElement.C_VARIABLE:
case ICElement.C_TEMPLATE_VARIABLE:
return CPluginImages.DESC_OBJS_VARIABLE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_VARIABLE);
case ICElement.C_METHOD:
case ICElement.C_METHOD_DECLARATION:
case ICElement.C_TEMPLATE_METHOD:
case ICElement.C_TEMPLATE_METHOD_DECLARATION:
return CPluginImages.DESC_OBJS_PUBLIC_METHOD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PUBLIC_METHOD);
case ICElement.C_FUNCTION:
case ICElement.C_TEMPLATE_FUNCTION:
return CPluginImages.DESC_OBJS_FUNCTION;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_FUNCTION);
case ICElement.C_STRUCT_DECLARATION:
case ICElement.C_CLASS_DECLARATION:
@ -257,26 +256,26 @@ public class CElementImageProvider {
case ICElement.C_TEMPLATE_CLASS_DECLARATION:
case ICElement.C_TEMPLATE_STRUCT_DECLARATION:
case ICElement.C_TEMPLATE_UNION_DECLARATION:
return CPluginImages.DESC_OBJS_VAR_DECLARARION;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_VAR_DECLARATION);
case ICElement.C_FUNCTION_DECLARATION:
case ICElement.C_TEMPLATE_FUNCTION_DECLARATION:
return CPluginImages.DESC_OBJS_DECLARARION;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_DECLARATION);
case ICElement.C_INCLUDE:
return CPluginImages.DESC_OBJS_INCLUDE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDE);
case ICElement.C_MACRO:
return CPluginImages.DESC_OBJS_MACRO;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO);
case ICElement.C_NAMESPACE:
return CPluginImages.DESC_OBJS_NAMESPACE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_NAMESPACE);
case ICElement.C_USING:
return CPluginImages.DESC_OBJS_USING;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_USING);
case ICElement.ASM_LABEL:
return CPluginImages.DESC_OBJS_LABEL;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LABEL);
}
return null;
}
@ -338,53 +337,53 @@ public class CElementImageProvider {
switch (type) {
case ICElement.C_VCONTAINER:
if (celement instanceof IBinaryModule) {
return CPluginImages.DESC_OBJS_BINARY;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_BINARY);
} else if (celement instanceof ILibraryReference) {
return CPluginImages.DESC_OBJS_UNKNOWN;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_UNKNOWN);
} else if (celement instanceof IIncludeReference) {
return CPluginImages.DESC_OBJS_INCLUDES_FOLDER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
} else if (celement instanceof IArchiveContainer) {
return CPluginImages.DESC_OBJS_ARCHIVES_CONTAINER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ARCHIVES_CONTAINER);
} else if (celement instanceof IBinaryContainer) {
return CPluginImages.DESC_OBJS_BINARIES_CONTAINER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_BINARIES_CONTAINER);
}
return CPluginImages.DESC_OBJS_CONTAINER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CONTAINER);
case ICElement.C_BINARY: {
IBinary bin = (IBinary)celement;
if (bin.isExecutable()) {
if (bin.hasDebug())
return CPluginImages.DESC_OBJS_CEXEC_DEBUG;
return CPluginImages.DESC_OBJS_CEXEC;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CEXEC_DEBUG);
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CEXEC);
} else if (bin.isSharedLib()) {
return CPluginImages.DESC_OBJS_SHLIB;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SHLIB);
} else if (bin.isCore()) {
return CPluginImages.DESC_OBJS_CORE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CORE);
}
return CPluginImages.DESC_OBJS_BINARY;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_BINARY);
}
case ICElement.C_ARCHIVE:
return CPluginImages.DESC_OBJS_ARCHIVE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ARCHIVE);
case ICElement.C_UNIT: {
ITranslationUnit unit = (ITranslationUnit)celement;
if (unit.isHeaderUnit()) {
return CPluginImages.DESC_OBJS_TUNIT_HEADER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_HEADER);
} else if (unit.isSourceUnit()) {
if (unit.isASMLanguage()) {
return CPluginImages.DESC_OBJS_TUNIT_ASM;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT_ASM);
}
}
return CPluginImages.DESC_OBJS_TUNIT;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TUNIT);
}
case ICElement.C_CCONTAINER:
if (celement instanceof ISourceRoot) {
return CPluginImages.DESC_OBJS_SOURCE_ROOT;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_SOURCE_ROOT);
}
//return DESC_OBJ_FOLDER;
return CPluginImages.DESC_OBJS_CFOLDER;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CFOLDER);
case ICElement.C_PROJECT:
ICProject cp= (ICProject)celement;
@ -549,7 +548,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getStructImageDescriptor(boolean alt){
return alt ? CPluginImages.DESC_OBJS_STRUCT_ALT : CPluginImages.DESC_OBJS_STRUCT;
return alt ? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_STRUCT_ALT) : CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_STRUCT);
}
public static ImageDescriptor getClassImageDescriptor(){
@ -557,7 +556,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getClassImageDescriptor(boolean alt){
return alt ? CPluginImages.DESC_OBJS_CLASS_ALT : CPluginImages.DESC_OBJS_CLASS;
return alt ? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CLASS_ALT) : CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CLASS);
}
public static ImageDescriptor getUnionImageDescriptor(){
@ -565,7 +564,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getUnionImageDescriptor(boolean alt){
return alt ? CPluginImages.DESC_OBJS_UNION_ALT : CPluginImages.DESC_OBJS_UNION;
return alt ? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_UNION_ALT) : CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_UNION);
}
public static ImageDescriptor getTypedefImageDescriptor(){
@ -573,7 +572,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getTypedefImageDescriptor(boolean alt){
return alt ? CPluginImages.DESC_OBJS_TYPEDEF_ALT : CPluginImages.DESC_OBJS_TYPEDEF;
return alt ? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TYPEDEF_ALT) : CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_TYPEDEF);
}
public static ImageDescriptor getEnumerationImageDescriptor(){
@ -581,29 +580,29 @@ public class CElementImageProvider {
}
public static ImageDescriptor getEnumerationImageDescriptor(boolean alt){
return alt ? CPluginImages.DESC_OBJS_ENUMERATION_ALT : CPluginImages.DESC_OBJS_ENUMERATION;
return alt ? CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ENUMERATION_ALT) : CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ENUMERATION);
}
public static ImageDescriptor getEnumeratorImageDescriptor(){
return CPluginImages.DESC_OBJS_ENUMERATOR;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_ENUMERATOR);
}
public static ImageDescriptor getFieldImageDescriptor(ASTAccessVisibility visibility) {
if (visibility == ASTAccessVisibility.PUBLIC)
return CPluginImages.DESC_OBJS_PUBLIC_FIELD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PUBLIC_FIELD);
if( visibility == ASTAccessVisibility.PROTECTED)
return CPluginImages.DESC_OBJS_PROTECTED_FIELD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PROTECTED_FIELD);
return CPluginImages.DESC_OBJS_PRIVATE_FIELD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PRIVATE_FIELD);
}
public static ImageDescriptor getMethodImageDescriptor(ASTAccessVisibility visibility) {
if( visibility == ASTAccessVisibility.PUBLIC)
return CPluginImages.DESC_OBJS_PUBLIC_METHOD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PUBLIC_METHOD);
if( visibility == ASTAccessVisibility.PROTECTED)
return CPluginImages.DESC_OBJS_PROTECTED_METHOD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PROTECTED_METHOD);
return CPluginImages.DESC_OBJS_PRIVATE_METHOD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_PRIVATE_METHOD);
}
public static ImageDescriptor getVariableImageDescriptor(){
@ -611,7 +610,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getLocalVariableImageDescriptor(){
return CPluginImages.DESC_OBJS_LOCAL_VARIABLE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LOCAL_VARIABLE);
}
public static ImageDescriptor getFunctionImageDescriptor(){
@ -643,7 +642,7 @@ public class CElementImageProvider {
}
public static ImageDescriptor getKeywordImageDescriptor(){
return CPluginImages.DESC_OBJS_KEYWORD;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_KEYWORD);
}
}

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsLabelProvider.java
View file

@ -10,14 +10,16 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.wizards.classwizard;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider;
public final class MethodStubsLabelProvider implements ITableLabelProvider {
@ -33,7 +35,7 @@ public final class MethodStubsLabelProvider implements ITableLabelProvider {
if (descriptor != null) {
return CUIPlugin.getImageDescriptorRegistry().get(descriptor);
}
return CPluginImages.get(CPluginImages.IMG_OBJS_PUBLIC_METHOD);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_PUBLIC_METHOD);
}
/*

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java
View file

@ -22,10 +22,9 @@ import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
import org.eclipse.cdt.core.settings.model.ICLanguageSetting;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* A settings processor that imports and exports include paths.
@ -42,7 +41,7 @@ public class IncludePathsSettingsProcessor extends SettingsProcessor {
public Image getIcon() {
return CUIPlugin.getImageDescriptorRegistry().get(CPluginImages.DESC_OBJS_INCLUDES_FOLDER);
return CUIPlugin.getImageDescriptorRegistry().get(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER));
}
public String getDisplayName() {

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java
View file

@ -25,12 +25,10 @@ import org.xml.sax.SAXException;
import org.eclipse.cdt.core.settings.model.CMacroEntry;
import org.eclipse.cdt.core.settings.model.ICLanguageSetting;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* A settings processor that imports and exports symbols.
*
@ -48,7 +46,7 @@ public class MacroSettingsProcessor extends SettingsProcessor {
public Image getIcon() {
return CUIPlugin.getImageDescriptorRegistry().get(CPluginImages.DESC_OBJS_MACRO);
return CUIPlugin.getImageDescriptorRegistry().get(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO));
}
public String getDisplayName() {

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java
View file

@ -51,10 +51,10 @@ import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider;
import org.eclipse.cdt.internal.ui.wizards.settingswizards.IProjectSettingsWizardPageStrategy.MessageType;
@ -244,7 +244,7 @@ abstract public class ProjectSettingsWizardPage extends WizardPage implements IP
configViewer.setContentProvider(new ListContentProvider());
configViewer.setLabelProvider(new LabelProvider() {
@Override public Image getImage(Object element) {
return CPluginImages.get(CPluginImages.IMG_OBJS_CONFIG);
return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CONFIG);
}
@Override public String getText(Object element) {
ICConfigurationDescription config = (ICConfigurationDescription)element;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/ProjectConfigurationController.java
View file

@ -28,8 +28,8 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.workingsets.IWorkingSetProjectConfiguration.ISnapshot;
/**
@ -154,7 +154,7 @@ public class ProjectConfigurationController implements IWorkingSetProjectConfigu
private IWorkingSetProjectConfiguration.ISnapshot projectConfig;
private WorkbenchLabelProvider wbLabels = new WorkbenchLabelProvider();
private Image configImage = CPluginImages.get(CPluginImages.IMG_OBJS_CONFIG);
private Image configImage = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CONFIG);
private Font defaultFont;
private ResourceManager fonts = new LocalResourceManager(JFaceResources.getResources());

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationBlock.java
View file

@ -43,7 +43,8 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog;
/**
@ -388,7 +389,7 @@ public class WorkingSetConfigurationBlock {
*/
private class WSConfigsLabelProvider extends LabelProvider implements IFontProvider {
private WorkbenchLabelProvider wbLabels = new WorkbenchLabelProvider();
private Image configImage = CPluginImages.get(CPluginImages.IMG_OBJS_CONFIG);
private Image configImage = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CONFIG);
private Font defaultFont;
private ResourceManager fonts = new LocalResourceManager(JFaceResources.getResources());

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTSharedImages.java
View file

@ -110,7 +110,7 @@ public class CDTSharedImages {
public static final String IMG_OBJS_INCLUDES_FOLDER_SYSTEM = "icons/obj16/fldr_sys_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_INCLUDES_FOLDER_WORKSPACE = "icons/obj16/wsp_includefolder.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_ORDER = "icons/obj16/cp_order_obj.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_EXCLUDSION_FILTER_ATTRIB = "icons/obj16/exclusion_filter_attrib.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_EXCLUSION_FILTER_ATTRIB = "icons/obj16/exclusion_filter_attrib.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_SOURCE_ATTACH_ATTRIB = "icons/obj16/source_attach_attrib.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_IMPORT_SETTINGS = "icons/obj16/import_settings_wiz.gif"; //$NON-NLS-1$
public static final String IMG_OBJS_EXPORT_SETTINGS = "icons/obj16/export_settings_wiz.gif"; //$NON-NLS-1$

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java
View file

@ -16,8 +16,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.model.WorkbenchAdapter;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
*/
public abstract class CElementGrouping extends WorkbenchAdapter implements IAdaptable {
@ -65,13 +63,13 @@ public abstract class CElementGrouping extends WorkbenchAdapter implements IAdap
public ImageDescriptor getImageDescriptor(Object object) {
switch (type) {
case INCLUDES_GROUPING:
return CPluginImages.DESC_OBJS_INCCONT;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_INCCONT);
case NAMESPACE_GROUPING:
return CPluginImages.DESC_OBJS_NAMESPACE;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_NAMESPACE);
case CLASS_GROUPING:
return CPluginImages.DESC_OBJS_CLASS;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_CLASS);
case MACROS_GROUPING:
return CPluginImages.DESC_OBJS_MACRO;
return CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_MACRO);
}
return super.getImageDescriptor(object);
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
View file

@ -30,11 +30,11 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.dialogs.PropertyPage;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
import org.eclipse.cdt.internal.ui.CHelpProviderManager;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.CUIMessages;
import org.eclipse.cdt.internal.ui.text.CHelpBookDescriptor;
import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
@ -59,7 +59,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements
public CHelpBookListLabelProvider() {
fRegistry= CUIPlugin.getImageDescriptorRegistry();
fHelpProviderIcon= CPluginImages.DESC_OBJS_LIBRARY;
fHelpProviderIcon= CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_LIBRARY);
}
@Override

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java
View file

@ -49,9 +49,9 @@ import org.eclipse.cdt.core.settings.model.ICExternalSetting;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
public abstract class AbstractExportTab extends AbstractCPropertyTab {
@ -65,9 +65,9 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
// boolean savedShowBI = false;
// List incs;
public static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM);
public static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE);
public static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
public static final Image IMG_FS = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_FILESYSTEM);
public static final Image IMG_WS = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_WORKSPACE);
public static final Image IMG_MK = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_MACRO);
private static final String ALL = Messages.AbstractExportTab_0;
private static final String LIST = Messages.AbstractExportTab_1;
private static Map<String, String> names_l = new HashMap<String, String>();

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
View file

@ -68,8 +68,8 @@ import org.eclipse.cdt.core.settings.model.ICSettingBase;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.MultiLanguageSetting;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
@ -117,12 +117,12 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
private static final Comparator<Object> comp = CDTListComparator.getInstance();
private final static Image IMG_FOLDER = CPluginImages.get(CPluginImages.IMG_OBJS_FOLDER);
private final static Image IMG_INCLUDES_FOLDER = CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_FOLDER);
private final static Image IMG_BUILTIN_FOLDER = CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_FOLDER_SYSTEM);
private final static Image IMG_WORKSPACE = CPluginImages.get(CPluginImages.IMG_WORKSPACE);
private final static Image IMG_INCLUDES_FOLDER_WORKSPACE = CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_FOLDER_WORKSPACE);
private final static Image IMG_MACRO = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
private final static Image IMG_FOLDER = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_FOLDER);
private final static Image IMG_INCLUDES_FOLDER = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER);
private final static Image IMG_BUILTIN_FOLDER = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER_SYSTEM);
private final static Image IMG_WORKSPACE = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_WORKSPACE);
private final static Image IMG_INCLUDES_FOLDER_WORKSPACE = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_INCLUDES_FOLDER_WORKSPACE);
private final static Image IMG_MACRO = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_MACRO);
private static final int[] DEFAULT_SASH_WEIGHTS = new int[] { 10, 30 };
@Override

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
View file

@ -91,11 +91,11 @@ import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.core.settings.model.MultiItemsHolder;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog;
import org.eclipse.cdt.internal.ui.newui.Messages;
@ -152,7 +152,7 @@ implements
private Map<URL, Image> loadedIcons = new HashMap<URL, Image>();
private final Image IMG_WARN = CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_WARNING);
private final Image IMG_WARN = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_WARNING);
/*
* Dialog widgets
*/

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java
View file

@ -53,8 +53,8 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry;
import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
/**
@ -64,8 +64,8 @@ import org.eclipse.cdt.internal.ui.newui.Messages;
*/
public abstract class CLocationTab extends AbstractCPropertyTab {
private final Image IMG_EN = CPluginImages.get(CPluginImages.IMG_OBJS_CFOLDER);
private final Image IMG_FI = CPluginImages.get(CPluginImages.IMG_OBJS_EXCLUDSION_FILTER_ATTRIB);
private final Image IMG_EN = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_CFOLDER);
private final Image IMG_FI = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_EXCLUSION_FILTER_ATTRIB);
Label label;
TreeViewer tree;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java
View file

@ -41,9 +41,9 @@ import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceComparator;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.dialogs.TypedElementSelectionValidator;
import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter;
import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages;
@ -246,7 +246,7 @@ public class ExPatternDialog extends StatusDialog {
@Override
public Image getImage(Object element) {
ImageDescriptorRegistry registry= CUIPlugin.getImageDescriptorRegistry();
return registry.get(CPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB);
return registry.get(CDTSharedImages.getImageDescriptor(CDTSharedImages.IMG_OBJS_EXCLUSION_FILTER_ATTRIB));
}
@Override

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ImportExportWizardButtons.java
View file

@ -23,7 +23,8 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsExportWizard;
import org.eclipse.cdt.internal.ui.wizards.settingswizards.ProjectSettingsImportWizard;
@ -51,7 +52,7 @@ public class ImportExportWizardButtons {
Button importButton = new Button(comp, SWT.NONE);
importButton.setText(Messages.IncludeTab_import);
importButton.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_IMPORT_SETTINGS));
importButton.setImage(CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_IMPORT_SETTINGS));
importButton.addSelectionListener(new SelectionAdapter() {
@Override public void widgetSelected(SelectionEvent e) {
boolean finishedPressed = launchWizard(parent.getShell(), selection, false);
@ -64,7 +65,7 @@ public class ImportExportWizardButtons {
Button exportButton = new Button(comp, SWT.NONE);
exportButton.setText(Messages.IncludeTab_export);
exportButton.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_EXPORT_SETTINGS));
exportButton.setImage(CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_EXPORT_SETTINGS));
exportButton.addSelectionListener(new SelectionAdapter() {
@Override public void widgetSelected(SelectionEvent e) {
launchWizard(parent.getShell(), selection, true);

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java
View file

@ -29,8 +29,8 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICMultiConfigDescription;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
/**
@ -209,8 +209,8 @@ public class IncludeDialog extends AbstractPropertyDialog {
}
static private Image getWspImage(boolean isWsp) {
final Image IMG_WORKSPACE = CPluginImages.get(CPluginImages.IMG_WORKSPACE);
final Image IMG_FILESYSTEM = CPluginImages.get(CPluginImages.IMG_OBJS_FOLDER);
final Image IMG_WORKSPACE = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_WORKSPACE);
final Image IMG_FILESYSTEM = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_FOLDER);
return isWsp ? IMG_WORKSPACE : IMG_FILESYSTEM;
}

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java
View file

@ -62,9 +62,9 @@ import org.eclipse.cdt.core.settings.model.extension.CFolderData;
import org.eclipse.cdt.core.settings.model.extension.CLanguageData;
import org.eclipse.cdt.core.settings.model.extension.CResourceData;
import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
/**
@ -111,7 +111,7 @@ public class StructureTreeTab extends AbstractCPropertyTab {
}
private static final String BL = "["; //$NON-NLS-1$
private static final String BR = "]"; //$NON-NLS-1$
private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_REFACTORING_ERROR);
private static final Image IMG = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_REFACTORING_ERROR);
private static final int NESTING_CFG = 5;
private static final int NESTING_MAX = 16;
private static final String NULL = "<NULL>"; //$NON-NLS-1$

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
View file

@ -45,16 +45,16 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.ui.newui.PageLayout;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.newui.Messages;
public class CDTMainWizardPage extends WizardNewProjectCreationPage implements IWizardItemsListListener {
private static final Image IMG_CATEGORY = CPluginImages.get(CPluginImages.IMG_OBJS_SEARCHFOLDER);
private static final Image IMG_ITEM = CPluginImages.get(CPluginImages.IMG_OBJS_VARIABLE);
private static final Image IMG_CATEGORY = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_SEARCHFOLDER);
private static final Image IMG_ITEM = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_VARIABLE);
public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.NewModelProjectWizardPage"; //$NON-NLS-1$

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java
View file

@ -23,10 +23,9 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.cdt.internal.ui.CPluginImages;
/**
* This class is basic implementation for ICWizardHandler interface.
* It is independent of managed build system, and, so, almost useless
@ -47,8 +46,8 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
*
*/
public class CWizardHandler implements Cloneable {
protected static final Image IMG0 = CPluginImages.get(CPluginImages.IMG_EMPTY);
protected static final Image IMG1 = CPluginImages.get(CPluginImages.IMG_PREFERRED);
protected static final Image IMG0 = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_EMPTY);
protected static final Image IMG1 = CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_PREFERRED);
protected String head;
protected String name;

18
core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java
View file

@ -77,7 +77,8 @@ import org.eclipse.ui.views.navigator.ResourceComparator;
import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
import org.eclipse.cdt.ui.CDTUIImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CDTSharedImages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.newui.CDTStatusInfo;
import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter;
@ -489,16 +490,11 @@ public class FileListControl {
private String[] oldValue;
//images
private final Image IMG_ADD = CDTUIImages
.get(CDTUIImages.IMG_FILELIST_ADD);
private final Image IMG_DEL = CDTUIImages
.get(CDTUIImages.IMG_FILELIST_DEL);
private final Image IMG_EDIT = CDTUIImages
.get(CDTUIImages.IMG_FILELIST_EDIT);
private final Image IMG_MOVEUP = CDTUIImages
.get(CDTUIImages.IMG_FILELIST_MOVEUP);
private final Image IMG_MOVEDOWN = CDTUIImages
.get(CDTUIImages.IMG_FILELIST_MOVEDOWN);
private final Image IMG_ADD = CDTSharedImages.getImage(CDTSharedImages.IMG_FILELIST_ADD);
private final Image IMG_DEL = CDTSharedImages.getImage(CDTSharedImages.IMG_FILELIST_DEL);
private final Image IMG_EDIT = CDTSharedImages.getImage(CDTSharedImages.IMG_FILELIST_EDIT);
private final Image IMG_MOVEUP = CDTSharedImages.getImage(CDTSharedImages.IMG_FILELIST_MOVEUP);
private final Image IMG_MOVEDOWN = CDTSharedImages.getImage(CDTSharedImages.IMG_FILELIST_MOVEDOWN);
/**
* Constructor