RESOLVED - bug 202705: scheduling for Sunday causes task to disappear in Focused mode and other scheduling nits

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

1 files changed, 9 insertions, 13 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
index 399c42884..51dd44fcc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
@@ -191,14 +191,6 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 
 		subMenuManager.add(action);
 
-		// future
-		action = new Action() {
-			@Override
-			public void run() {
-				// ignore
-			}
-		};
-
 		if (singleTaskSelection != null && singleTaskSelection.getScheduledForDate() != null) {
 
 			Calendar time = TaskActivityUtil.getCalendar();
@@ -209,12 +201,18 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 			start.add(Calendar.WEEK_OF_MONTH, 1);
 
 			if (time.compareTo(start) >= 0) {
+				// future
+				action = new Action() {
+					@Override
+					public void run() {
+						// ignore
+					}
+				};
 				action.setChecked(true);
+				action.setText(LABEL_FUTURE);
+				subMenuManager.add(action);
 			}
 		}
-		action.setText(LABEL_FUTURE);
-		action.setEnabled(false);
-		subMenuManager.add(action);
 
 		subMenuManager.add(new Separator());
 
@@ -254,12 +252,10 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 			}
 		};
 		action.setText(LABEL_NOT_SCHEDULED);
-		action.setEnabled(taskListElementsToSchedule.size() > 0);
 		if (singleTaskSelection != null) {
 			if (singleTaskSelection.getScheduledForDate() == null) {
 				action.setChecked(true);
 			}
-			action.setEnabled(singleTaskSelection.getScheduledForDate() != null);
 		}
 		subMenuManager.add(action);
 		return subMenuManager;