Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListSorterTest.java52
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskListSortDialog.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListSorter.java11
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java22
4 files changed, 43 insertions, 44 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListSorterTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListSorterTest.java
index 754dbeb4d..1d8eed6ba 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListSorterTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListSorterTest.java
@@ -17,8 +17,6 @@ package org.eclipse.mylyn.tasks.tests;
import java.util.Calendar;
import java.util.Date;
-import junit.framework.TestCase;
-
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
@@ -45,6 +43,8 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.XMLMemento;
+import junit.framework.TestCase;
+
/**
* @author Mik Kersten
* @author George Lindholm
@@ -72,10 +72,10 @@ public class TaskListSorterTest extends TestCase {
child.putInteger(MEMENTO_KEY_SORT_INDEX, 1);
child.putInteger(MEMENTO_KEY_SORT_DIRECTION, -1);
view.migrateSorterState(sorter, memento);
- assertEquals(SortCriterion.SortKey.PRIORITY, sorter.getComparator().getSortCriterion(0).getKey());
- assertEquals(1, sorter.getComparator().getSortCriterion(0).getDirection());
- assertEquals(SortCriterion.SortKey.SUMMARY, sorter.getComparator().getSortCriterion(1).getKey());
- assertEquals(-1, sorter.getComparator().getSortCriterion(1).getDirection());
+ assertEquals(SortCriterion.SortKey.PRIORITY, sorter.getTaskComparator().getSortCriterion(0).getKey());
+ assertEquals(1, sorter.getTaskComparator().getSortCriterion(0).getDirection());
+ assertEquals(SortCriterion.SortKey.SUMMARY, sorter.getTaskComparator().getSortCriterion(1).getKey());
+ assertEquals(-1, sorter.getTaskComparator().getSortCriterion(1).getDirection());
memento = XMLMemento.createWriteRoot(MEMENTO_KEY_SORT_INDEX);
child = memento.createChild(MEMENTO_KEY_SORTER);
@@ -85,10 +85,10 @@ public class TaskListSorterTest extends TestCase {
child.putInteger(MEMENTO_KEY_SORT_INDEX, 2);
child.putInteger(MEMENTO_KEY_SORT_DIRECTION, -1);
view.migrateSorterState(sorter, memento);
- assertEquals(SortCriterion.SortKey.TASK_ID, sorter.getComparator().getSortCriterion(0).getKey());
- assertEquals(-1, sorter.getComparator().getSortCriterion(0).getDirection());
- assertEquals(SortCriterion.SortKey.DATE_CREATED, sorter.getComparator().getSortCriterion(1).getKey());
- assertEquals(-1, sorter.getComparator().getSortCriterion(1).getDirection());
+ assertEquals(SortCriterion.SortKey.TASK_ID, sorter.getTaskComparator().getSortCriterion(0).getKey());
+ assertEquals(-1, sorter.getTaskComparator().getSortCriterion(0).getDirection());
+ assertEquals(SortCriterion.SortKey.DATE_CREATED, sorter.getTaskComparator().getSortCriterion(1).getKey());
+ assertEquals(-1, sorter.getTaskComparator().getSortCriterion(1).getDirection());
}
public void testSortWithError() {
@@ -102,23 +102,23 @@ public class TaskListSorterTest extends TestCase {
task1.setPriority("P5");
task2.setPriority("P1");
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.TASK_ID);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.TASK_ID);
sorter.sort(new EmptyViewer(), tasks);
assertEquals(task1, tasks[1]);
assertEquals(task2, tasks[0]);
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
assertEquals(task1, tasks[0]);
assertEquals(task2, tasks[1]);
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.PRIORITY);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.PRIORITY);
sorter.sort(new EmptyViewer(), tasks);
assertEquals(task1, tasks[1]);
assertEquals(task2, tasks[0]);
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
- sorter.getComparator().getSortCriterion(0).setDirection((-1));
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
+ sorter.getTaskComparator().getSortCriterion(0).setDirection((-1));
sorter.sort(new EmptyViewer(), tasks);
assertEquals(task1, tasks[0]);
assertEquals(task2, tasks[1]);
@@ -127,7 +127,7 @@ public class TaskListSorterTest extends TestCase {
public void testRootTaskSorting() {
TaskListSorter sorter = new TaskListSorter();
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
AbstractTask task = new LocalTask("1", "");
UncategorizedTaskContainer uncategorizedTaskContainer = new UncategorizedTaskContainer();
@@ -243,8 +243,8 @@ public class TaskListSorterTest extends TestCase {
tasks[0].setCreationDate(new Date(start.getTime() - 5));
TaskListSorter sorter = new TaskListSorter();
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
- sorter.getComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
+ sorter.getTaskComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
assertEquals("11", tasks[0].getTaskKey());
@@ -281,8 +281,8 @@ public class TaskListSorterTest extends TestCase {
tasks[5].setAttribute(TaskAttribute.RANK, "6");
TaskListSorter sorter = new TaskListSorter();
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.RANK);
- sorter.getComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.RANK);
+ sorter.getTaskComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
assertEquals("4", tasks[0].getTaskKey());
@@ -320,8 +320,8 @@ public class TaskListSorterTest extends TestCase {
tasks[5].setAttribute(TaskAttribute.RANK, null);
TaskListSorter sorter = new TaskListSorter();
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.RANK);
- sorter.getComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.RANK);
+ sorter.getTaskComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
assertEquals("2", tasks[0].getTaskKey());
@@ -347,8 +347,8 @@ public class TaskListSorterTest extends TestCase {
tasks[0].setCreationDate(new Date(start.getTime() - 4));
TaskListSorter sorter = new TaskListSorter();
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
- sorter.getComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.SUMMARY);
+ sorter.getTaskComparator().getSortCriterion(1).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
assertEquals("MYLN:11", tasks[0].getTaskKey());
@@ -370,9 +370,9 @@ public class TaskListSorterTest extends TestCase {
task1.setCreationDate(start);
task2.setCreationDate(new Date(start.getTime() - 1));
task3.setCreationDate(new Date(start.getTime() - 2));
- sorter.getComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.DATE_CREATED);
+ sorter.getTaskComparator().getSortCriterion(0).setKey(SortCriterion.SortKey.DATE_CREATED);
sorter.sort(new EmptyViewer(), tasks);
- sorter.getComparator().getSortCriterion(0).setDirection((-1));
+ sorter.getTaskComparator().getSortCriterion(0).setDirection((-1));
sorter.sort(new EmptyViewer(), tasks);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskListSortDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskListSortDialog.java
index ca8769148..4f457a25f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskListSortDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/TaskListSortDialog.java
@@ -40,7 +40,7 @@ public class TaskListSortDialog extends TaskCompareDialog {
private final TaskListView taskListView;
public TaskListSortDialog(IShellProvider parentShell, TaskListView taskListView) {
- super(parentShell, taskListView.getSorter().getComparator());
+ super(parentShell, taskListView.getSorter().getTaskComparator());
this.taskListView = taskListView;
setTitle(Messages.TaskListSortDialog_Title);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListSorter.java
index 132906279..fa16f8e93 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListSorter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListSorter.java
@@ -184,8 +184,8 @@ public class TaskListSorter extends ViewerSorter {
if (object instanceof ITaskRepositoryElement) {
ITaskRepositoryElement repositoryElement = (ITaskRepositoryElement) object;
String repositoryUrl = repositoryElement.getRepositoryUrl();
- TaskRepository taskRepository = TasksUi.getRepositoryManager().getRepository(
- repositoryElement.getConnectorKind(), repositoryUrl);
+ TaskRepository taskRepository = TasksUi.getRepositoryManager()
+ .getRepository(repositoryElement.getConnectorKind(), repositoryUrl);
return taskRepository != null ? taskRepository.getRepositoryLabel() : null;
}
// if (object instanceof UnsubmittedTaskContainer) {
@@ -202,8 +202,7 @@ public class TaskListSorter extends ViewerSorter {
return taskComparator.compare(element1, element2);
}
- @Override
- public TaskComparator getComparator() {
+ public TaskComparator getTaskComparator() {
return taskComparator;
}
@@ -219,7 +218,7 @@ public class TaskListSorter extends ViewerSorter {
public void restoreState(IMemento memento) {
IMemento child = memento.getChild(MEMENTO_KEY_SORTER);
if (child != null) {
- getComparator().restoreState(child);
+ taskComparator.restoreState(child);
}
setGroupBy(getGroupBy(memento, MEMENTO_KEY_GROUP_BY, DEFAULT_GROUP_BY));
}
@@ -227,7 +226,7 @@ public class TaskListSorter extends ViewerSorter {
public void saveState(IMemento memento) {
IMemento child = memento.createChild(MEMENTO_KEY_SORTER);
if (child != null) {
- getComparator().saveState(child);
+ taskComparator.saveState(child);
}
memento.putString(MEMENTO_KEY_GROUP_BY, getGroupBy().name());
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 60cb32adf..6317256ed 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -594,19 +594,19 @@ public class TaskListView extends AbstractTaskListView implements IPropertyChang
Integer sortDirInt = m.getInteger(MEMENTO_KEY_SORT_DIRECTION);
if (sortDirInt != null) {
sortDirection = sortDirInt.intValue();
- tableSorter.getComparator().getSortCriterion(0).setDirection(sortDirection);
+ tableSorter.getTaskComparator().getSortCriterion(0).setDirection(sortDirection);
switch (restoredSortIndex) {
case 1:
- tableSorter.getComparator().getSortCriterion(0).setKey(SortKey.SUMMARY);
+ tableSorter.getTaskComparator().getSortCriterion(0).setKey(SortKey.SUMMARY);
break;
case 2:
- tableSorter.getComparator().getSortCriterion(0).setKey(SortKey.DATE_CREATED);
+ tableSorter.getTaskComparator().getSortCriterion(0).setKey(SortKey.DATE_CREATED);
break;
case 3:
- tableSorter.getComparator().getSortCriterion(0).setKey(SortKey.TASK_ID);
+ tableSorter.getTaskComparator().getSortCriterion(0).setKey(SortKey.TASK_ID);
break;
default:
- tableSorter.getComparator().getSortCriterion(0).setKey(SortKey.PRIORITY);
+ tableSorter.getTaskComparator().getSortCriterion(0).setKey(SortKey.PRIORITY);
}
}
}
@@ -620,19 +620,19 @@ public class TaskListView extends AbstractTaskListView implements IPropertyChang
Integer sortDirInt = m2.getInteger(MEMENTO_KEY_SORT_DIRECTION);
if (sortDirInt != null) {
sortDirection = sortDirInt.intValue();
- tableSorter.getComparator().getSortCriterion(1).setDirection(sortDirection);
+ tableSorter.getTaskComparator().getSortCriterion(1).setDirection(sortDirection);
switch (restoredSortIndex) {
case 1:
- tableSorter.getComparator().getSortCriterion(1).setKey(SortKey.SUMMARY);
+ tableSorter.getTaskComparator().getSortCriterion(1).setKey(SortKey.SUMMARY);
break;
case 2:
- tableSorter.getComparator().getSortCriterion(1).setKey(SortKey.DATE_CREATED);
+ tableSorter.getTaskComparator().getSortCriterion(1).setKey(SortKey.DATE_CREATED);
break;
case 3:
- tableSorter.getComparator().getSortCriterion(1).setKey(SortKey.TASK_ID);
+ tableSorter.getTaskComparator().getSortCriterion(1).setKey(SortKey.TASK_ID);
break;
default:
- tableSorter.getComparator().getSortCriterion(1).setKey(SortKey.PRIORITY);
+ tableSorter.getTaskComparator().getSortCriterion(1).setKey(SortKey.PRIORITY);
}
}
}
@@ -953,7 +953,7 @@ public class TaskListView extends AbstractTaskListView implements IPropertyChang
@Override
public void widgetSelected(SelectionEvent e) {
- SortCriterion criterion = tableSorter.getComparator().getSortCriterion(0);
+ SortCriterion criterion = tableSorter.getTaskComparator().getSortCriterion(0);
criterion.setDirection(criterion.getDirection() * -1);
getViewer().refresh(false);
}

Back to the top