NEW - bug 279306: new Taskeditor's "Private" section hides "Not Scheduled" option from user

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

2 files changed, 31 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
index 28bbda3d0..c87e20ce3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPart.java
@@ -141,9 +141,14 @@ public class PlanningPart extends AbstractLocalEditorPart {
 
 	private ToolBarManager toolBarManager;
 
+	private boolean needsNotes;
+
+	private boolean alwaysExpand;
+
 	public PlanningPart(int sectionStyle, boolean expandNotesVertically) {
 		super(sectionStyle, Messages.PersonalPart_Personal_Planning);
 		this.expandNotesVertically = expandNotesVertically;
+		this.needsNotes = true;
 	}
 
 	public void initialize(IManagedForm managedForm, TaskRepository taskRepository, AbstractTask task,
@@ -203,12 +208,11 @@ public class PlanningPart extends AbstractLocalEditorPart {
 
 	@Override
 	public Control createControl(Composite parent, FormToolkit toolkit) {
-
 		this.notesString = getTask().getNotes();
 		if (this.notesString == null) {
 			this.notesString = ""; //$NON-NLS-1$
 		}
-		Section section = createSection(parent, toolkit, notesString.length() > 0);
+		Section section = createSection(parent, toolkit, isAlwaysExpand() || notesString.length() > 0);
 		Composite composite = toolkit.createComposite(section);
 		GridLayout layout = EditorUtil.createSectionClientLayout();
 		layout.numColumns = (needsDueDate) ? 6 : 4;
@@ -228,7 +232,9 @@ public class PlanningPart extends AbstractLocalEditorPart {
 		TasksUiInternal.getTaskList().addChangeListener(TASK_LIST_LISTENER);
 		TasksUiPlugin.getTaskActivityManager().addActivityListener(timingListener);
 
-		createNotesArea(toolkit, composite, layout.numColumns);
+		if (needsNotes()) {
+			createNotesArea(toolkit, composite, layout.numColumns);
+		}
 
 		toolkit.paintBordersFor(composite);
 		section.setClient(composite);
@@ -556,9 +562,20 @@ public class PlanningPart extends AbstractLocalEditorPart {
 		}
 	}
 
-	/** for testing - should cause dirty state */
-	public void setNotes(String notes) {
-		noteEditor.setText(notes);
+	public boolean needsNotes() {
+		return needsNotes;
+	}
+
+	public void setNeedsNotes(boolean needsNotes) {
+		this.needsNotes = needsNotes;
+	}
+
+	public boolean isAlwaysExpand() {
+		return alwaysExpand;
+	}
+
+	public void setAlwaysExpand(boolean alwaysExpand) {
+		this.alwaysExpand = alwaysExpand;
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
index 06ec6d8ff..d8b59a303 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorPlanningPart.java
@@ -24,7 +24,11 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
  */
 public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 
-	private final PlanningPart part = new PlanningPart(ExpandableComposite.TWISTIE, false);
+	private final PlanningPart part;
+
+	public TaskEditorPlanningPart() {
+		part = new PlanningPart(ExpandableComposite.TWISTIE, false);
+	}
 
 	@Override
 	public void initialize(AbstractTaskEditorPage taskEditorPage) {
@@ -32,8 +36,11 @@ public class TaskEditorPlanningPart extends AbstractTaskEditorPart {
 		boolean needsDueDate = !taskEditorPage.getConnector().hasRepositoryDueDate(taskEditorPage.getTaskRepository(),
 				taskEditorPage.getTask(), getTaskData());
 		CommonTextSupport textSupport = (CommonTextSupport) getTaskEditorPage().getAdapter(CommonTextSupport.class);
+		// disable notes for new tasks to avoid confusion due to showing multiple input fields
 		part.initialize(taskEditorPage.getManagedForm(), taskEditorPage.getTaskRepository(),
 				(AbstractTask) taskEditorPage.getTask(), needsDueDate, taskEditorPage, textSupport);
+		part.setNeedsNotes(!getModel().getTaskData().isNew());
+		part.setAlwaysExpand(getModel().getTaskData().isNew());
 	}
 
 	@Override