Attachment #171649 for bug #316214

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

View | Details | Raw Unified | Return to bug 316214
Collapse All | Expand All




import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;

import org.eclipse.mylyn.internal.tasks.ui.util.PlatformUtil;
import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.ITask;
import org.eclipse.mylyn.tasks.core.ITaskContainer;
import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
import org.eclipse.mylyn.tasks.core.ITaskContainer;
import org.eclipse.mylyn.tasks.ui.TasksUiImages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;

		this.lastClippingArea = new Rectangle(0, 0, 0, 0);
		this.tweakClipping = PlatformUtil.isPaintItemClippingRequired();
		this.platformSpecificSquish = PlatformUtil.getTreeItemSquish();
		this.synchronizationOverlaid = TasksUiPlugin.getDefault()
				.getPreferenceStore()
				.getBoolean(ITasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT);
		this.useStrikethroughForCompleted = TasksUiPlugin.getDefault()
				.getPreferenceStore()
				.getBoolean(ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED);
		this.focusedMode = focusedMode;
		TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
	}

	}

	private boolean hideDecorationOnContainer(ITaskContainer element, TreeItem treeItem) {
		if (element instanceof ScheduledTaskContainer) {
			return true;
		} else if (element instanceof UnmatchedTaskContainer) {
			if (!focusedMode) {
				return false;
			} else if (AbstractTaskListFilter.hasDescendantIncoming(element)) {

Lines 131-137 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java (-7 / +15 lines)
131	} else if (element instanceof ScheduledTaskContainer) {	131	} else if (element instanceof ScheduledTaskContainer) {
132	ScheduledTaskContainer scheduledTaskContainer = (ScheduledTaskContainer) element;	132	ScheduledTaskContainer scheduledTaskContainer = (ScheduledTaskContainer) element;
133	if (scheduledTaskContainer.getDateRange() instanceof DayDateRange) {	133	if (scheduledTaskContainer.getDateRange() instanceof DayDateRange) {
134	compositeDescriptor.icon = CommonImages.SCHEDULE_DAY;	134	if (scheduledTaskContainer.isPresent()) {
		135	compositeDescriptor.icon = CommonImages.SCHEDULE_DAY;
		136	} else {
		137	compositeDescriptor.icon = CommonImages.SCHEDULE;
		138	}
135	} else if (scheduledTaskContainer.getDateRange() instanceof WeekDateRange) {	139	} else if (scheduledTaskContainer.getDateRange() instanceof WeekDateRange) {
136	compositeDescriptor.icon = CommonImages.SCHEDULE_WEEK;	140	compositeDescriptor.icon = CommonImages.SCHEDULE_WEEK;
137	} else {	141	} else {
Lines 206-217 Link Here
206	}	210	}
207	}	211	}
208	} else if (object instanceof ITaskContainer) {	212	} else if (object instanceof ITaskContainer) {
209	for (ITask child : ((ITaskContainer) object).getChildren()) {	213	if (object instanceof ScheduledTaskContainer) {
210	if (child.isActive() \|\| (child instanceof ITaskContainer && showHasActiveChild((ITaskContainer) child))) {	214	return null;
211	return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_TASK_ACTIVE);	215	} else {
212	} else if (TasksUiPlugin.getTaskActivityManager().isOverdue(child)) {	216	for (ITask child : ((ITaskContainer) object).getChildren()) {
213	// } else if ((child.isPastReminder() && !child.isCompleted()) \|\| showHasChildrenPastDue(child)) {	217	if (child.isActive()
214	return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_OVERDUE);	218	\|\| (child instanceof ITaskContainer && showHasActiveChild((ITaskContainer) child))) {
		219	return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_TASK_ACTIVE);
		220	} else if (TasksUiPlugin.getTaskActivityManager().isOverdue(child)) {
		221	return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_OVERDUE);
		222	}
215	}	223	}
216	}	224	}
217	}	225	}

Return to bug 316214

Lines 18-23 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java (-6 / +11 lines)
18	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;	18	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
19	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;	19	import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
20	import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;	20	import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
		21	import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
21	import org.eclipse.mylyn.internal.tasks.core.TaskCategory;	22	import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
22	import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;	23	import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
23	import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;	24	import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter;
Lines 26-33 Link Here
26	import org.eclipse.mylyn.internal.tasks.ui.util.PlatformUtil;	27	import org.eclipse.mylyn.internal.tasks.ui.util.PlatformUtil;
27	import org.eclipse.mylyn.tasks.core.IRepositoryQuery;	28	import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
28	import org.eclipse.mylyn.tasks.core.ITask;	29	import org.eclipse.mylyn.tasks.core.ITask;
29	import org.eclipse.mylyn.tasks.core.ITaskContainer;
30	import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;	30	import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState;
		31	import org.eclipse.mylyn.tasks.core.ITaskContainer;
31	import org.eclipse.mylyn.tasks.ui.TasksUiImages;	32	import org.eclipse.mylyn.tasks.ui.TasksUiImages;
32	import org.eclipse.swt.SWT;	33	import org.eclipse.swt.SWT;
33	import org.eclipse.swt.graphics.Image;	34	import org.eclipse.swt.graphics.Image;
Lines 84-93 Link Here
84	this.lastClippingArea = new Rectangle(0, 0, 0, 0);	85	this.lastClippingArea = new Rectangle(0, 0, 0, 0);
85	this.tweakClipping = PlatformUtil.isPaintItemClippingRequired();	86	this.tweakClipping = PlatformUtil.isPaintItemClippingRequired();
86	this.platformSpecificSquish = PlatformUtil.getTreeItemSquish();	87	this.platformSpecificSquish = PlatformUtil.getTreeItemSquish();
87	this.synchronizationOverlaid = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(	88	this.synchronizationOverlaid = TasksUiPlugin.getDefault()
88	ITasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT);	89	.getPreferenceStore()
89	this.useStrikethroughForCompleted = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(	90	.getBoolean(ITasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT);
90	ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED);	91	this.useStrikethroughForCompleted = TasksUiPlugin.getDefault()
		92	.getPreferenceStore()
		93	.getBoolean(ITasksUiPreferenceConstants.USE_STRIKETHROUGH_FOR_COMPLETED);
91	this.focusedMode = focusedMode;	94	this.focusedMode = focusedMode;
92	TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);	95	TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
93	}	96	}
Lines 230-236 Link Here
230	}	233	}
231		234
232	private boolean hideDecorationOnContainer(ITaskContainer element, TreeItem treeItem) {	235	private boolean hideDecorationOnContainer(ITaskContainer element, TreeItem treeItem) {
233	if (element instanceof UnmatchedTaskContainer) {	236	if (element instanceof ScheduledTaskContainer) {
		237	return true;
		238	} else if (element instanceof UnmatchedTaskContainer) {
234	if (!focusedMode) {	239	if (!focusedMode) {
235	return false;	240	return false;
236	} else if (AbstractTaskListFilter.hasDescendantIncoming(element)) {	241	} else if (AbstractTaskListFilter.hasDescendantIncoming(element)) {