diff options
4 files changed, 7 insertions, 86 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 db7f5d702..1533ed233 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 @@ -27,7 +27,6 @@ import org.eclipse.mylyn.internal.tasks.core.AbstractTask; import org.eclipse.mylyn.internal.tasks.core.DateRange; import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil; import org.eclipse.mylyn.internal.tasks.core.WeekDateRange; -import org.eclipse.mylyn.internal.tasks.ui.actions.TaskEditorScheduleAction; import org.eclipse.mylyn.tasks.core.IRepositoryElement; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.ui.PlatformUI; @@ -40,8 +39,6 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor { private AbstractTask singleTaskSelection; - private TaskEditorScheduleAction scheduleAction; - private final List<IRepositoryElement> taskListElementsToSchedule = new ArrayList<IRepositoryElement>(); public MenuManager getSubMenuManager(final List<IRepositoryElement> selectedElements) { @@ -115,7 +112,9 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor { Action action = createDateSelectionAction(week, CommonImages.SCHEDULE_WEEK); subMenuManager.add(action); // Special case: This Week holds previous weeks' scheduled tasks - if (isThisWeek(singleTaskSelection)) { + if (singleTaskSelection != null && singleTaskSelection.getScheduledForDate() != null + && singleTaskSelection.getScheduledForDate() instanceof WeekDateRange + && singleTaskSelection.getScheduledForDate().isBefore(week)) { // Tasks scheduled for 'someday' float into this week action.setChecked(true); } @@ -198,12 +197,6 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor { return subMenuManager; } - private boolean isThisWeek(AbstractTask task) { - return task != null && task.getScheduledForDate() != null - && task.getScheduledForDate() instanceof WeekDateRange - && task.getScheduledForDate().isBefore(TaskActivityUtil.getCurrentWeek()); - } - private boolean selectionIncludesCompletedTasks() { if (singleTaskSelection instanceof AbstractTask) { if ((singleTaskSelection).isCompleted()) { @@ -261,9 +254,6 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor { } else { TasksUiPlugin.getTaskActivityManager().setScheduledFor(task, null); } - if (scheduleAction != null && singleTaskSelection != null) { - scheduleAction.updateImageDescriptor(singleTaskSelection); - } } } } @@ -279,7 +269,4 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor { return TasksUiPlugin.getTaskActivityManager().isPastReminder(task); } - public void setScheduleAction(TaskEditorScheduleAction scheduleAction) { - this.scheduleAction = scheduleAction; - } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskEditorScheduleAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskEditorScheduleAction.java index 336e8f11b..159b7fdff 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskEditorScheduleAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskEditorScheduleAction.java @@ -39,29 +39,15 @@ public class TaskEditorScheduleAction extends Action implements IMenuCreator { public TaskEditorScheduleAction(ITask task) { this.task = task; - updateImageDescriptor(task); + this.setImageDescriptor(CommonImages.SCHEDULE_DAY); setMenuCreator(this); setToolTipText(Messages.TaskEditorScheduleAction_Private_Scheduling); - scheduleMenuContributor.setScheduleAction(this); } @Override public void run() { - if (((AbstractTask) task).getScheduledForDate() == null) { - TasksUiPlugin.getTaskActivityManager().setScheduledFor((AbstractTask) task, - TaskActivityUtil.getCurrentWeek().getToday()); - } else { - TasksUiPlugin.getTaskActivityManager().setScheduledFor((AbstractTask) task, null); - } - updateImageDescriptor(task); - } - - public void updateImageDescriptor(ITask task) { - if (task instanceof AbstractTask && ((AbstractTask) task).getScheduledForDate() != null) { - setImageDescriptor(CommonImages.SCHEDULE_DAY); - } else { - setImageDescriptor(CommonImages.SCHEDULE); - } + TasksUiPlugin.getTaskActivityManager().setScheduledFor((AbstractTask) task, + TaskActivityUtil.getCurrentWeek().getToday()); } public Menu getMenu(Control parent) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java index 656c09088..5188c7b15 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttributePart.java @@ -163,21 +163,6 @@ public class TaskEditorAttributePart extends AbstractTaskEditorPart { setSection(toolkit, section); } - @Override - protected String getInfoOverlayText() { - TaskAttribute product = getModel().getTaskData().getRoot().getMappedAttribute(TaskAttribute.PRODUCT); - TaskAttribute component = getModel().getTaskData().getRoot().getMappedAttribute(TaskAttribute.COMPONENT); - if (product != null && component != null) { - return product.getValue() + " / " + component.getValue(); //$NON-NLS-1$ - } else if (product != null) { - return product.getValue(); - } else if (component != null) { - return component.getValue(); - } else { - return null; - } - } - /** * Integrator requested the ability to control whether the attributes section is expanded on creation. */ diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java index 7b4269558..eedb78d14 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPart.java @@ -23,11 +23,7 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.AbstractFormPart; -import org.eclipse.ui.forms.IFormColors; -import org.eclipse.ui.forms.events.ExpansionAdapter; -import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; @@ -142,12 +138,10 @@ public abstract class AbstractTaskEditorPart extends AbstractFormPart { Composite toolbarComposite = toolkit.createComposite(section); toolbarComposite.setBackground(null); RowLayout rowLayout = new RowLayout(); - rowLayout.marginTop = 2; + rowLayout.marginTop = 0; rowLayout.marginBottom = 0; toolbarComposite.setLayout(rowLayout); - createInfoOverlay(toolbarComposite, section, toolkit); - toolBarManager.createControl(toolbarComposite); section.clientVerticalSpacing = 0; section.descriptionVerticalSpacing = 0; @@ -157,37 +151,6 @@ public abstract class AbstractTaskEditorPart extends AbstractFormPart { setControl(section); } - /** - * Clients can implement to provide attribute overlay text - * - * @param section - */ - private void createInfoOverlay(Composite composite, Section section, FormToolkit toolkit) { - String text = getInfoOverlayText(); - if (text == null) { - return; - } - - final Label label = toolkit.createLabel(composite, text); - label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE)); - label.setBackground(null); - label.setVisible(!section.isExpanded()); - - section.addExpansionListener(new ExpansionAdapter() { - @Override - public void expansionStateChanging(ExpansionEvent e) { - label.setVisible(!e.getState()); - } - }); - } - - /** - * Clients can override to show summary information for the part. - */ - protected String getInfoOverlayText() { - return null; - } - protected boolean setSelection(ISelection selection) { return false; } |