diff options
Diffstat (limited to 'core')
3 files changed, 11 insertions, 11 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java index 0c6b8ccfd92..1f5229102ea 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/build/NewToolChainWizardSelectionPage.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; @@ -30,7 +31,6 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.ui.plugin.AbstractUIPlugin; public class NewToolChainWizardSelectionPage extends WizardPage { @@ -62,8 +62,8 @@ public class NewToolChainWizardSelectionPage extends WizardPage { String iconFile = element.getAttribute("icon"); //$NON-NLS-1$ if (iconFile != null) { - ImageDescriptor desc = CUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), - iconFile); + ImageDescriptor desc = ResourceLocator + .imageDescriptorFromBundle(element.getNamespaceIdentifier(), iconFile).get(); if (desc != null) { item.setImage(desc.createImage()); } @@ -107,7 +107,7 @@ public class NewToolChainWizardSelectionPage extends WizardPage { if (descImage == null) { return null; } - return AbstractUIPlugin.imageDescriptorFromPlugin(element.getNamespaceIdentifier(), descImage); + return ResourceLocator.imageDescriptorFromBundle(element.getNamespaceIdentifier(), descImage).get(); } @Override diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java index 9e9197f23f2..9b5470dad1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/IndexedFilesLabelProvider.java @@ -24,17 +24,17 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.viewers.IDecoration; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ILightweightLabelDecorator; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * A label provider that marks all translation units that are currently part of the index. */ public class IndexedFilesLabelProvider implements ILightweightLabelDecorator { - private static final ImageDescriptor INDEXED = AbstractUIPlugin.imageDescriptorFromPlugin(CUIPlugin.PLUGIN_ID, - "$nl$/icons/ovr16/indexedFile.gif"); //$NON-NLS-1$ + private static final ImageDescriptor INDEXED = ResourceLocator + .imageDescriptorFromBundle(CUIPlugin.PLUGIN_ID, "$nl$/icons/ovr16/indexedFile.gif").get(); //$NON-NLS-1$ public IndexedFilesLabelProvider() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java index 4afc24e5cf0..7d04e8e2872 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java @@ -71,6 +71,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferencePageContainer; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; @@ -100,7 +101,6 @@ import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.ui.plugin.AbstractUIPlugin; /** * It is a parent for all standard CDT property pages @@ -567,7 +567,7 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa * which do not share ICProjectDescription instance. * But some changes may be saved wrong if they are affected * by data from another property pages (Discovery options etc). - + * To enable 2nd mode, just create the following file: * <workspace>/.metadata/.plugins/org.eclipse.cdt.ui/apply_mode */ @@ -1199,9 +1199,9 @@ public abstract class AbstractPage extends PropertyPage implements IPreferencePa URL url = null; String iconName = config.getAttribute(IMAGE_NAME); if (iconName != null) { - idesc = AbstractUIPlugin.imageDescriptorFromPlugin( + idesc = ResourceLocator.imageDescriptorFromBundle( Platform.getBundle(config.getDeclaringExtension().getContributor().getName()).getSymbolicName(), - iconName); + iconName).get(); } if (idesc == null) return null; |