Skip to content

Add missing image to shared images and resolve resource leak #3404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeikoKlare merged 2 commits into from
Oct 17, 2025
Merged

Add missing image to shared images and resolve resource leak #3404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2318ee
Add missing image to shared images and resolve resource leak
HeikoKlare Oct 16, 2025
3adaaf8
Bump minor version of org.eclipse.ui.workbench for 4.38 stream
HeikoKlare Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
Bundle-Version: 3.136.100.qualifier
Bundle-Version: 3.137.0.qualifier
Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
7 changes: 7 additions & 0 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/ISharedImages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,13 @@ public interface ISharedImages {
*/
String IMG_OBJS_DND_TOFASTVIEW = "IMG_OBJS_DND_TOFASTVIEW"; //$NON-NLS-1$

/**
* Identifies the default 'missing' image.
*
* @since 3.137
*/
String IMG_DEF_MISSING = "IMG_DEF_MISSING"; //$NON-NLS-1$

/**
* Retrieves the specified image from the workbench plugin's image registry.
* Note: The returned <code>Image</code> is managed by the workbench; clients
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchImages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ private static final void declareImage(String key, String disabledKey, String pa
*/
@SuppressWarnings("removal")
private static final void declareImages() {
declareImage(ISharedImages.IMG_DEF_MISSING, ImageDescriptor.getMissingImageDescriptor(), true);

// Overlays
declareImage(ISharedImages.IMG_DEC_FIELD_ERROR, PATH_OVERLAY + "error_ovr.svg", true); //$NON-NLS-1$
declareImage(ISharedImages.IMG_DEC_FIELD_WARNING, PATH_OVERLAY + "warning_ovr.svg", true); //$NON-NLS-1$
Expand Down
5 changes: 3 additions & 2 deletions bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
import org.eclipse.ui.ISaveablesSource;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.IShowEditorInput;
import org.eclipse.ui.ISources;
import org.eclipse.ui.IViewPart;
Expand Down Expand Up @@ -4038,7 +4039,7 @@ private void handleNullRefPlaceHolders(MUIElement element, MWindow refWin) {
if (CompatibilityPart.COMPATIBILITY_VIEW_URI.equals(part.getContributionURI())
&& part.getIconURI() == null) {
part.getTransientData().put(IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY,
ImageDescriptor.getMissingImageDescriptor().createImage());
ISharedImages.get().getImage(ISharedImages.IMG_DEF_MISSING));
}
}

Expand All @@ -4055,7 +4056,7 @@ private void replacePlaceholder(MPlaceholder ph) {
MPart part = modelService.createModelElement(MPart.class);
part.setElementId(ph.getElementId());
part.getTransientData().put(IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY,
ImageDescriptor.getMissingImageDescriptor().createImage());
ISharedImages.get().getImage(ISharedImages.IMG_DEF_MISSING));
String label = (String) ph.getTransientData().get(IWorkbenchConstants.TAG_LABEL);
if (label != null) {
part.setLabel(label);
Expand Down
Loading