Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelves2010-06-01 14:38:44 -0400
committerrelves2010-06-01 14:38:44 -0400
commit1937c934f05edfce6e5fb3bdc094baa95a94d19b (patch)
treef89490dee3e985a17ee85f63f59f2fa6d5f9c315 /org.eclipse.mylyn.tasks.ui
parent8dc69f8d0ff8087f0d4f90fbaf1db92bca5ea648 (diff)
downloadorg.eclipse.mylyn.tasks-1937c934f05edfce6e5fb3bdc094baa95a94d19b.tar.gz
org.eclipse.mylyn.tasks-1937c934f05edfce6e5fb3bdc094baa95a94d19b.tar.xz
org.eclipse.mylyn.tasks-1937c934f05edfce6e5fb3bdc094baa95a94d19b.zip
NEW - bug 314166: fix the scheduled presentation bins and sort order
https://bugs.eclipse.org/bugs/show_bug.cgi?id=314166
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
index e5ff013f4..211acf076 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java
@@ -77,8 +77,8 @@ public class TaskScheduleContentProvider extends TaskListContentProvider impleme
incoming = new Incoming();
OUTGOING_TIME = TaskActivityUtil.getCalendar();
- OUTGOING_TIME.setTimeInMillis(TaskActivityUtil.getCurrentWeek().getToday().getStartDate().getTimeInMillis() - 1);
-// OUTGOING_TIME.setTimeInMillis(END_OF_TIME.getTimeInMillis() - 2);
+ //OUTGOING_TIME.setTimeInMillis(TaskActivityUtil.getCurrentWeek().getToday().getStartDate().getTimeInMillis() - 1);
+ OUTGOING_TIME.setTimeInMillis(END_OF_TIME.getTimeInMillis() - 2);
outgoing = new Outgoing();
COMPLETED_TIME = TaskActivityUtil.getCalendar();
@@ -270,7 +270,8 @@ public class TaskScheduleContentProvider extends TaskListContentProvider impleme
public Collection<ITask> getChildren() {
Set<ITask> children = new HashSet<ITask>();
for (ITask task : TasksUiPlugin.getTaskList().getAllTasks()) {
- if (task.getSynchronizationState().equals(SynchronizationState.OUTGOING)
+ if (task.getDueDate() == null && ((AbstractTask) task).getScheduledForDate() == null
+ && task.getSynchronizationState().equals(SynchronizationState.OUTGOING)
|| task.getSynchronizationState().equals(SynchronizationState.OUTGOING_NEW)
|| task.getSynchronizationState().equals(SynchronizationState.CONFLICT)) {
children.add(task);

Back to the top