NEW - bug 334445: [patch] date bins for next week should indicate the day of the week

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

5 files changed, 42 insertions, 25 deletions

diff --git a/org.eclipse.mylyn.tasks.core/.classpath b/org.eclipse.mylyn.tasks.core/.classpath
index 97b36d470..d74743529 100644
--- a/org.eclipse.mylyn.tasks.core/.classpath
+++ b/org.eclipse.mylyn.tasks.core/.classpath
@@ -7,6 +7,9 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/mylyn/internal/provisional/**"/>
+		</accessrules>
 	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/DayDateRange.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/DayDateRange.java
index 0203ff3bc..aa7faede4 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/DayDateRange.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/DayDateRange.java
@@ -47,30 +47,7 @@ public class DayDateRange extends DateRange {
 		endNextWeek.add(Calendar.DAY_OF_YEAR, 7);
 		boolean isNextWeek = TaskActivityUtil.getNextWeek().includes(this) && this.before(endNextWeek);
 		if (isThisWeek || (useDayOfWeekForNextWeek && isNextWeek)) {
-			String day = ""; //$NON-NLS-1$
-			switch (getStartDate().get(Calendar.DAY_OF_WEEK)) {
-			case Calendar.MONDAY:
-				day = CommonMessages.Monday;
-				break;
-			case Calendar.TUESDAY:
-				day = CommonMessages.Tuesday;
-				break;
-			case Calendar.WEDNESDAY:
-				day = CommonMessages.Wednesday;
-				break;
-			case Calendar.THURSDAY:
-				day = CommonMessages.Thursday;
-				break;
-			case Calendar.FRIDAY:
-				day = CommonMessages.Friday;
-				break;
-			case Calendar.SATURDAY:
-				day = CommonMessages.Saturday;
-				break;
-			case Calendar.SUNDAY:
-				day = CommonMessages.Sunday;
-				break;
-			}
+			String day = getDayOfWeek();
 			if (isPresent()) {
 				return day + Messages.DayDateRange___Today;
 			} else {
@@ -80,6 +57,34 @@ public class DayDateRange extends DateRange {
 		return super.toString(useDayOfWeekForNextWeek);
 	}
 
+	public String getDayOfWeek() {
+		String day = ""; //$NON-NLS-1$
+		switch (getStartDate().get(Calendar.DAY_OF_WEEK)) {
+		case Calendar.MONDAY:
+			day = CommonMessages.Monday;
+			break;
+		case Calendar.TUESDAY:
+			day = CommonMessages.Tuesday;
+			break;
+		case Calendar.WEDNESDAY:
+			day = CommonMessages.Wednesday;
+			break;
+		case Calendar.THURSDAY:
+			day = CommonMessages.Thursday;
+			break;
+		case Calendar.FRIDAY:
+			day = CommonMessages.Friday;
+			break;
+		case Calendar.SATURDAY:
+			day = CommonMessages.Saturday;
+			break;
+		case Calendar.SUNDAY:
+			day = CommonMessages.Sunday;
+			break;
+		}
+		return day;
+	}
+
 	public static boolean isDayRange(Calendar calStart, Calendar calEnd) {
 		// bug 248683
 		long diff = (calEnd.getTimeInMillis() - calStart.getTimeInMillis()) - (DAY - 1);
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java
index 511685cb3..ff30a4598 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java
@@ -61,6 +61,8 @@ public class Messages extends NLS {
 
 	public static String PriorityLevel_Very_Low;
 
+	public static String ScheduledTaskContainer_Date_Day_Pattern;
+
 	public static String TaskJobFactory_Refreshing_repository_configuration;
 
 	public static String TaskJobFactory_Receiving_configuration;
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 86ece2539..7634c1597 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
@@ -18,6 +18,7 @@ import java.util.Set;
 
 import org.eclipse.mylyn.tasks.core.IRepositoryElement;
 import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.osgi.util.NLS;
 
 /**
  * @author Rob Elves
@@ -36,7 +37,12 @@ public class ScheduledTaskContainer extends AbstractTaskContainer {
 		this.activityManager = activityManager;
 		this.range = range;
 		if (summary == null) {
-			this.summary = range.toString(false);
+			if (range instanceof DayDateRange && TaskActivityUtil.getNextWeek().includes(range)) {
+				this.summary = NLS.bind(Messages.ScheduledTaskContainer_Date_Day_Pattern, range.toString(false),
+						((DayDateRange) range).getDayOfWeek());
+			} else {
+				this.summary = range.toString(false);
+			}
 		} else {
 			this.summary = summary;
 		}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties
index b01ae78cc..c61315455 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties
@@ -34,6 +34,7 @@ PriorityLevel_Low=Low
 PriorityLevel_Normal=Normal
 PriorityLevel_Very_High=Very High
 PriorityLevel_Very_Low=Very Low
+ScheduledTaskContainer_Date_Day_Pattern={0} - {1}
 
 TaskJobFactory_Refreshing_repository_configuration=Refreshing repository configuration
 TaskJobFactory_Receiving_configuration=Receiving configuration