Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelves2010-07-13 18:54:41 -0400
committerrelves2010-07-13 18:54:41 -0400
commit69e00b02ad3b79370f992bf9cf244551f6126c4e (patch)
tree62b2a512c27ae84e306cec84438d883eed25685f
parentecb93e59d63781ca47ca5f14f12e960f943a5cb8 (diff)
downloadorg.eclipse.mylyn.tasks-69e00b02ad3b79370f992bf9cf244551f6126c4e.tar.gz
org.eclipse.mylyn.tasks-69e00b02ad3b79370f992bf9cf244551f6126c4e.tar.xz
org.eclipse.mylyn.tasks-69e00b02ad3b79370f992bf9cf244551f6126c4e.zip
NEW - bug 316373: due task scheduled for next weeks shows twice
https://bugs.eclipse.org/bugs/show_bug.cgi?id=316373
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/ScheduledTaskContainer.java6
1 files changed, 3 insertions, 3 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 f1db7796d..86ece2539 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
@@ -152,7 +152,7 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
}
// Add due tasks if not the This Week container, and not scheduled for earlier date
- if (!(range instanceof WeekDateRange && ((WeekDateRange) range).isPresent())) {
+ if (!TaskActivityUtil.getCurrentWeek().equals(range) && !TaskActivityUtil.getNextWeek().equals(range)) {
for (ITask task : getTasksDueThisWeek()) {
if (isScheduledBeforeDue(task)) {
continue;
@@ -209,9 +209,9 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
return task instanceof AbstractTask && ((AbstractTask) task).getScheduledForDate() instanceof WeekDateRange;
}
- private boolean isDueBeforeScheduled(ITask task) {
+ public boolean isDueBeforeScheduled(ITask task) {
return task.getDueDate() != null
- && task.getDueDate().before(((AbstractTask) task).getScheduledForDate().getStartDate().getTime());
+ && task.getDueDate().before(((AbstractTask) task).getScheduledForDate().getEndDate().getTime());
}
private boolean isScheduledForADay(ITask task) {

Back to the top