Skip to content

[test] TestLabelProvider: reduce font not disposed warnings #2374

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
merged 2 commits into from
Oct 9, 2024
Merged

[test] TestLabelProvider: reduce font not disposed warnings #2374

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
d7c9ed8
[test] TestLabelProvider: reduce font not disposed warnings
jukzi Oct 9, 2024
a9c4882
Version bump(s) for 4.34 stream
eclipse-platform-bot Oct 9, 2024
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 tests/org.eclipse.ui.tests.navigator/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: %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)",
Expand Down
2 changes: 1 addition & 1 deletion .../org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 3 additions & 4 deletions ...se.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
}

}
2 changes: 0 additions & 2 deletions ....tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlank.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderBlue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...i.tests.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderCyan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...s.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainGreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...sts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderPlainRed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ....navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledGreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions ...ts.navigator/src/org/eclipse/ui/tests/navigator/extension/TestLabelProviderStyledRed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading