RESOLVED - bug 175211: Support Trac 0.11

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

2 files changed, 6 insertions, 5 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/AbstractTracClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/AbstractTracClientSearchTest.java
index 575706444..27f6e21c1 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/AbstractTracClientSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/AbstractTracClientSearchTest.java
@@ -185,12 +185,12 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertEquals(0, result.size());
 	}
 
-	public void testSearchMilestone1010() throws Exception {
+	public void testSearchMilestone1_010() throws Exception {
 		connect010();
 		searchMilestone1();
 	}
 
-	public void testSearchMilestone1011() throws Exception {
+	public void testSearchMilestone1_011() throws Exception {
 		connect011();
 		searchMilestone1();
 	}
@@ -204,12 +204,12 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertTicketEquals(tickets.get(0), result.get(0));
 	}
 
-	public void testSearchMilestone2010() throws Exception {
+	public void testSearchMilestone2_0_10() throws Exception {
 		connect010();
 		searchMilestone2();
 	}
 
-	public void testSearchMilestone2011() throws Exception {
+	public void testSearchMilestone2_0_11() throws Exception {
 		connect011();
 		searchMilestone2();
 	}
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 11921d212..150299b72 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,7 +53,8 @@ public class TracTaskEditorPageFactory extends AbstractTaskEditorPageFactory {
 
 	@Override
 	public String[] getConflictingIds(TaskEditorInput input) {
-		if (TracRepositoryConnector.hasRichEditor(input.getTaskRepository())) {
+		if (TracRepositoryConnector.hasRichEditor(input.getTaskRepository())
+				|| TasksUiUtil.isOutgoingNewTask(input.getTask(), TracCorePlugin.CONNECTOR_KIND)) {
 			return new String[] { ITasksUiConstants.ID_PAGE_PLANNING };
 		} else {
 			return super.getConflictingIds(input);