Skip to content

Streamline ImageDescriptor implementations and avoid getImageData()#1810

Merged
HannesWell merged 2 commits intoeclipse-platform:masterfrom
HannesWell:cleanUp-ImageDescriptors
Apr 11, 2025
Merged

Streamline ImageDescriptor implementations and avoid getImageData()#1810
HannesWell merged 2 commits intoeclipse-platform:masterfrom
HannesWell:cleanUp-ImageDescriptors

Conversation

@HannesWell
Copy link
Copy Markdown
Member

ImageDescriptor.getImageData() is deprecated and sub-classes are advised to stop re-implementing it and instead implement getImageData(int). The still existing implementations just replicate the default implementation and therefore can just be removed.

Additionally the custom and internal 'ImageImageDescriptor' and '(Abstract)OverlayIcon' classes are replaced with implementations provided by standard JFace.

@eclipse-platform-bot
Copy link
Copy Markdown
Contributor

eclipse-platform-bot commented Apr 11, 2025

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
ua/org.eclipse.help.ui/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From f4b4c1433dc4eea24821cf429799d66f59da0388 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Fri, 11 Apr 2025 22:09:20 +0000
Subject: [PATCH] Version bump(s) for 4.36 stream


diff --git a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
index 14d67d91bc..d9d8d92c9a 100644
--- a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
+++ b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.10.100.qualifier
 Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
index aaac5dfae1..56ae785504 100644
--- a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_system_plugin_name
 Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 4.8.0.qualifier
+Bundle-Version: 4.8.100.qualifier
 Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.49.0

Further information are available in Common Build Issues - Missing version increments.

@HannesWell HannesWell force-pushed the cleanUp-ImageDescriptors branch 2 times, most recently from 59ed110 to 2936ff4 Compare April 11, 2025 18:08
@HannesWell
Copy link
Copy Markdown
Member Author

Both places where custom ImageDescriptor implementations have been replaced look as before: The breakpoint icon and the icons with the pen in the book in the tree:
grafik

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 11, 2025

Test Results

 1 758 files  ±0   1 758 suites  ±0   1h 26m 32s ⏱️ - 4m 19s
 4 173 tests ±0   4 150 ✅ ±0   23 💤 ±0  0 ❌ ±0 
13 119 runs  ±0  12 952 ✅ ±0  167 💤 ±0  0 ❌ ±0 

Results for commit 36a97e1. ± Comparison against base commit 30affe0.

♻️ This comment has been updated with latest results.

ImageDescriptor.getImageData() is deprecated and sub-classes are advised
to stop re-implementing it and instead implement getImageData(int).
The still existing implementations just replicate the default
implementation and therefore can just be removed.

Additionally the custom and internal 'ImageImageDescriptor' and
'(Abstract)OverlayIcon' classes are replaced with implementations
provided by standard JFace.
@HannesWell HannesWell force-pushed the cleanUp-ImageDescriptors branch from 9a85f80 to 9623cda Compare April 11, 2025 22:03
@HannesWell
Copy link
Copy Markdown
Member Author

HannesWell commented Apr 11, 2025

Jenkins failure is due to #1809 (comment) and not related to this change.

@HannesWell HannesWell merged commit 4d1314b into eclipse-platform:master Apr 11, 2025
16 of 18 checks passed
@HannesWell HannesWell deleted the cleanUp-ImageDescriptors branch April 11, 2025 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants