Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java13
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java10
2 files changed, 21 insertions, 2 deletions
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
index 3f885ff92..063ea5e7c 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
@@ -75,9 +75,19 @@ public class UiLegendDialog extends PopupDialog {
}
@Override
+ public boolean close() {
+ if (toolkit != null) {
+ if (toolkit.getColors() != null) {
+ toolkit.dispose();
+ }
+ }
+ return super.close();
+ }
+
+ @Override
protected final Control createDialogArea(final Composite parent) {
- getShell().setText("Mylar UI Legend");
+ getShell().setText("Mylyn UI Legend");
toolkit = new FormToolkit(parent.getDisplay());
form = toolkit.createScrolledForm(parent);
@@ -105,7 +115,6 @@ public class UiLegendDialog extends PopupDialog {
buttonsLayout.marginWidth = 0;
buttonsComposite.setLayout(buttonsLayout);
section.setTextClient(buttonsComposite);
-// buttonsComposite.setLayout(new RowLayout());
final ImageHyperlink closeHyperlink = toolkit.createImageHyperlink(buttonsComposite, SWT.NONE);
closeHyperlink.setLayout(buttonsLayout);
closeHyperlink.setImage(TasksUiImages.getImage(TasksUiImages.NOTIFICATION_CLOSE));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index 4fe899bc7..22ecac0b7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -199,6 +199,16 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage {
setNeedsValidation(true);
}
+ @Override
+ public void dispose() {
+ super.dispose();
+ if (toolkit != null) {
+ if (toolkit.getColors() != null) {
+ toolkit.dispose();
+ }
+ }
+ }
+
public void createControl(Composite parent) {
compositeContainer = new Composite(parent, SWT.NULL);
FillLayout layout = new FillLayout();

Back to the top