NEW - bug 212967: [patch] sorting of query nodes and archive categories in the task list

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

7 files changed, 40 insertions, 36 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java
index 42cde428d..235dde3cd 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java
@@ -30,7 +30,7 @@ import org.eclipse.mylyn.tasks.core.ITask;
  * @author Rob Elves
  * @since 2.0
  */
-public abstract class AbstractTask extends AbstractTaskContainer implements ITask {
+public abstract class AbstractTask extends AbstractTaskContainer implements ITask, ITaskRepositoryElement {
 
 	public static final String DEFAULT_TASK_KIND = "task"; //$NON-NLS-1$
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AutomaticRepositoryTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AutomaticRepositoryTaskContainer.java
index 559a77fbd..78db9ce13 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AutomaticRepositoryTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AutomaticRepositoryTaskContainer.java
@@ -16,27 +16,21 @@ import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
 /**
  * @author Mik Kersten
  */
-public abstract class AutomaticRepositoryTaskContainer extends AbstractTaskCategory {
+public abstract class AutomaticRepositoryTaskContainer extends AbstractTaskCategory implements ITaskRepositoryElement {
 
 	protected String repositoryUrl;
 
 	private final String connectorKind;
 
-	public AutomaticRepositoryTaskContainer(String handleAndDescription, String connectorKind, String repositoryUrl) {
-		super(handleAndDescription);
+	private final String handleSuffix;
+
+	public AutomaticRepositoryTaskContainer(String handleSuffix, String connectorKind, String repositoryUrl) {
+		super(repositoryUrl + "-" + handleSuffix); //$NON-NLS-1$
+		this.handleSuffix = handleSuffix;
 		this.connectorKind = connectorKind;
 		this.repositoryUrl = repositoryUrl;
 	}
 
-	public abstract String getSummaryLabel();
-
-	protected abstract String getHandleSuffix();
-
-	@Override
-	public String getSummary() {
-		return getSummaryLabel() + " [" + getRepositoryUrl() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
 	@Override
 	public boolean isUserManaged() {
 		return false;
@@ -60,7 +54,7 @@ public abstract class AutomaticRepositoryTaskContainer extends AbstractTaskCateg
 	 */
 	public void setRepositoryUrl(String repositoryUrl) {
 		this.repositoryUrl = repositoryUrl;
-		this.setHandleIdentifier(repositoryUrl + "-" + getHandleSuffix()); //$NON-NLS-1$
+		setHandleIdentifier(repositoryUrl + "-" + handleSuffix); //$NON-NLS-1$
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ITaskRepositoryElement.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ITaskRepositoryElement.java
new file mode 100644
index 000000000..391ba3792
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ITaskRepositoryElement.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.tasks.core;
+
+/**
+ * @author Steffen Pingel
+ */
+public interface ITaskRepositoryElement {
+
+	public String getConnectorKind();
+
+	public String getRepositoryUrl();
+
+}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Person.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Person.java
index b083f84e0..79088d5b8 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Person.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Person.java
@@ -14,7 +14,7 @@ package org.eclipse.mylyn.internal.tasks.core;
 /**
  * @author Rob Elves
  */
-public class Person extends AbstractTaskContainer {
+public class Person extends AbstractTaskContainer implements ITaskRepositoryElement {
 
 	private final String connectorKind;
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/RepositoryQuery.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/RepositoryQuery.java
index 1597c147a..436e64aa2 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/RepositoryQuery.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/RepositoryQuery.java
@@ -25,7 +25,7 @@ import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel;
  * @author Eugene Kuleshov
  * @author Rob Elves
  */
-public class RepositoryQuery extends AbstractTaskContainer implements IRepositoryQuery {
+public class RepositoryQuery extends AbstractTaskContainer implements IRepositoryQuery, ITaskRepositoryElement {
 
 	private final String connectorKind;
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnmatchedTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnmatchedTaskContainer.java
index c4516adba..32c7e5fab 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnmatchedTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnmatchedTaskContainer.java
@@ -19,22 +19,15 @@ package org.eclipse.mylyn.internal.tasks.core;
  */
 public class UnmatchedTaskContainer extends AutomaticRepositoryTaskContainer {
 
-	public static final String LABEL = Messages.UnmatchedTaskContainer_Unmatched;
-
-	public static final String HANDLE = "orphans"; //$NON-NLS-1$
+	private static final String HANDLE = "orphans"; //$NON-NLS-1$
 
 	public UnmatchedTaskContainer(String connectorKind, String repositoryUrl) {
-		super(repositoryUrl + "-" + HANDLE, connectorKind, repositoryUrl); //$NON-NLS-1$
-	}
-
-	@Override
-	public String getSummaryLabel() {
-		return LABEL;
+		super(HANDLE, connectorKind, repositoryUrl);
 	}
 
 	@Override
-	protected String getHandleSuffix() {
-		return HANDLE;
+	public String getSummary() {
+		return Messages.UnmatchedTaskContainer_Unmatched;
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnsubmittedTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnsubmittedTaskContainer.java
index e4697383a..624d7770f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnsubmittedTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/UnsubmittedTaskContainer.java
@@ -17,21 +17,15 @@ package org.eclipse.mylyn.internal.tasks.core;
  */
 public class UnsubmittedTaskContainer extends AutomaticRepositoryTaskContainer {
 
-	private static final String LABEL = Messages.UnsubmittedTaskContainer_Unsubmitted;
-
 	private static final String HANDLE = "unsubmitted"; //$NON-NLS-1$
 
 	public UnsubmittedTaskContainer(String connectorKind, String repositoryUrl) {
-		super(repositoryUrl + "-" + HANDLE, connectorKind, repositoryUrl); //$NON-NLS-1$
+		super(HANDLE, connectorKind, repositoryUrl);
 	}
 
 	@Override
-	public String getSummaryLabel() {
-		return LABEL;
+	public String getSummary() {
+		return Messages.UnsubmittedTaskContainer_Unsubmitted;
 	}
 
-	@Override
-	protected String getHandleSuffix() {
-		return HANDLE;
-	}
 }