ASSIGNED - bug 331626: [api] attribute editors should have a tooltip

https://bugs.eclipse.org/bugs/show_bug.cgi?id=331626

4 files changed, 33 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
index f5b92de27..cbe2af131 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttribute.java
@@ -126,9 +126,21 @@ public final class TaskAttribute {
 	public static final String META_READ_ONLY = "task.meta.readOnly"; //$NON-NLS-1$
 
 	/**
+	 * Key for the meta datum that determines if an attribute is disabled. This is used to indicate that an attribute
+	 * should not be modified, e.g. due to work-flow state but it may still be generally writeable.
+	 * 
+	 * @since 3.5
+	 * @see TaskAttributeMetaData#isDisabled()
+	 */
+	public static final String META_DISABLED = "task.meta.disabled"; //$NON-NLS-1$
+
+	/**
+	 * Key for the meta datum that provides a description of an attribute, e.g. for display in a tooltip.
+	 * 
 	 * @since 3.5
+	 * @see TaskAttributeMetaData
 	 */
-	public static final String META_DESCRIPTION = "task.meta.ToolTip"; //$NON-NLS-1$
+	public static final String META_DESCRIPTION = "task.meta.description"; //$NON-NLS-1$
 
 	public static final String NEW_ATTACHMENT = "task.common.new.attachment"; //$NON-NLS-1$
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
index b5771b1fa..7518b411b 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMetaData.java
@@ -86,6 +86,14 @@ public class TaskAttributeMetaData {
 		return taskAttribute.getMetaDataMap();
 	}
 
+	/**
+	 * @since 3.5
+	 * @see TaskAttribute#META_DISABLED
+	 */
+	public boolean isDisabled() {
+		return Boolean.parseBoolean(taskAttribute.getMetaDatum(TaskAttribute.META_DISABLED));
+	}
+
 	public boolean isReadOnly() {
 		return Boolean.parseBoolean(taskAttribute.getMetaDatum(TaskAttribute.META_READ_ONLY));
 	}
@@ -155,4 +163,14 @@ public class TaskAttributeMetaData {
 		return this;
 	}
 
+	/**
+	 * @since 3.5
+	 * @see TaskAttribute#META_DISABLED
+	 * @return this
+	 */
+	public TaskAttributeMetaData setDisabled(boolean value) {
+		taskAttribute.putMetaDatum(TaskAttribute.META_DISABLED, Boolean.toString(value));
+		return this;
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PriorityAttributeEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PriorityAttributeEditor.java
index 1ca6eaf28..98fa005e2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PriorityAttributeEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PriorityAttributeEditor.java
@@ -98,11 +98,7 @@ public class PriorityAttributeEditor extends AbstractAttributeEditor {
 
 	private void updateEditor() {
 		editor.select(getValue(), mapping.getPriorityLevel());
-		String toolTip = getValueLabel();
-		if (toolTip != null && !toolTip.equals("")) {
-			toolTip = getDescription();
-		}
-		editor.setToolTipText(toolTip);
+		editor.setToolTipText(getValueLabel());
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
index dff763ba9..f20876b82 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
@@ -466,7 +466,7 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 	public void refreshOperations() {
 		for (Button button : operationButtons) {
 			TaskOperation taskOperation = (TaskOperation) button.getData(KEY_OPERATION);
-			//button.setEnabled(!taskOperation.getTaskAttribute().getMetaData().isReadOnly());
+			button.setEnabled(!taskOperation.getTaskAttribute().getMetaData().isDisabled());
 			button.setToolTipText(taskOperation.getTaskAttribute()
 					.getMetaData()
 					.getValue(TaskAttribute.META_DESCRIPTION));