Attachment 111635 Details for Bug 244092 – updated 1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated 1

clipboard.txt (text/plain), 5.35 KB, created by Robert Elves

on 2008-09-03 18:11:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Elves

Created: 2008-09-03 18:11:24 EDT

Size: 5.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java,v
>retrieving revision 1.6
>diff -u -r1.6 TaskListInterestFilter.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java	8 Aug 2008 22:29:47 -0000	1.6
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java	3 Sep 2008 22:11:01 -0000
>@@ -126,7 +126,8 @@
> //			if (!TasksUiPlugin.getTaskActivityManager().isWeekDay((ScheduledTaskContainer) parent)) {
> //				return false;
> //			}
>-			if (TasksUiPlugin.getTaskActivityManager().isOverdue(task) || ((AbstractTask) task).isPastReminder()) {
>+			if (TasksUiPlugin.getTaskActivityManager().isOverdue(task)
>+					|| TasksUiPlugin.getTaskActivityManager().isPastReminder((AbstractTask) task)) {
> 				return true;
> 			}
> 
>@@ -139,7 +140,9 @@
> 		if (parent instanceof ScheduledTaskContainer) {
> 			return shouldShowInFocusedWorkweekDateContainer(parent, task);
> 		} else {
>-			return task.isPastReminder() || TasksUiPlugin.getTaskActivityManager().isScheduledForThisWeek(task)
>+			return TasksUiPlugin.getTaskActivityManager().isPastReminder(task)
>+					|| TasksUiPlugin.getTaskActivityManager().isSheduledForPastWeek(task)
>+					|| TasksUiPlugin.getTaskActivityManager().isScheduledForThisWeek(task)
> 					|| TasksUiPlugin.getTaskActivityManager().isDueThisWeek(task)
> 					|| TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task);
> 		}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java,v
>retrieving revision 1.88
>diff -u -r1.88 TasksUiPlugin.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java	21 Jul 2008 21:21:24 -0000	1.88
>+++ src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java	3 Sep 2008 22:11:01 -0000
>@@ -273,7 +273,7 @@
> 			Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();
> 			Set<AbstractNotification> reminders = new HashSet<AbstractNotification>();
> 			for (AbstractTask task : allTasks) {
>-				if (task.isPastReminder() && !task.isReminded()) {
>+				if (TasksUiPlugin.getTaskActivityManager().isPastReminder(task) && !task.isReminded()) {
> 					reminders.add(new TaskListNotificationReminder(task));
> 					task.setReminded(true);
> 				}
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java,v
>retrieving revision 1.65
>diff -u -r1.65 TaskActivityManager.java
>--- src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java	18 Aug 2008 06:49:07 -0000	1.65
>+++ src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java	3 Sep 2008 22:11:03 -0000
>@@ -613,8 +613,7 @@
> 	}
> 
> 	public boolean isPastReminder(AbstractTask task) {
>-		if (task == null || task.isCompleted() || task.getScheduledForDate() == null
>-				|| !task.getScheduledForDate().isDay()) {
>+		if (task == null || task.isCompleted() || task.getScheduledForDate() == null) {
> 			return false;
> 		} else {
> 			return isPastReminder(task.getScheduledForDate(), task.isCompleted());
>@@ -625,7 +624,7 @@
> 		if (date == null || isComplete) {
> 			return false;
> 		} else {
>-			if (date.getEndDate().compareTo(TaskActivityUtil.getCalendar()) < 0) {
>+			if (date.getEndDate().compareTo(TaskActivityUtil.getCalendar()) < 0 && date.isDay()) {
> 				return true;
> 			} else {
> 				return false;
>@@ -721,6 +720,21 @@
> 		return false;
> 	}
> 
>+	public boolean isSheduledForPastWeek(AbstractTask task) {
>+		boolean result = false;
>+		if (task != null && task.getScheduledForDate() != null) {
>+			result = isSheduledForPastWeek(task.getScheduledForDate());
>+		}
>+		return result;
>+	}
>+
>+	private boolean isSheduledForPastWeek(DateRange range) {
>+		if (range != null) {
>+			return range.isWeek() && range.isPast();
>+		}
>+		return false;
>+	}
>+
> 	public boolean isScheduledForNextWeek(AbstractTask task) {
> 		if (task != null) {
> 			DateRange range = task.getScheduledForDate();
>Index: src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java,v
>retrieving revision 1.25
>diff -u -r1.25 AbstractTask.java
>--- src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java	18 Aug 2008 10:58:54 -0000	1.25
>+++ src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java	3 Sep 2008 22:11:03 -0000
>@@ -404,7 +404,7 @@
> 	 */
> 	@Deprecated
> 	public boolean isPastReminder() {
>-		if (isCompleted() || scheduledForDate == null) {
>+		if (isCompleted() || scheduledForDate == null || !getScheduledForDate().isDay()) {
> 			return false;
> 		} else {
> 			if (/*!internalIsFloatingScheduledDate() && */scheduledForDate.getEndDate().compareTo(

Actions: View | Diff

Attachments on bug 244092: 111631 | 111635