Progress on: 129619: [discussion] UI improvements

https://bugs.eclipse.org/bugs/show_bug.cgi?id=129619

2 files changed, 47 insertions, 42 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 4ec333f57..5846b8d76 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -206,7 +206,7 @@
                enablesFor="*"
                icon="icons/etool16/repository-synchronize.gif"
                id="org.eclipse.mylar.bugzilla.ui.popup.refresh"
-               label="Synchronize Queries"
+               label="Synchronize All"
                menubarPath="additions"
                tooltip="Synchronize with Repository">
          </action>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/TaskListManager.java
index 6457699c1..7ca592e00 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/provisional/tasklist/TaskListManager.java
@@ -590,62 +590,67 @@ public class TaskListManager {
 	}
 
 	public boolean isCompletedToday(ITask task) {
-		Date completionDate = task.getCompletionDate();
-		if (completionDate == null) {
-			return false;
-		} else {
-			Calendar tomorrow = Calendar.getInstance();
-			MylarTaskListPlugin.getTaskListManager().setSecheduledIn(tomorrow, 1);
-
-			Calendar yesterday = Calendar.getInstance();
-			yesterday.set(Calendar.HOUR_OF_DAY, 0);
-			yesterday.set(Calendar.MINUTE, 0);
-			yesterday.set(Calendar.SECOND, 0);
-			yesterday.set(Calendar.MILLISECOND, 0);
-
-			return completionDate.compareTo(yesterday.getTime()) == 1
-					&& completionDate.compareTo(tomorrow.getTime()) == -1;
+		if (task != null) {
+			Date completionDate = task.getCompletionDate();
+			if (completionDate != null) {
+				Calendar tomorrow = Calendar.getInstance();
+				MylarTaskListPlugin.getTaskListManager().setSecheduledIn(tomorrow, 1);
+
+				Calendar yesterday = Calendar.getInstance();
+				yesterday.set(Calendar.HOUR_OF_DAY, 0);
+				yesterday.set(Calendar.MINUTE, 0);
+				yesterday.set(Calendar.SECOND, 0);
+				yesterday.set(Calendar.MILLISECOND, 0);
+
+				return completionDate.compareTo(yesterday.getTime()) == 1
+						&& completionDate.compareTo(tomorrow.getTime()) == -1;
+			}
 		}
+		return false;
 	}
 
 	public boolean isReminderAfterThisWeek(ITask task) {
-		Date reminder = task.getReminderDate();
-		if (reminder != null) {
-			return reminder.compareTo(activityNextWeek.getStart().getTime()) > -1;
-		} else {
-			return false;
+		if (task != null) {
+			Date reminder = task.getReminderDate();
+			if (reminder != null) {
+				return reminder.compareTo(activityNextWeek.getStart().getTime()) > -1;
+			}
 		}
+		return false;
 	}
 
 	public boolean isReminderLater(ITask task) {
-		Date reminder = task.getReminderDate();
-		if (reminder != null) {
-			return reminder.compareTo(activityFuture.getStart().getTime()) > -1;
-		} else {
-			return false;
+		if (task != null) {
+			Date reminder = task.getReminderDate();
+			if (reminder != null) {
+				return reminder.compareTo(activityFuture.getStart().getTime()) > -1;
+			}
 		}
-	} 
-	
+		return false;
+	}
+
 	public boolean isReminderThisWeek(ITask task) {
-		Date reminder = task.getReminderDate();
-		if (reminder != null) {
-			Date now = new Date();
-			return (reminder.compareTo(now) == 1 && reminder.compareTo(activityThisWeek.getEnd().getTime()) == -1);
-		} else {
-			return false;
+		if (task != null) {
+			Date reminder = task.getReminderDate();
+			if (reminder != null) {
+				Date now = new Date();
+				return (reminder.compareTo(now) == 1 && reminder.compareTo(activityThisWeek.getEnd().getTime()) == -1);
+			}
 		}
+		return false;
 	}
 
 	public boolean isReminderToday(ITask task) {
-		Date reminder = task.getReminderDate();
-		if (reminder != null) {
-			Date now = new Date();
-			Calendar tomorrow = GregorianCalendar.getInstance();
-			MylarTaskListPlugin.getTaskListManager().setSecheduledIn(tomorrow, 1);
-			return (reminder.compareTo(now) == 1 && reminder.compareTo(tomorrow.getTime()) == -1);
-		} else {
-			return false;
+		if (task != null) {
+			Date reminder = task.getReminderDate();
+			if (reminder != null) {
+				Date now = new Date();
+				Calendar tomorrow = GregorianCalendar.getInstance();
+				MylarTaskListPlugin.getTaskListManager().setSecheduledIn(tomorrow, 1);
+				return (reminder.compareTo(now) == 1 && reminder.compareTo(tomorrow.getTime()) == -1);
+			}
 		}
+		return false;
 	}
 
 	/**