Attachment #111635 for bug #244092

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

Lines 126-132 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListInterestFilter.java (-2 / +5 lines)
126	// if (!TasksUiPlugin.getTaskActivityManager().isWeekDay((ScheduledTaskContainer) parent)) {	126	// if (!TasksUiPlugin.getTaskActivityManager().isWeekDay((ScheduledTaskContainer) parent)) {
127	// return false;	127	// return false;
128	// }	128	// }
129	if (TasksUiPlugin.getTaskActivityManager().isOverdue(task) \|\| ((AbstractTask) task).isPastReminder()) {	129	if (TasksUiPlugin.getTaskActivityManager().isOverdue(task)
		130	\|\| TasksUiPlugin.getTaskActivityManager().isPastReminder((AbstractTask) task)) {
130	return true;	131	return true;
131	}	132	}
132		133
Lines 139-145 Link Here
139	if (parent instanceof ScheduledTaskContainer) {	140	if (parent instanceof ScheduledTaskContainer) {
140	return shouldShowInFocusedWorkweekDateContainer(parent, task);	141	return shouldShowInFocusedWorkweekDateContainer(parent, task);
141	} else {	142	} else {
142	return task.isPastReminder() \|\| TasksUiPlugin.getTaskActivityManager().isScheduledForThisWeek(task)	143	return TasksUiPlugin.getTaskActivityManager().isPastReminder(task)
		144	\|\| TasksUiPlugin.getTaskActivityManager().isSheduledForPastWeek(task)
		145	\|\| TasksUiPlugin.getTaskActivityManager().isScheduledForThisWeek(task)
143	\|\| TasksUiPlugin.getTaskActivityManager().isDueThisWeek(task)	146	\|\| TasksUiPlugin.getTaskActivityManager().isDueThisWeek(task)
144	\|\| TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task);	147	\|\| TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task);
145	}	148	}

Lines 273-279 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java (-1 / +1 lines)
273	Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();	273	Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();
274	Set<AbstractNotification> reminders = new HashSet<AbstractNotification>();	274	Set<AbstractNotification> reminders = new HashSet<AbstractNotification>();
275	for (AbstractTask task : allTasks) {	275	for (AbstractTask task : allTasks) {
276	if (task.isPastReminder() && !task.isReminded()) {	276	if (TasksUiPlugin.getTaskActivityManager().isPastReminder(task) && !task.isReminded()) {
277	reminders.add(new TaskListNotificationReminder(task));	277	reminders.add(new TaskListNotificationReminder(task));
278	task.setReminded(true);	278	task.setReminded(true);
279	}	279	}




	}

	public boolean isPastReminder(AbstractTask task) {
		if (task == null || task.isCompleted() || task.getScheduledForDate() == null) {
				|| !task.getScheduledForDate().isDay()) {
			return false;
		} else {
			return isPastReminder(task.getScheduledForDate(), task.isCompleted());

		if (date == null || isComplete) {
			return false;
		} else {
			if (date.getEndDate().compareTo(TaskActivityUtil.getCalendar()) < 0 && date.isDay()) {
				return true;
			} else {
				return false;

		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();

Lines 404-410 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/AbstractTask.java (-1 / +1 lines)
404	*/	404	*/
405	@Deprecated	405	@Deprecated
406	public boolean isPastReminder() {	406	public boolean isPastReminder() {
407	if (isCompleted() \|\| scheduledForDate == null) {	407	if (isCompleted() \|\| scheduledForDate == null \|\| !getScheduledForDate().isDay()) {
408	return false;	408	return false;
409	} else {	409	} else {
410	if (/!internalIsFloatingScheduledDate() && /scheduledForDate.getEndDate().compareTo(	410	if (/!internalIsFloatingScheduledDate() && /scheduledForDate.getEndDate().compareTo(

Return to bug 244092

Lines 613-620 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java (-3 / +17 lines)
613	}	613	}
614		614
615	public boolean isPastReminder(AbstractTask task) {	615	public boolean isPastReminder(AbstractTask task) {
616	if (task == null \|\| task.isCompleted() \|\| task.getScheduledForDate() == null	616	if (task == null \|\| task.isCompleted() \|\| task.getScheduledForDate() == null) {
617	\|\| !task.getScheduledForDate().isDay()) {
618	return false;	617	return false;
619	} else {	618	} else {
620	return isPastReminder(task.getScheduledForDate(), task.isCompleted());	619	return isPastReminder(task.getScheduledForDate(), task.isCompleted());
Lines 625-631 Link Here
625	if (date == null \|\| isComplete) {	624	if (date == null \|\| isComplete) {
626	return false;	625	return false;
627	} else {	626	} else {
628	if (date.getEndDate().compareTo(TaskActivityUtil.getCalendar()) < 0) {	627	if (date.getEndDate().compareTo(TaskActivityUtil.getCalendar()) < 0 && date.isDay()) {
629	return true;	628	return true;
630	} else {	629	} else {
631	return false;	630	return false;
Lines 721-726 Link Here
721	return false;	720	return false;
722	}	721	}
723		722
		723	public boolean isSheduledForPastWeek(AbstractTask task) {
		724	boolean result = false;
		725	if (task != null && task.getScheduledForDate() != null) {
		726	result = isSheduledForPastWeek(task.getScheduledForDate());
		727	}
		728	return result;
		729	}
		730
		731	private boolean isSheduledForPastWeek(DateRange range) {
		732	if (range != null) {
		733	return range.isWeek() && range.isPast();
		734	}
		735	return false;
		736	}
		737
724	public boolean isScheduledForNextWeek(AbstractTask task) {	738	public boolean isScheduledForNextWeek(AbstractTask task) {
725	if (task != null) {	739	if (task != null) {
726	DateRange range = task.getScheduledForDate();	740	DateRange range = task.getScheduledForDate();