NEW - bug 348969: [patch] TaskDataModelListener not removed when

attributes section not expanded 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=348969

2 files changed, 5 insertions, 1 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
index 9d774b911..a725a0dda 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
@@ -83,6 +83,9 @@ public class RichTextAttributeEditor extends AbstractAttributeEditor {
 		editor.createControl(parent, toolkit);
 		editor.getViewer().getTextWidget().setToolTipText(getDescription());
 
+		// refresh again, in case the value changed in the mean time
+		refresh();
+
 		setControl(editor.getControl());
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
index 49a6be87a..0ba7b0543 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractAttributeEditor.java
@@ -95,7 +95,6 @@ public abstract class AbstractAttributeEditor {
 		setDecorationEnabled(true);
 		setReadOnly(taskAttribute.getMetaData().isReadOnly());
 		setDescription(taskAttribute.getMetaData().getValue(TaskAttribute.META_DESCRIPTION));
-		getModel().addModelListener(modelListener);
 	}
 
 	/**
@@ -199,11 +198,13 @@ public abstract class AbstractAttributeEditor {
 	protected void setControl(Control control) {
 		if (this.control != null && !this.control.isDisposed()) {
 			this.control.removeDisposeListener(disposeListener);
+			getModel().removeModelListener(modelListener);
 		}
 		this.control = control;
 		if (control != null) {
 			control.setData(KEY_TASK_ATTRIBUTE, taskAttribute);
 			control.addDisposeListener(disposeListener);
+			getModel().addModelListener(modelListener);
 		}
 	}