diff options
3 files changed, 13 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WeekDateRange.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WeekDateRange.java index 331bceb77..b558453a4 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WeekDateRange.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WeekDateRange.java @@ -24,9 +24,9 @@ public class WeekDateRange extends DateRange { private static final String DESCRIPTION_PREVIOUS_WEEK = "Previous Week"; - private static final String DESCRIPTION_THIS_WEEK = "Someday This Week"; + private static final String DESCRIPTION_THIS_WEEK = "This Week"; - private static final String DESCRIPTION_NEXT_WEEK = "Someday Next Week"; + private static final String DESCRIPTION_NEXT_WEEK = "Next Week"; private final List<DayDateRange> days = new ArrayList<DayDateRange>(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java index 4fc07df68..4e50bf450 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java @@ -340,7 +340,6 @@ public class TaskListToolTip extends ToolTip { } private ProgressData getProgressData(IRepositoryElement element) { - System.err.println(">>>> " + element); if (element instanceof ITaskContainer) { Object[] children = new Object[0]; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java index ce1eeeec8..b7c4b901a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java @@ -25,6 +25,7 @@ import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes; import org.eclipse.mylyn.internal.tasks.core.AbstractTask; import org.eclipse.mylyn.internal.tasks.core.AutomaticRepositoryTaskContainer; +import org.eclipse.mylyn.internal.tasks.core.DayDateRange; import org.eclipse.mylyn.internal.tasks.core.Person; import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; @@ -33,6 +34,7 @@ import org.eclipse.mylyn.internal.tasks.core.TaskGroup; import org.eclipse.mylyn.internal.tasks.core.UncategorizedTaskContainer; import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer; import org.eclipse.mylyn.internal.tasks.core.UnsubmittedTaskContainer; +import org.eclipse.mylyn.internal.tasks.core.WeekDateRange; import org.eclipse.mylyn.internal.tasks.ui.ITaskHighlighter; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; @@ -133,7 +135,15 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro } else if (element instanceof ITask) { compositeDescriptor.icon = TasksUiImages.TASK; } else if (element instanceof ScheduledTaskContainer) { - compositeDescriptor.icon = CommonImages.CALENDAR; + ScheduledTaskContainer scheduledTaskContainer = (ScheduledTaskContainer) element; + System.err.println(">>>> " + scheduledTaskContainer.getClass()); + if (scheduledTaskContainer.getDateRange() instanceof DayDateRange) { + compositeDescriptor.icon = CommonImages.SCHEDULE_DAY; + } else if (scheduledTaskContainer.getDateRange() instanceof WeekDateRange) { + compositeDescriptor.icon = CommonImages.SCHEDULE_WEEK; + } else { + compositeDescriptor.icon = TasksUiImages.QUERY_UNMATCHED; + } } else if (element instanceof Person) { compositeDescriptor.icon = CommonImages.PERSON; Person person = (Person) element; |