From d7c9ed89d96c8f2b234e4b710193a9acca61bab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 9 Oct 2024 14:51:58 +0200 Subject: [PATCH 1/2] [test] TestLabelProvider: reduce font not disposed warnings to a single "SWT Resource was not properly disposed" during LabelProviderTest (and fixed the font to be not bold) --- .../org/eclipse/ui/tests/navigator/NavigatorTestBase.java | 2 +- .../ui/tests/navigator/extension/TestLabelProvider.java | 7 +++---- .../tests/navigator/extension/TestLabelProviderBlank.java | 2 -- .../tests/navigator/extension/TestLabelProviderBlue.java | 2 -- .../tests/navigator/extension/TestLabelProviderCyan.java | 2 -- .../navigator/extension/TestLabelProviderPlainGreen.java | 2 -- .../navigator/extension/TestLabelProviderPlainRed.java | 2 -- .../navigator/extension/TestLabelProviderStyledGreen.java | 2 -- .../navigator/extension/TestLabelProviderStyledRed.java | 2 -- 9 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java index a151fe42545..009c5644759 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java @@ -402,7 +402,7 @@ protected void checkItems(TreeItem[] rootItems, TestLabelProvider tlp, boolean a } assertEquals(tlp.backgroundColor, rootItem.getBackground(0)); assertEquals(TestLabelProvider.toForegroundColor(tlp.backgroundColor), rootItem.getForeground(0)); - assertEquals(tlp.font, rootItem.getFont(0)); + assertEquals(TestLabelProvider.font, rootItem.getFont(0)); assertEquals(tlp.image, rootItem.getImage(0)); if (all) { checkItems(rootItem.getItems(), tlp, all, text); diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java index 3342017c47e..e5e228d6717 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java @@ -42,7 +42,7 @@ public abstract class TestLabelProvider extends LabelProvider implements public Image image; - public Font font; + public static final Font font = new Font(Display.getDefault(), new FontData()); private Font boldFont; @@ -170,9 +170,8 @@ public void dispose() { _runnable.run(); boldFont.dispose(); boldFont = null; - -// font.dispose(); -// font = null; + // font can not disposed here because the TestLabelProviders are used by its + // static instances } } diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java index 18f24e1ccb0..aff50ca2bf3 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -32,7 +31,6 @@ public class TestLabelProviderBlank extends TestStyledLabelProvider { protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_RED); backgroundColorName = "Red"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJ_ADD); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java index eeebb869329..f8df866eeb0 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -32,7 +31,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_BLUE); backgroundColorName = "Blue"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ETOOL_SAVE_EDIT); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java index 88c752604d2..d14480eccb0 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -32,7 +31,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_CYAN); backgroundColorName = "Cyan"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_DEF_VIEW); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java index 1a22d87d454..ef8fd1e3db1 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -31,7 +30,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_GREEN); backgroundColorName = "Green"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ELCL_COLLAPSEALL); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java index ef791d71701..8be8e8bd7f0 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -31,7 +30,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_RED); backgroundColorName = "Red"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ELCL_REMOVE); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java index d48c3f3263f..fed548b28a5 100755 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -31,7 +30,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_GREEN); backgroundColorName = "Green"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ELCL_COLLAPSEALL); instance = this; diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java index d666742ad43..2e8593cce81 100755 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java @@ -15,7 +15,6 @@ package org.eclipse.ui.tests.navigator.extension; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -31,7 +30,6 @@ protected void initSubclass() { backgroundColor = Display.getCurrent().getSystemColor( SWT.COLOR_RED); backgroundColorName = "Red"; - font = new Font(Display.getDefault(), boldFontData); image = PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ELCL_REMOVE); instance = this; From a9c4882e1979ad1a158c63db1119299a511af1ae Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 9 Oct 2024 12:57:57 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.34 stream --- tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF index fc5f685c4e6..30b05fff0f3 100644 --- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundlename Bundle-SymbolicName: org.eclipse.ui.tests.navigator;singleton:=true -Bundle-Version: 3.7.500.qualifier +Bundle-Version: 3.7.600.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",