Replace usages of deprecated ResourceManager methods

and specify the type-parameter for DeviceResourceDescriptor in tests.
HannesWell · Jul 1, 2023 · 1fc286e · 1fc286e
1 parent ed5fb60
commit 1fc286e
Show file tree

Hide file tree

Showing 28 changed files with 77 additions and 79 deletions.
diff --git a/...renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...es/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/helpers/EmptyWorkspaceHelper.java b/...es/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
@@ -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/...pse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/ActivityCategoryPreferencePage.java b/...pse.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/...bench/Eclipse UI/org/eclipse/ui/internal/activities/ws/ActivityCategoryLabelProvider.java b/...bench/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/....eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/decorators/DecorationResult.java b/....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/.../org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/cpd/TreeManager.java b/.../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/...rg.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/CyclePageHandler.java b/...rg.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/...g.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java b/...g.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/...ipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/...ipse.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/...eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessEntry.java b/...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/....ui.workbench/Eclipse UI/org/eclipse/ui/internal/statushandlers/LabelProviderWrapper.java b/....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/...les/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/...les/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/.../org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/model/WorkbenchPartLabelProvider.java b/.../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
@@ -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
@@ -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/.../src/org/eclipse/jface/examples/databinding/snippets/Snippet015DelayTextModifyEvents.java b/.../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<Boolean> stale1 = Observables.observeStale(delayed1);
 		IObservableValue<Boolean> stale2 = Observables.observeStale(delayed2);

diff --git a/...s/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/LazyResourceManagerTest.java b/...s/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<Object> {
 		CachableTestDescriptor() {
 			super(true);
 		}
@@ -46,7 +47,7 @@ public void destroyResource(Object previouslyCreatedObject) {
 		}
 	}
 
-	private static class UncachableTestDescriptor extends DeviceResourceDescriptor {
+	private static class UncachableTestDescriptor extends DeviceResourceDescriptor<Object> {
 		UncachableTestDescriptor() {
 			super(false);
 		}
@@ -200,7 +201,6 @@ void assertDestroyed(AtomicReference<DeviceResourceDescriptor> 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);