RESOLVED - bug 278298: [api] add support for enabling and disabling the new private section

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

6 files changed, 35 insertions, 16 deletions

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java
index 123420f9d..eee6a1a36 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPage.java
@@ -83,6 +83,7 @@ public class BugzillaTaskEditorPage extends AbstractTaskEditorPage {
 		super(editor, connectorKind);
 		this.attributeEditorMap = new HashMap<TaskAttribute, AbstractAttributeEditor>();
 		setNeedsSubmitButton(true);
+//		setNeedsPrivateSection(true);
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java
index 23b977679..2579a5630 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditorPageFactory.java
@@ -43,10 +43,7 @@ public class BugzillaTaskEditorPageFactory extends AbstractTaskEditorPageFactory
 
 	@Override
 	public String[] getConflictingIds(TaskEditorInput input) {
-		if (!input.getTask().getConnectorKind().equals(BugzillaCorePlugin.CONNECTOR_KIND)) {
-			return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
-		}
-		return null;
+		return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
index cd55ee089..1aff7a1b6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/PlanningPageFactory.java
@@ -12,7 +12,6 @@
 package org.eclipse.mylyn.internal.tasks.ui.editors;
 
 import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
 import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
@@ -23,7 +22,7 @@ public class PlanningPageFactory extends AbstractTaskEditorPageFactory {
 
 	@Override
 	public boolean canCreatePageFor(TaskEditorInput input) {
-		return input.getTask() instanceof LocalTask;
+		return true;
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
index de7ce570e..7a5eb3241 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
@@ -404,6 +404,8 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe
 
 	private boolean needsSubmitButton;
 
+	private boolean needsPrivateSection;
+
 	private FocusTracker focusTracker;
 
 	/**
@@ -689,12 +691,14 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe
 			}
 		}.setPath(PATH_COMMENTS));
 
-		descriptors.add(new TaskEditorPartDescriptor(ID_PART_PLANNING) {
-			@Override
-			public AbstractTaskEditorPart createPart() {
-				return new TaskEditorPlanningPart();
-			}
-		}.setPath(PATH_PLANNING));
+		if (needsPrivateSection() || taskData.isNew()) {
+			descriptors.add(new TaskEditorPartDescriptor(ID_PART_PLANNING) {
+				@Override
+				public AbstractTaskEditorPart createPart() {
+					return new TaskEditorPlanningPart();
+				}
+			}.setPath(PATH_PLANNING));
+		}
 
 		descriptors.add(new TaskEditorPartDescriptor(ID_PART_ACTIONS) {
 			@Override
@@ -1470,6 +1474,26 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe
 	}
 
 	/**
+	 * Returns true, if the page provides a submit button.
+	 * 
+	 * @since 3.2
+	 * @see #setNeedsPrivateSection(boolean)
+	 */
+	public boolean needsPrivateSection() {
+		return needsPrivateSection;
+	}
+
+	/**
+	 * Specifies that the page should provide the private section. This flag is not set by default.
+	 * 
+	 * @since 3.2
+	 * @see #needsPrivateSection()
+	 */
+	public void setNeedsPrivateSection(boolean needsPrivateSection) {
+		this.needsPrivateSection = needsPrivateSection;
+	}
+
+	/**
 	 * This is a provisional method. Do not call or override until the API has been finalized. See bug 274790 for
 	 * details.
 	 * 
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPage.java
index 3233f098f..e53d55947 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPage.java
@@ -34,6 +34,7 @@ public class TracTaskEditorPage extends AbstractTaskEditorPage {
 	public TracTaskEditorPage(TaskEditor editor) {
 		super(editor, TracCorePlugin.CONNECTOR_KIND);
 		setNeedsSubmitButton(true);
+		setNeedsPrivateSection(true);
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPageFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPageFactory.java
index 69d5e49e1..80ea25b65 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPageFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorPageFactory.java
@@ -53,10 +53,7 @@ public class TracTaskEditorPageFactory extends AbstractTaskEditorPageFactory {
 
 	@Override
 	public String[] getConflictingIds(TaskEditorInput input) {
-		if (!input.getTask().getConnectorKind().equals(TracCorePlugin.CONNECTOR_KIND)) {
-			return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
-		}
-		return null;
+		return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
 	}
 
 	@Override