Switch to the ImageDescriptor in EntryInfo instead of Image.

org.eclipse.wb.core.java/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wb.core.java;singleton:=true
-Bundle-Version: 1.9.4.qualifier
+Bundle-Version: 1.10.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.wb.internal.core.java.Activator
 Bundle-Vendor: %providerName

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/EntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 import org.eclipse.wb.internal.core.utils.state.EditorState;
 
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 
 /**
  * Model of entry on palette.
@@ -62,7 +62,7 @@ public boolean isEnabled() {
 	/**
 	 * @return the icon for visual.
 	 */
-	public abstract Image getIcon();
+	public abstract ImageDescriptor getIcon();
 
 	////////////////////////////////////////////////////////////////////////////
 	//

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/entry/ChooseComponentEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@
 import org.eclipse.wb.internal.core.utils.jdt.ui.JdtUiUtils;
 
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.widgets.Shell;
 
 import java.text.MessageFormat;
@@ -40,7 +40,7 @@
  * @coverage core.editor.palette
  */
 public final class ChooseComponentEntryInfo extends ToolEntryInfo {
-	private static final Image ICON = DesignerPlugin.getImage("palette/ChooseComponent.gif");
+	private static final ImageDescriptor ICON = DesignerPlugin.getImageDescriptor("palette/ChooseComponent.gif");
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -58,7 +58,7 @@ public ChooseComponentEntryInfo() {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		return ICON;
 	}
 

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/entry/ComponentEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -49,6 +49,7 @@
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Shell;
@@ -70,7 +71,7 @@
  */
 public final class ComponentEntryInfo extends ToolEntryInfo {
 	public static final String KEY_SIMULATE_PRESENTATION = "ComponentEntryInfo.simulatePresentation";
-	public static final Image DEFAULT_ICON = DesignerPlugin.getImage("palette/Object.png");
+	public static final ImageDescriptor DEFAULT_ICON = DesignerPlugin.getImageDescriptor("palette/Object.png");
 	private String m_className;
 	private String m_creationId;
 	private String m_enabledScript;
@@ -308,11 +309,11 @@ public Boolean runObject() throws Exception {
 	}
 
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		if (m_icon == null) {
 			return DEFAULT_ICON;
 		}
-		return m_icon;
+		return ImageDescriptor.createFromImage(m_icon);
 	}
 
 	////////////////////////////////////////////////////////////////////////////

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/entry/MarqueeSelectionToolEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 import org.eclipse.wb.internal.core.DesignerPlugin;
 import org.eclipse.wb.internal.core.editor.Messages;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 
 /**
  * Implementation of {@link EntryInfo} that activates {@link MarqueeSelectionTool}.
@@ -25,7 +25,7 @@
  * @coverage core.editor.palette
  */
 public final class MarqueeSelectionToolEntryInfo extends ToolEntryInfo {
-	private static final Image ICON = DesignerPlugin.getImage("palette/MarqueeSelectionTool.png");
+	private static final ImageDescriptor ICON = DesignerPlugin.getImageDescriptor("palette/MarqueeSelectionTool.png");
 	private final MarqueeSelectionTool m_marqueeSelectionTool = new MarqueeSelectionTool();
 
 	////////////////////////////////////////////////////////////////////////////
@@ -43,7 +43,7 @@ public MarqueeSelectionToolEntryInfo() {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		return ICON;
 	}
 

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/entry/SelectionToolEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@
 import org.eclipse.wb.internal.core.editor.Messages;
 import org.eclipse.wb.internal.core.editor.palette.model.entry.IDefaultEntryInfo;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 
 /**
  * Implementation of {@link EntryInfo} that activates {@link SelectionTool}.
@@ -26,7 +26,7 @@
  * @coverage core.editor.palette
  */
 public class SelectionToolEntryInfo extends ToolEntryInfo implements IDefaultEntryInfo {
-	private static final Image ICON = DesignerPlugin.getImage("palette/SelectionTool.gif");
+	private static final ImageDescriptor ICON = DesignerPlugin.getImageDescriptor("palette/SelectionTool.gif");
 	private final SelectionTool m_selectionTool = new SelectionTool();
 
 	////////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,7 @@ public SelectionToolEntryInfo() {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		return ICON;
 	}
 

org.eclipse.wb.core.java/src/org/eclipse/wb/core/editor/palette/model/entry/TabOrderToolEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@
 import org.eclipse.wb.internal.core.editor.Messages;
 import org.eclipse.wb.internal.core.gef.tools.TabOrderTool;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@
  * @coverage core.editor.palette
  */
 public final class TabOrderToolEntryInfo extends ToolEntryInfo {
-	private static final Image ICON = DesignerPlugin.getImage("palette/tab_order.gif");
+	private static final ImageDescriptor ICON = DesignerPlugin.getImageDescriptor("palette/tab_order.gif");
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -58,7 +58,7 @@ public Tool createTool() throws Exception {
 	}
 
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		return ICON;
 	}
 }

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/DesignerPalette.java

@@ -278,7 +278,7 @@ public boolean isEnabled() {
 
 					@Override
 					public ImageDescriptor getIcon() {
-						return ImageDescriptor.createFromImage(entryInfo.getIcon());
+						return entryInfo.getIcon();
 					}
 
 					@Override

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/dialogs/PaletteManagerDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -44,6 +44,9 @@
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -85,6 +88,7 @@
 
 import java.text.MessageFormat;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -355,10 +359,20 @@ private void createViewer(Composite parent) {
 		// providers
 		m_viewer.setContentProvider(m_contentProvider);
 		m_viewer.setLabelProvider(new LabelProvider() {
+			private final ResourceManager m_resourceManager = new LocalResourceManager(JFaceResources.getResources());
+
+			@Override
+			public void dispose() {
+				super.dispose();
+				m_resourceManager.dispose();
+			}
+
 			@Override
 			public Image getImage(Object element) {
 				if (element instanceof EntryInfo) {
-					return ((EntryInfo) element).getIcon();
+					return Optional.ofNullable(((EntryInfo) element).getIcon()) //
+							.map(m_resourceManager::createImage) //
+							.orElse(null);
 				}
 				return IMAGE_CATEGORY;
 			}

org.eclipse.wb.core.java/src/org/eclipse/wb/internal/core/editor/palette/model/entry/FactoryEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,6 +27,7 @@
 import org.eclipse.wb.internal.core.utils.jdt.core.ProjectUtils;
 import org.eclipse.wb.internal.core.utils.state.EditorWarning;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 
 import org.apache.commons.lang.StringUtils;
@@ -229,8 +230,8 @@ protected final boolean ensureComponentDescription() {
 	}
 
 	@Override
-	public final Image getIcon() {
-		return m_icon;
+	public final ImageDescriptor getIcon() {
+		return ImageDescriptor.createFromImage(m_icon);
 	}
 
 	////////////////////////////////////////////////////////////////////////////

org.eclipse.wb.core.xml/src/org/eclipse/wb/internal/core/xml/editor/palette/DesignerPalette.java

@@ -262,7 +262,7 @@ public boolean isEnabled() {
 
 					@Override
 					public ImageDescriptor getIcon() {
-						return ImageDescriptor.createFromImage(entryInfo.getIcon());
+						return entryInfo.getIcon();
 					}
 
 					@Override

org.eclipse.wb.core.xml/src/org/eclipse/wb/internal/core/xml/editor/palette/dialogs/PaletteManagerDialog.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,6 +38,9 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -79,6 +82,7 @@
 
 import java.text.MessageFormat;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -351,10 +355,20 @@ private void createViewer(Composite parent) {
 		// providers
 		m_viewer.setContentProvider(m_contentProvider);
 		m_viewer.setLabelProvider(new LabelProvider() {
+			private final ResourceManager m_resourceManager = new LocalResourceManager(JFaceResources.getResources());
+
+			@Override
+			public void dispose() {
+				super.dispose();
+				m_resourceManager.dispose();
+			}
+
 			@Override
 			public Image getImage(Object element) {
 				if (element instanceof EntryInfo) {
-					return ((EntryInfo) element).getIcon();
+					return Optional.ofNullable(((EntryInfo) element).getIcon()) //
+							.map(m_resourceManager::createImage) //
+							.orElse(null);
 				}
 				return IMAGE_CATEGORY;
 			}

org.eclipse.wb.core.xml/src/org/eclipse/wb/internal/core/xml/editor/palette/model/ChooseComponentEntryInfo.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Google, Inc.
+ * Copyright (c) 2011, 2023 Google, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,7 +20,7 @@
 import org.eclipse.wb.internal.core.xml.editor.palette.command.Command;
 import org.eclipse.wb.internal.core.xml.editor.palette.command.ComponentAddCommand;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.widgets.Shell;
 
 import java.text.MessageFormat;
@@ -34,7 +34,7 @@
  * @coverage XML.editor.palette
  */
 public final class ChooseComponentEntryInfo extends ToolEntryInfo {
-	private static final Image ICON = DesignerPlugin.getImage("palette/ChooseComponent.gif");
+	private static final ImageDescriptor ICON = DesignerPlugin.getImageDescriptor("palette/ChooseComponent.gif");
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -52,7 +52,7 @@ public ChooseComponentEntryInfo() {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	public Image getIcon() {
+	public ImageDescriptor getIcon() {
 		return ICON;
 	}