1 files changed, 19 insertions, 15 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 dcf494f82..271c53dda 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * 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
@@ -32,11 +32,11 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 	private final DateRange range;
 
 	public ScheduledTaskContainer(TaskActivityManager activityManager, DateRange range, String summary) {
-		super(summary == null ? range.toString() : summary);
+		super(summary == null ? range.toString(false) : summary);
 		this.activityManager = activityManager;
 		this.range = range;
 		if (summary == null) {
-			this.summary = range.toString();
+			this.summary = range.toString(false);
 		} else {
 			this.summary = summary;
 		}
@@ -54,14 +54,16 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 		return range.getStartDate().before(Calendar.getInstance()) && range.getEndDate().after(Calendar.getInstance());
 	}
 
-	public boolean isWeekDay() {
-		return TaskActivityUtil.getCurrentWeek().isCurrentWeekDay(range);
-	}
+//	public boolean isWeekDay() {
+//		return TaskActivityUtil.getCurrentWeek().isCurrentWeekDay(range);
+//	}
 
-	public boolean isToday() {
-		return isPresent()
-				&& range.getStartDate().get(Calendar.DAY_OF_YEAR) == range.getEndDate().get(Calendar.DAY_OF_YEAR);
-	}
+//	public boolean isToday() {
+//		if (range instanceof DayDateRange) {
+//			return ((DayDateRange) range).isToday();
+//		}
+//		return false;
+//	}
 
 //	public Collection<ITask> getChildren() {
 //		Set<ITask> children = new HashSet<ITask>();
@@ -131,7 +133,7 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 		}
 
 		// Add due tasks if not the This Week container
-		if (!(range instanceof WeekDateRange && isPresent())) {
+		if (!(range instanceof WeekDateRange && ((WeekDateRange) range).isPresent())) {
 			for (ITask task : activityManager.getDueTasks(range.getStartDate(), range.getEndDate())) {
 				if (activityManager.isOwnedByUser(task)) {
 					children.add(task);
@@ -140,9 +142,10 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 		}
 
 		// All over due/scheduled tasks are present in the Today folder
-		if (isToday()) {
+		if ((range instanceof DayDateRange) && ((DayDateRange) range).isPresent()) {
 			for (ITask task : activityManager.getOverScheduledTasks()) {
-				if (task instanceof AbstractTask && !((AbstractTask) task).getScheduledForDate().isWeek()) {
+				if (task instanceof AbstractTask
+						&& !(((AbstractTask) task).getScheduledForDate() instanceof WeekDateRange)) {
 					children.add(task);
 				}
 			}
@@ -154,9 +157,10 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 			}
 		}
 
-		if (range.isThisWeek()) {
+		if (range instanceof WeekDateRange && ((WeekDateRange) range).isThisWeek()) {
 			for (ITask task : activityManager.getOverScheduledTasks()) {
-				if (task instanceof AbstractTask && ((AbstractTask) task).getScheduledForDate().isWeek()) {
+				if (task instanceof AbstractTask
+						&& ((AbstractTask) task).getScheduledForDate() instanceof WeekDateRange) {
 					children.add(task);
 				}
 			}