Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 171649 Details for
Bug 316214
remove container decorations from the Scheduled presentation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
patch
clipboard.txt (text/plain), 5.40 KB, created by
Mik Kersten
on 2010-06-10 11:33:17 EDT
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Mik Kersten
Created:
2010-06-10 11:33:17 EDT
Size:
5.40 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.mylyn.tasks.ui >Index: src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java,v >retrieving revision 1.74 >diff -u -r1.74 CustomTaskListDecorationDrawer.java >--- src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java 1 Mar 2010 21:44:18 -0000 1.74 >+++ src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java 10 Jun 2010 15:29:49 -0000 >@@ -18,6 +18,7 @@ > 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; >@@ -26,8 +27,8 @@ > 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; >@@ -84,10 +85,12 @@ > 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.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); > } >@@ -230,7 +233,9 @@ > } > > private boolean hideDecorationOnContainer(ITaskContainer element, TreeItem treeItem) { >- if (element instanceof UnmatchedTaskContainer) { >+ if (element instanceof ScheduledTaskContainer) { >+ return true; >+ } else if (element instanceof UnmatchedTaskContainer) { > if (!focusedMode) { > return false; > } else if (AbstractTaskListFilter.hasDescendantIncoming(element)) { >Index: src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java,v >retrieving revision 1.24 >diff -u -r1.24 TaskElementLabelProvider.java >--- src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java 8 Jun 2010 19:54:34 -0000 1.24 >+++ src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java 10 Jun 2010 15:29:49 -0000 >@@ -131,7 +131,11 @@ > } else if (element instanceof ScheduledTaskContainer) { > ScheduledTaskContainer scheduledTaskContainer = (ScheduledTaskContainer) element; > if (scheduledTaskContainer.getDateRange() instanceof DayDateRange) { >- compositeDescriptor.icon = CommonImages.SCHEDULE_DAY; >+ if (scheduledTaskContainer.isPresent()) { >+ compositeDescriptor.icon = CommonImages.SCHEDULE_DAY; >+ } else { >+ compositeDescriptor.icon = CommonImages.SCHEDULE; >+ } > } else if (scheduledTaskContainer.getDateRange() instanceof WeekDateRange) { > compositeDescriptor.icon = CommonImages.SCHEDULE_WEEK; > } else { >@@ -206,12 +210,16 @@ > } > } > } else if (object instanceof ITaskContainer) { >- for (ITask child : ((ITaskContainer) object).getChildren()) { >- if (child.isActive() || (child instanceof ITaskContainer && showHasActiveChild((ITaskContainer) child))) { >- return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_TASK_ACTIVE); >- } else if (TasksUiPlugin.getTaskActivityManager().isOverdue(child)) { >-// } else if ((child.isPastReminder() && !child.isCompleted()) || showHasChildrenPastDue(child)) { >- return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_OVERDUE); >+ if (object instanceof ScheduledTaskContainer) { >+ return null; >+ } else { >+ for (ITask child : ((ITaskContainer) object).getChildren()) { >+ if (child.isActive() >+ || (child instanceof ITaskContainer && showHasActiveChild((ITaskContainer) child))) { >+ return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_TASK_ACTIVE); >+ } else if (TasksUiPlugin.getTaskActivityManager().isOverdue(child)) { >+ return themeManager.getCurrentTheme().getColorRegistry().get(CommonThemes.COLOR_OVERDUE); >+ } > } > } > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 316214
: 171649 |
171650