diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java index 80d0e2849cb..81c73526ac6 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java @@ -148,10 +148,10 @@ protected Image getImage(String iconURI, LocalResourceManager resourceManager) { ImageDescriptor iconDescriptor = resUtils.imageDescriptorFromURI(URI.createURI(iconURI)); if (iconDescriptor != null) { try { - image = resourceManager.createImage(iconDescriptor); + image = resourceManager.create(iconDescriptor); } catch (DeviceResourceException e) { iconDescriptor = ImageDescriptor.getMissingImageDescriptor(); - image = resourceManager.createImage(iconDescriptor); + image = resourceManager.create(iconDescriptor); // as we replaced the failed icon, log the message once. if (Policy.DEBUG_MENUS) { WorkbenchSWTActivator.trace(Policy.DEBUG_MENUS_FLAG, "failed to create image " + iconURI, e); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java index 264343bf639..9555d5fbc10 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/action/MenuManager.java @@ -274,7 +274,7 @@ public void fill(Menu parent, int index) { if (image != null) { LocalResourceManager localManager = new LocalResourceManager(JFaceResources.getResources()); - menuItem.setImage(localManager.createImage(image)); + menuItem.setImage(localManager.create(image)); disposeOldImages(); imageManager = localManager; } @@ -889,7 +889,7 @@ public void update(String property) { } } else if (IAction.IMAGE.equals(property) && image != null) { LocalResourceManager localManager = new LocalResourceManager(JFaceResources.getResources()); - menu.getParentItem().setImage(localManager.createImage(image)); + menu.getParentItem().setImage(localManager.create(image)); disposeOldImages(); imageManager = localManager; } diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java index 5db6b70a93e..6df15edbbd2 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/resource/ImageRegistry.java @@ -333,7 +333,7 @@ public void dispose() { if (table != null) { for (Entry entry : table.values()) { if (entry.image != null) { - manager.destroyImage(entry.descriptor); + manager.destroy(entry.descriptor); } } table = null; diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java index 28d39c2303e..4a0ee9d9d55 100644 --- a/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java +++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/wizard/Wizard.java @@ -207,7 +207,7 @@ public void dispose() { } // dispose of image if (defaultImage != null) { - JFaceResources.getResources().destroyImage(defaultImageDescriptor); + JFaceResources.getResources().destroy(defaultImageDescriptor); defaultImage = null; } } diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java index 9e70cf47fa7..26908361f52 100644 --- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java +++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormFonts.java @@ -78,7 +78,7 @@ public void destroyFont(Font previouslyCreatedFont) { public Font getBoldFont(Display display, Font font) { checkHashMaps(); BoldFontDescriptor desc = new BoldFontDescriptor(font); - Font result = manager.getResourceManager(display).createFont(desc); + Font result = manager.getResourceManager(display).create(desc); descriptors.put(result, desc); return result; } @@ -88,7 +88,7 @@ public boolean markFinished(Font boldFont, Display display) { BoldFontDescriptor desc = descriptors.get(boldFont); if (desc != null) { LocalResourceManager resourceManager = manager.getResourceManager(display); - resourceManager.destroyFont(desc); + resourceManager.destroy(desc); if (resourceManager.find(desc) == null) { descriptors.remove(boldFont); validateHashMaps(); diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java index d01b67c67e0..f4aa7e1c9fb 100644 --- a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java +++ b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormImages.java @@ -348,7 +348,7 @@ public Image getGradient(Color[] colors, int[] percents, private synchronized Image getGradient(AbstractImageDescriptor desc, Display display) { checkHashMaps(); - Image result = manager.getResourceManager(display).createImage(desc); + Image result = manager.getResourceManager(display).create(desc); descriptors.put(Integer.valueOf(result.hashCode()), desc); return result; } @@ -359,7 +359,7 @@ public synchronized boolean markFinished(Image image, Display display) { AbstractImageDescriptor desc = descriptors.get(imageHashCode); if (desc != null) { LocalResourceManager resourceManager = manager.getResourceManager(display); - resourceManager.destroyImage(desc); + resourceManager.destroy(desc); if (resourceManager.find(desc) == null) { descriptors.remove(imageHashCode); validateHashMaps(); diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java index b12f9598874..6bafc8d0d7a 100644 --- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java +++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java @@ -134,7 +134,7 @@ private Image getImage(IEditorDescriptor editorDesc) { if (imageDesc == null) { return null; } - return IDEWorkbenchPlugin.getDefault().getResourceManager().createImage(imageDesc); + return IDEWorkbenchPlugin.getDefault().getResourceManager().create(imageDesc); } /** diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java index d8471f42293..6c4eeaf07cf 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java @@ -330,7 +330,7 @@ public void widgetSelected(SelectionEvent e) { Bundle bundle = FrameworkUtil.getBundle(getClass()); URL goToFolderUrl = FileLocator.find(bundle, IPath.fromOSString("icons/full/obj16/goto_input.png"), //$NON-NLS-1$ null); - goToLocationButton.setImage(resourceManager.createImage(ImageDescriptor.createFromURL(goToFolderUrl))); + goToLocationButton.setImage(resourceManager.create(ImageDescriptor.createFromURL(goToFolderUrl))); goToLocationButton.setToolTipText(LOCATION_BUTTON_TOOLTIP); goToLocationButton.addSelectionListener(new SelectionAdapter() { diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java index ab9b8f780ec..261db153ab1 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java @@ -274,7 +274,7 @@ private void createOption(Composite optionsArea, final FormToolkit toolkit, fina ISharedImages images = PlatformUI.getWorkbench().getSharedImages(); imageDesc = images.getImageDescriptor(ISharedImages.IMG_TOOL_NEW_WIZARD); } - addLabel.setImage(resourceManager.createImage(imageDesc)); + addLabel.setImage(resourceManager.create(imageDesc)); Hyperlink addLink = toolkit.createHyperlink(optionsArea, text, SWT.WRAP); addLink.setForeground(linkColor); diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerField.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerField.java index fd42ff7ba77..b5993672440 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerField.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/MarkerField.java @@ -101,7 +101,7 @@ public Image annotateImage(MarkerItem item, Image image) { } } if (descriptors[IDecoration.TOP_RIGHT] != null || descriptors[IDecoration.BOTTOM_RIGHT] != null) - image = getImageManager().createImage(new DecorationOverlayIcon(image, descriptors)); + image = getImageManager().create(new DecorationOverlayIcon(image, descriptors)); } } return image; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java index ff520b53d7f..f000a7f2377 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java @@ -143,7 +143,7 @@ public Image getColumnImage(Object element, int columnIndex) { if (decorate && isLocked(category) && lockDescriptor.isPresent()) { descriptor = new DecorationOverlayIcon(descriptor, lockDescriptor.get(), IDecoration.TOP_RIGHT); } - return manager.createImage(descriptor); + return manager.create(descriptor); } catch (DeviceResourceException e) { WorkbenchPlugin.log(e); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java index 8d01dfed184..04af55dbc19 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java @@ -49,7 +49,7 @@ public Image getImage(Object element) { try { ImageDescriptor descriptor = getDescriptor(element); if (descriptor != null) { - return manager.createImage(descriptor); + return manager.create(descriptor); } } catch (DeviceResourceException e) { // ignore diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationResult.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationResult.java index 7333efccbf1..600bc29cd43 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationResult.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationResult.java @@ -88,7 +88,7 @@ Image decorateWithOverlays(Image image, ResourceManager manager) { Rectangle bounds = image.getBounds(); Point size = new Point(bounds.width, bounds.height); DecorationOverlayIcon icon = new DecorationOverlayIcon(image, descriptors, size); - return manager.createImage(icon); + return manager.create(icon); } /** diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/TreeManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/TreeManager.java index 0954b6a6e14..44e8d0812bb 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/TreeManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/TreeManager.java @@ -268,7 +268,7 @@ public Image getImage() { if (imageDescriptor == null) { return null; } - image = resourceManager.createImage(imageDescriptor); + image = resourceManager.create(imageDescriptor); } return image; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java index 3224fe2450f..ad35b756f0d 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java @@ -77,7 +77,7 @@ protected Object getInput(WorkbenchPage page) { if (lrm == null) { lrm = new LocalResourceManager(JFaceResources.getResources()); } - item.setImage(lrm.createImage(imageDescriptor)); + item.setImage(lrm.create(imageDescriptor)); } item.putData(K_PAGE, viewPage); String name = pageSwitcher.getName(viewPage); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java index 29e96ac8688..7c9c2aa6a15 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java @@ -406,7 +406,7 @@ public Image getColumnImage(Object element, int index) { return null; } try { - return localResourceManager.createImage(imageDescriptor); + return localResourceManager.create(imageDescriptor); } catch (final DeviceResourceException e) { final String message = "Problem retrieving image for a command '" //$NON-NLS-1$ + commandId + '\''; diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java index f9f72e807b7..ecbc902dacf 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java @@ -743,7 +743,7 @@ public Table createTable(Composite composite, int defaultOrientation) { table = new Table(tableComposite, SWT.SINGLE | SWT.FULL_SELECTION); textLayout = new TextLayout(table.getDisplay()); textLayout.setOrientation(defaultOrientation); - Font boldFont = resourceManager.createFont(FontDescriptor.createFrom(table.getFont()).setStyle(SWT.BOLD)); + Font boldFont = resourceManager.create(FontDescriptor.createFrom(table.getFont()).setStyle(SWT.BOLD)); textLayout.setFont(table.getFont()); textLayout.setText(QuickAccessMessages.QuickAccess_AvailableCategories); int maxProviderWidth = (textLayout.getBounds().width); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessEntry.java index a34e58a7327..3473ff5e47a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessEntry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessEntry.java @@ -132,7 +132,7 @@ private Image findOrCreateImage(ImageDescriptor imageDescriptor, ResourceManager Image image = resourceManager.find(imageDescriptor); if (image == null) { try { - image = resourceManager.createImage(imageDescriptor); + image = resourceManager.create(imageDescriptor); } catch (DeviceResourceException e) { WorkbenchPlugin.log(e); } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java index b54ddab0b67..9218cf7cc8a 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java @@ -119,9 +119,9 @@ private Image getIcon(Job job) { // Create an image from the job's icon property or family if (property instanceof ImageDescriptor) { - return manager.createImage((ImageDescriptor) property); + return manager.create((ImageDescriptor) property); } else if (property instanceof URL) { - return manager.createImage(ImageDescriptor.createFromURL((URL) property)); + return manager.create(ImageDescriptor.createFromURL((URL) property)); } else { // Let the progress manager handle the resource management return ProgressManager.getInstance().getIconFor(job); diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java index c5a58fe227a..d90bc93352f 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java @@ -855,10 +855,10 @@ private void updateIcons() { MenuItem item = (MenuItem) widget; LocalResourceManager m = new LocalResourceManager(JFaceResources.getResources()); try { - item.setImage(icon == null ? null : m.createImage(icon)); + item.setImage(icon == null ? null : m.create(icon)); } catch (DeviceResourceException e) { icon = ImageDescriptor.getMissingImageDescriptor(); - item.setImage(m.createImage(icon)); + item.setImage(m.create(icon)); // as we replaced the failed icon, log the message once. StatusManager.getManager() .handle(new Status(IStatus.ERROR, WorkbenchPlugin.PI_WORKBENCH, "Failed to load image", e)); //$NON-NLS-1$ @@ -868,9 +868,9 @@ private void updateIcons() { } else if (widget instanceof ToolItem) { ToolItem item = (ToolItem) widget; LocalResourceManager m = new LocalResourceManager(JFaceResources.getResources()); - item.setDisabledImage(disabledIcon == null ? null : m.createImage(disabledIcon)); - item.setHotImage(hoverIcon == null ? null : m.createImage(hoverIcon)); - item.setImage(icon == null ? null : m.createImage(icon)); + item.setDisabledImage(disabledIcon == null ? null : m.create(disabledIcon)); + item.setHotImage(hoverIcon == null ? null : m.create(hoverIcon)); + item.setImage(icon == null ? null : m.create(icon)); disposeOldImages(); localResourceManager = m; } diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java index ebd3579bcf3..0d7b5f75b79 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java @@ -64,7 +64,7 @@ public Image getImage(Object element) { Image image = (Image) images.get(imageDesc); if (image == null) { try { - image = resourceManager.createImage(imageDesc); + image = resourceManager.create(imageDesc); images.put(imageDesc, image); } catch (DeviceResourceException e) { WorkbenchPlugin.log(getClass(), "getImage", e); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java index 3496f2b85a0..f94b86da366 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/IntroPart.java @@ -96,7 +96,7 @@ public void addPropertyListener(IPropertyListener l) { */ @Override public void dispose() { - imageDescriptor.ifPresent(JFaceResources.getResources()::destroyImage); + imageDescriptor.ifPresent(JFaceResources.getResources()::destroy); titleImage = null; // Clear out the property change listeners as we // should not be notifying anyone after the part diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java index 013fb7d3914..c97bada5666 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/WorkbenchPart.java @@ -105,7 +105,7 @@ public void addPropertyListener(IPropertyListener l) { public void dispose() { imageDescriptor.ifPresent(d -> { if (Display.getCurrent() != null) { - JFaceResources.getResources().destroyImage(d); + JFaceResources.getResources().destroy(d); } // otherwise Device already destroyed => ignore }); titleImage = null; @@ -300,7 +300,7 @@ protected void setTitleImage(Image titleImage) { } this.titleImage = titleImage; firePropertyChange(IWorkbenchPart.PROP_TITLE); - imageDescriptor.ifPresent(JFaceResources.getResources()::destroyImage); + imageDescriptor.ifPresent(JFaceResources.getResources()::destroy); imageDescriptor = Optional.empty(); } diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet015DelayTextModifyEvents.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet015DelayTextModifyEvents.java index 09277547cc9..4c7fa5cf129 100644 --- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet015DelayTextModifyEvents.java +++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet015DelayTextModifyEvents.java @@ -79,7 +79,7 @@ private static Shell createShell() { // you are done with it) ResourceManager resourceManager = new LocalResourceManager(JFaceResources.getResources()); final Font shellFont = shell.getFont(); - final Font italicFont = resourceManager.createFont(FontDescriptor.createFrom(shellFont).setStyle(SWT.ITALIC)); + final Font italicFont = resourceManager.create(FontDescriptor.createFrom(shellFont).setStyle(SWT.ITALIC)); IObservableValue stale1 = Observables.observeStale(delayed1); IObservableValue stale2 = Observables.observeStale(delayed2); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/LazyResourceManagerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/LazyResourceManagerTest.java index e682a696815..4c106fd7242 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/LazyResourceManagerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/LazyResourceManagerTest.java @@ -30,8 +30,9 @@ import junit.framework.TestCase; +@SuppressWarnings({ "rawtypes", "unchecked" }) public class LazyResourceManagerTest extends TestCase { - private static class CachableTestDescriptor extends DeviceResourceDescriptor { + private static class CachableTestDescriptor extends DeviceResourceDescriptor { CachableTestDescriptor() { super(true); } @@ -46,7 +47,7 @@ public void destroyResource(Object previouslyCreatedObject) { } } - private static class UncachableTestDescriptor extends DeviceResourceDescriptor { + private static class UncachableTestDescriptor extends DeviceResourceDescriptor { UncachableTestDescriptor() { super(false); } @@ -200,7 +201,6 @@ void assertDestroyed(AtomicReference previousInstance, /** * Creates multiple resources for 2 Descriptors. Only 1 of them can be cached **/ - @SuppressWarnings("unchecked") public void testLazyResourceManagerRefCounting() { TestResourceManager tst = new TestResourceManager(); LazyResourceManager mgr = new LazyResourceManager(1, tst); @@ -361,7 +361,6 @@ public void testLazyResourceManagerLRU() { assertCached(expected2, mgr, tst, descriptor2); // 2 still cached, because recently used } - @SuppressWarnings("unchecked") public void testNullDescriptor() { TestResourceManager tst = new TestResourceManager(); LazyResourceManager mgr = new LazyResourceManager(2, tst); diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/ResourceManagerTest.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/ResourceManagerTest.java index 156896e90f6..d3a387a1593 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/ResourceManagerTest.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/ResourceManagerTest.java @@ -41,7 +41,7 @@ */ public class ResourceManagerTest extends TestCase { - private DeviceResourceDescriptor[] descriptors; + private DeviceResourceDescriptor[] descriptors; private Image testImage; private Image testImage2; private Color testColor; @@ -54,11 +54,11 @@ private static ImageDescriptor getImage(String path) { return ResourceLocator.imageDescriptorFromBundle("org.eclipse.jface.tests", path).orElse(null); } - private static final class TestDescriptor extends DeviceResourceDescriptor { - DeviceResourceDescriptor toWrap; + private static final class TestDescriptor extends DeviceResourceDescriptor { + DeviceResourceDescriptor toWrap; public static int refCount = 0; - public TestDescriptor(DeviceResourceDescriptor toWrap) { + public TestDescriptor(DeviceResourceDescriptor toWrap) { this.toWrap = toWrap; } @@ -77,9 +77,7 @@ public void destroyResource(Object previouslyCreatedObject) { @Override public boolean equals(Object arg0) { - if (arg0 instanceof TestDescriptor description) { - TestDescriptor td = description; - + if (arg0 instanceof TestDescriptor td) { return td.toWrap.equals(toWrap); } @@ -107,33 +105,34 @@ protected void setUp() throws Exception { // If you modify this array, be sure to adjust numDupes as well. Note that some // tests index the array directly, so it is a good idea to always add to this // array rather than remove from it. - descriptors = new DeviceResourceDescriptor[] { new TestDescriptor(getImage("icons/anything.gif")), - new TestDescriptor(getImage("icons/anything.gif")), new TestDescriptor(getImage("icons/binary_co.gif")), - new TestDescriptor(getImage("icons/binary_co.gif")), - new TestDescriptor(getImage("icons/mockeditorpart1.gif")), - - new TestDescriptor(getImage("icons/view.gif")), // 5 - new TestDescriptor(ImageDescriptor.createFromImage(testImage2)), - new TestDescriptor(ImageDescriptor.createFromImage(testImage)), - new TestDescriptor(ImageDescriptor.createFromImage(testImage)), - new TestDescriptor(ImageDescriptor.createFromImage(testImage)), - - new TestDescriptor(ImageDescriptor.createFromImage(testImage)), // 10 - new TestDescriptor(ImageDescriptor.createFromImage(testImage2)), - new TestDescriptor(ColorDescriptor.createFrom(new RGB(10, 200, 54))), - new TestDescriptor(ColorDescriptor.createFrom(new RGB(10, 200, 54))), - new TestDescriptor(ColorDescriptor.createFrom(new RGB(200, 220, 54))), - - new TestDescriptor(ColorDescriptor.createFrom(testColor)), // 15 - new TestDescriptor(ColorDescriptor.createFrom(testColor)), - new TestDescriptor(ColorDescriptor.createFrom(testColor2)), - new TestDescriptor(ColorDescriptor.createFrom(testColor)), - new TestDescriptor(ColorDescriptor.createFrom(testColor)), - - new TestDescriptor(ColorDescriptor.createFrom(testColor2)), // 20 - new TestDescriptor(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("1"))), - new TestDescriptor(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("1"))), - new TestDescriptor(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("2"))), + descriptors = new DeviceResourceDescriptor[] { new TestDescriptor<>(getImage("icons/anything.gif")), + new TestDescriptor<>(getImage("icons/anything.gif")), + new TestDescriptor<>(getImage("icons/binary_co.gif")), + new TestDescriptor<>(getImage("icons/binary_co.gif")), + new TestDescriptor<>(getImage("icons/mockeditorpart1.gif")), + + new TestDescriptor<>(getImage("icons/view.gif")), // 5 + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage2)), + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage)), + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage)), + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage)), + + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage)), // 10 + new TestDescriptor<>(ImageDescriptor.createFromImage(testImage2)), + new TestDescriptor<>(ColorDescriptor.createFrom(new RGB(10, 200, 54))), + new TestDescriptor<>(ColorDescriptor.createFrom(new RGB(10, 200, 54))), + new TestDescriptor<>(ColorDescriptor.createFrom(new RGB(200, 220, 54))), + + new TestDescriptor<>(ColorDescriptor.createFrom(testColor)), // 15 + new TestDescriptor<>(ColorDescriptor.createFrom(testColor)), + new TestDescriptor<>(ColorDescriptor.createFrom(testColor2)), + new TestDescriptor<>(ColorDescriptor.createFrom(testColor)), + new TestDescriptor<>(ColorDescriptor.createFrom(testColor)), + + new TestDescriptor<>(ColorDescriptor.createFrom(testColor2)), // 20 + new TestDescriptor<>(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("1"))), + new TestDescriptor<>(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("1"))), + new TestDescriptor<>(ImageDescriptor.createFromImageDataProvider(new MyImageDataProvider("2"))), }; @@ -170,7 +169,7 @@ public void testDescriptorAllocations() throws Exception { Object[] resources = new Object[descriptors.length]; for (int i = 0; i < descriptors.length; i++) { - DeviceResourceDescriptor next = descriptors[i]; + DeviceResourceDescriptor next = descriptors[i]; Object resource = next.createResource(display); // Ensure that this resource was allocated correctly @@ -186,7 +185,7 @@ public void testDescriptorAllocations() throws Exception { // Deallocate resources directly using the descriptors for (int i = 0; i < descriptors.length; i++) { - DeviceResourceDescriptor next = descriptors[i]; + DeviceResourceDescriptor next = descriptors[i]; next.destroyResource(resources[i]); } @@ -198,7 +197,7 @@ public void testDeviceManagerAllocations() throws Exception { Object[] resources = new Object[descriptors.length]; for (int i = 0; i < descriptors.length; i++) { - DeviceResourceDescriptor next = descriptors[i]; + DeviceResourceDescriptor next = descriptors[i]; Object resource = globalResourceManager.create(next); // Ensure that this resource was allocated correctly @@ -217,7 +216,7 @@ public void testDeviceManagerAllocations() throws Exception { TestDescriptor.refCount); // Deallocate resources directly using the descriptors - for (DeviceResourceDescriptor next : descriptors) { + for (DeviceResourceDescriptor next : descriptors) { globalResourceManager.destroy(next); } } @@ -295,7 +294,7 @@ public void testImageDataResourceAllocations() throws Exception { * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=135088 */ public void testResourceManagerFind() throws Exception { - DeviceResourceDescriptor descriptor = descriptors[0]; + DeviceResourceDescriptor descriptor = descriptors[0]; Object resource = globalResourceManager.find(descriptor); assertNull("Resource should be null since it is not allocated", resource); resource = globalResourceManager.create(descriptor); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/SaveablesView.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/SaveablesView.java index 7080e546927..c0ed0278808 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/SaveablesView.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/manual/SaveablesView.java @@ -100,7 +100,7 @@ public Image getColumnImage(Object obj, int index) { public Image getImage(Object obj) { ImageDescriptor descriptor = ((Saveable) obj) .getImageDescriptor(); - return resourceManager.createImage(descriptor); + return resourceManager.create(descriptor); } } diff --git a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java index b374b800bdc..bc0781fbc71 100644 --- a/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java +++ b/tools/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ComponentLabelProvider.java @@ -137,7 +137,7 @@ public Image getImage(Object element) { @Override public Font getFont(Object element) { if (element instanceof VirtualEntry) { - return resourceManager.createFont(italicFontDescriptor); + return resourceManager.create(italicFontDescriptor); } return null; }