From 074acd9ea27f9daf1e5344fea4052e15608b7819 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 3 Jun 2021 20:53:08 -0400 Subject: [PATCH] Bug 573996: dispose of fonts created in the new project wizard Change-Id: I3ca9d37ac6bda563284cb21a3e3e164abc2c63d3 --- .../META-INF/MANIFEST.MF | 2 +- .../tools/templates/ui/TemplateSelectionPage.java | 11 ++++++++++- .../tools/templates/ui/internal/TemplateTable.java | 13 ++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF b/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF index 4725f316753..a0ab5a6c7fd 100644 --- a/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF +++ b/tools.templates/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.tools.templates.ui Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true -Bundle-Version: 1.2.100.qualifier +Bundle-Version: 1.2.200.qualifier Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java b/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java index c5360f18ed3..0c9ca9e2f7a 100644 --- a/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java +++ b/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/TemplateSelectionPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 QNX Software Systems and others. + * Copyright (c) 2016, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -156,4 +156,13 @@ public class TemplateSelectionPage extends WizardPage { return super.getNextPage(); } + @Override + public void dispose() { + if (templateTable != null) { + templateTable.dispose(); + templateTable = null; + } + super.dispose(); + } + } diff --git a/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/internal/TemplateTable.java b/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/internal/TemplateTable.java index 21320b9d464..ace73e6bbe9 100644 --- a/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/internal/TemplateTable.java +++ b/tools.templates/org.eclipse.tools.templates.ui/src/org/eclipse/tools/templates/ui/internal/TemplateTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 QNX Software Systems and others. + * Copyright (c) 2016, 2021 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -190,4 +190,15 @@ public class TemplateTable implements Listener { } } + public void dispose() { + if (fontDefault != null) { + fontDefault.dispose(); + fontDefault = null; + } + if (fontBold != null) { + fontBold.dispose(); + fontBold = null; + } + } + }