Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelves2010-05-28 17:51:19 -0400
committerrelves2010-05-28 17:51:19 -0400
commit850a78e9411d07bff2b2285d5bc8b9953c7038f1 (patch)
tree516a6658803e886c583a2352a7afbb4cd79cfc48 /org.eclipse.mylyn.tasks.core
parentcc4b17bc3fd958e42ae877effe23782323f7b3fb (diff)
downloadorg.eclipse.mylyn.tasks-850a78e9411d07bff2b2285d5bc8b9953c7038f1.tar.gz
org.eclipse.mylyn.tasks-850a78e9411d07bff2b2285d5bc8b9953c7038f1.tar.xz
org.eclipse.mylyn.tasks-850a78e9411d07bff2b2285d5bc8b9953c7038f1.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.core')
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java29
1 files changed, 20 insertions, 9 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
index 9f8947164..74b34466a 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java
@@ -149,10 +149,10 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
}
}
- children.add(task);
+ addChild(children, task);
}
- children.add(task);
+ addChild(children, task);
}
}
@@ -164,7 +164,7 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
continue;
}
if (activityManager.isOwnedByUser(task)) {
- children.add(task);
+ addChild(children, task);
}
}
}
@@ -174,14 +174,17 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
for (ITask task : activityManager.getOverScheduledTasks()) {
if (task instanceof AbstractTask
&& !(((AbstractTask) task).getScheduledForDate() instanceof WeekDateRange)) {
- children.add(task);
+ addChild(children, task);
}
}
- children.addAll(activityManager.getOverDueTasks());
+ for (ITask task : activityManager.getOverDueTasks()) {
+ addChild(children, task);
+ }
+
// if not scheduled or due in future, and is active, place in today bin
ITask activeTask = activityManager.getActiveTask();
if (activeTask != null && !children.contains(activeTask)) {
- children.add(activeTask);
+ addChild(children, activeTask);
}
}
@@ -189,7 +192,7 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
for (ITask task : activityManager.getOverScheduledTasks()) {
if (task instanceof AbstractTask
&& ((AbstractTask) task).getScheduledForDate() instanceof WeekDateRange) {
- children.add(task);
+ addChild(children, task);
}
}
}
@@ -197,6 +200,14 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
return children;
}
+ private void addChild(Set<ITask> collection, ITask task) {
+ if (task.getSynchronizationState().isOutgoing()) {
+ return;
+ }
+
+ collection.add(task);
+ }
+
@Override
public String getSummary() {
if (summary != null) {
@@ -212,12 +223,12 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
@Override
public String getPriority() {
- return "";
+ return ""; //$NON-NLS-1$
}
@Override
public String getUrl() {
- return "";
+ return ""; //$NON-NLS-1$
}
@Override

Back to the top