diff options
67 files changed, 217 insertions, 215 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/.classpath b/org.eclipse.mylyn.bugzilla.ui/.classpath index fb06a62b3..ddacaf769 100644 --- a/org.eclipse.mylyn.bugzilla.ui/.classpath +++ b/org.eclipse.mylyn.bugzilla.ui/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> - <accessrule kind="accessible" pattern="**/TaskListImages"/> + <accessrule kind="accessible" pattern="**/TasksUiImages"/> <accessrule kind="accessible" pattern="**/TaskListColorsAndFonts"/> <accessrule kind="accessible" pattern="**/TaskListPreferenceConstants"/> <accessrule kind="accessible" pattern="**/mylar/internal/bugzilla/**"/> diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java index 3b8408d7c..724a03ffa 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaCustomQueryWizardPage.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist; import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.mylar.tasks.ui.search.AbstractRepositoryQueryPage; @@ -49,7 +49,7 @@ public class BugzillaCustomQueryWizardPage extends AbstractRepositoryQueryPage { this.repository = repository; setTitle(LABEL_CUSTOM_QUERY); // setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } public BugzillaCustomQueryWizardPage(TaskRepository repository) { @@ -57,7 +57,7 @@ public class BugzillaCustomQueryWizardPage extends AbstractRepositoryQueryPage { this.repository = repository; setTitle(LABEL_CUSTOM_QUERY); // setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } @Override diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java index 2b3de45ec..f07dc93f8 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaQueryTypeWizardPage.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.bugzilla.ui.tasklist; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchPage; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -49,7 +49,7 @@ public class BugzillaQueryTypeWizardPage extends WizardPage { super(TITLE); setTitle(TITLE); setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setImageDescriptor(TasksUiImages.BANNER_REPOSITORY); customPage = new BugzillaCustomQueryWizardPage(repository); searchPage = new BugzillaSearchPage(repository); searchPage.setRestoreQueryOptions(false); diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/doc/internal/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/doc/internal/dialogs/UiLegendDialog.java index 5261962dd..32fbf2c2b 100644 --- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/doc/internal/dialogs/UiLegendDialog.java +++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/doc/internal/dialogs/UiLegendDialog.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.doc.internal.dialogs; import org.eclipse.jface.dialogs.PopupDialog; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; @@ -98,7 +98,7 @@ public class UiLegendDialog extends PopupDialog { // buttonsComposite.setLayout(new RowLayout()); final ImageHyperlink closeHyperlink = toolkit.createImageHyperlink(buttonsComposite, SWT.NONE); closeHyperlink.setLayout(buttonsLayout); - closeHyperlink.setImage(TaskListImages.getImage(TaskListImages.NOTIFICATION_CLOSE)); + closeHyperlink.setImage(TasksUiImages.getImage(TasksUiImages.NOTIFICATION_CLOSE)); closeHyperlink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { @@ -114,23 +114,23 @@ public class UiLegendDialog extends PopupDialog { setSectionLayout(sectionClient, section, false); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.PRIORITY_1)); + image.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_1)); toolkit.createLabel(sectionClient, Task.PriorityLevel.P1.getDescription()); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.PRIORITY_2)); + image.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_2)); toolkit.createLabel(sectionClient, Task.PriorityLevel.P2.getDescription()); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.PRIORITY_3)); + image.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_3)); toolkit.createLabel(sectionClient, Task.PriorityLevel.P3.getDescription() + " (default)"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.PRIORITY_4)); + image.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_4)); toolkit.createLabel(sectionClient, Task.PriorityLevel.P4.getDescription()); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.PRIORITY_5)); + image.setImage(TasksUiImages.getImage(TasksUiImages.PRIORITY_5)); toolkit.createLabel(sectionClient, Task.PriorityLevel.P5.getDescription()); @@ -140,23 +140,23 @@ public class UiLegendDialog extends PopupDialog { setSectionLayout(sectionClient, section, false); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK)); toolkit.createLabel(sectionClient, "Task"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_NOTES)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_NOTES)); toolkit.createLabel(sectionClient, "Task with notes"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_REPOSITORY)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY)); toolkit.createLabel(sectionClient, "Repository task"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.CATEGORY)); + image.setImage(TasksUiImages.getImage(TasksUiImages.CATEGORY)); toolkit.createLabel(sectionClient, "Category"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.QUERY)); + image.setImage(TasksUiImages.getImage(TasksUiImages.QUERY)); toolkit.createLabel(sectionClient, "Repository query"); @@ -166,25 +166,25 @@ public class UiLegendDialog extends PopupDialog { setSectionLayout(sectionClient, section, false); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK)); Label labelOverdue = toolkit.createLabel(sectionClient, "Overdue, schedule via popup menu"); labelOverdue.setForeground(themeManager.getCurrentTheme().getColorRegistry().get( TaskListColorsAndFonts.THEME_COLOR_TASK_OVERDUE)); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK)); Label labelToday = toolkit.createLabel(sectionClient, "Scheduled for today"); labelToday.setForeground(themeManager.getCurrentTheme().getColorRegistry().get( TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_SCHEDULED)); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK)); Label labelThisWeek = toolkit.createLabel(sectionClient, "Scheduled for this week"); labelThisWeek.setForeground(themeManager.getCurrentTheme().getColorRegistry().get( TaskListColorsAndFonts.THEME_COLOR_TASK_THISWEEK_SCHEDULED)); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_COMPLETED)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_COMPLETED)); Label labelCompleted = toolkit.createLabel(sectionClient, "Completed"); labelCompleted.setFont(TaskListColorsAndFonts.STRIKETHROUGH); // labelCompleted.setForeground(TaskListColorsAndFonts.COLOR_TASK_COMPLETED); @@ -192,14 +192,14 @@ public class UiLegendDialog extends PopupDialog { TaskListColorsAndFonts.THEME_COLOR_COMPLETED)); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_COMPLETED)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_COMPLETED)); Label labelCompletedToday = toolkit.createLabel(sectionClient, "Completed today"); labelCompletedToday.setFont(TaskListColorsAndFonts.STRIKETHROUGH); labelCompletedToday.setForeground(themeManager.getCurrentTheme().getColorRegistry().get( TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_COMPLETED)); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.BLANK)); + image.setImage(TasksUiImages.getImage(TasksUiImages.BLANK)); Hyperlink adjust = toolkit.createHyperlink(sectionClient, "Adjust Colors and Fonts...", SWT.NULL); adjust.addHyperlinkListener(new IHyperlinkListener() { @@ -225,15 +225,15 @@ public class UiLegendDialog extends PopupDialog { setSectionLayout(sectionClient, section, false); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_INACTIVE)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE)); toolkit.createLabel(sectionClient, "Inactive task with no context"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_INACTIVE_CONTEXT)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE_CONTEXT)); toolkit.createLabel(sectionClient, "Inactive task with context"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.TASK_ACTIVE)); + image.setImage(TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE)); toolkit.createLabel(sectionClient, "Active task"); @@ -243,19 +243,19 @@ public class UiLegendDialog extends PopupDialog { setSectionLayout(sectionClient, section, true); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.OVERLAY_INCOMMING)); + image.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_INCOMMING)); toolkit.createLabel(sectionClient, "Incoming changes, open to view"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.OVERLAY_OUTGOING)); + image.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_OUTGOING)); toolkit.createLabel(sectionClient, "Outgoing changes, synchronize to discard"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.OVERLAY_WARNING)); + image.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_WARNING)); toolkit.createLabel(sectionClient, "Synchronization failed, mouse over for details"); image = toolkit.createLabel(sectionClient, ""); - image.setImage(TaskListImages.getImage(TaskListImages.OVERLAY_CONFLICT)); + image.setImage(TasksUiImages.getImage(TasksUiImages.OVERLAY_CONFLICT)); toolkit.createLabel(sectionClient, "Conflicting changes, need to synchronize"); diff --git a/org.eclipse.mylyn.tasks.ui/icons/obj16/attachment-patch.gif b/org.eclipse.mylyn.tasks.ui/icons/obj16/attachment-patch.gif Binary files differnew file mode 100644 index 000000000..c0e069d0d --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/icons/obj16/attachment-patch.gif diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java index ab9fd2370..7d3f8cf47 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java @@ -48,7 +48,7 @@ public class MoveToCategoryMenuContributor implements IDynamicSubMenuContributor }; String text = handleAcceleratorKeys(category.getSummary()); action.setText(text); - action.setImageDescriptor(TaskListImages.CATEGORY); + action.setImageDescriptor(TasksUiImages.CATEGORY); subMenuManager.add(action); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java index ab5981bdd..1f3cad868 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java @@ -50,7 +50,7 @@ public class RepositoryTaskDecorator implements ILightweightLabelDecorator { } } if (query.isSynchronizing()) { - decoration.addOverlay(TaskListImages.OVERLAY_SYNCHRONIZING, IDecoration.TOP_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_SYNCHRONIZING, IDecoration.TOP_LEFT); } } else if (element instanceof AbstractRepositoryTask) { AbstractRepositoryTask task = (AbstractRepositoryTask) element; @@ -61,20 +61,20 @@ public class RepositoryTaskDecorator implements ILightweightLabelDecorator { task.getRepositoryUrl()); if (connectorUi != null) { if (!connectorUi.hasRichEditor()) { - decoration.addOverlay(TaskListImages.OVERLAY_WEB, IDecoration.BOTTOM_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_WEB, IDecoration.BOTTOM_LEFT); } else if (connector != null && connector.hasRepositoryContext(repository, task)) { - decoration.addOverlay(TaskListImages.OVERLAY_REPOSITORY_CONTEXT, IDecoration.BOTTOM_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_REPOSITORY_CONTEXT, IDecoration.BOTTOM_LEFT); } else { - decoration.addOverlay(TaskListImages.OVERLAY_REPOSITORY, IDecoration.BOTTOM_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_REPOSITORY, IDecoration.BOTTOM_LEFT); } } if (task.isSynchronizing()) { - decoration.addOverlay(TaskListImages.OVERLAY_SYNCHRONIZING, IDecoration.TOP_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_SYNCHRONIZING, IDecoration.TOP_LEFT); } if (!task.isCompleted() && TasksUiPlugin.getTaskListManager().isOverdue(task)) { - decoration.addOverlay(TaskListImages.OVERLAY_DUE, IDecoration.TOP_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_DUE, IDecoration.TOP_LEFT); } else if (!task.isCompleted() && task.getDueDate() != null) { - decoration.addOverlay(TaskListImages.OVERLAY_HAS_DUE, IDecoration.TOP_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_HAS_DUE, IDecoration.TOP_LEFT); } } else if (element instanceof AbstractQueryHit) { ITask correspondingTask = ((AbstractQueryHit) element).getCorrespondingTask(); @@ -83,10 +83,10 @@ public class RepositoryTaskDecorator implements ILightweightLabelDecorator { ITask task = (ITask) element; String url = task.getTaskUrl(); if (url != null && !url.trim().equals("") && !url.equals("http://")) { - decoration.addOverlay(TaskListImages.OVERLAY_WEB, IDecoration.BOTTOM_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_WEB, IDecoration.BOTTOM_LEFT); } if (!task.isCompleted() && TasksUiPlugin.getTaskListManager().isOverdue(task)) { - decoration.addOverlay(TaskListImages.OVERLAY_DUE, IDecoration.TOP_LEFT); + decoration.addOverlay(TasksUiImages.OVERLAY_DUE, IDecoration.TOP_LEFT); } } else if (element instanceof TaskRepository) { ImageDescriptor overlay = TasksUiPlugin.getDefault().getOverlayIcon(((TaskRepository) element).getKind()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java index 44a81c523..3c10dc6fc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java @@ -92,7 +92,7 @@ public class TaskListNotificationIncoming implements ITaskListNotification { } public Image getOverlayIcon() { - return TaskListImages.getImage(TaskListImages.OVERLAY_INCOMMING); + return TasksUiImages.getImage(TasksUiImages.OVERLAY_INCOMMING); } public Date getDate() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java index 8e678d6d0..f2b98f5ed 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationPopup.java @@ -149,7 +149,7 @@ public class TaskListNotificationPopup extends PopupDialog { ImageHyperlink hyperlink = new ImageHyperlink(section, SWT.NONE); toolkit.adapt(hyperlink, true, true); hyperlink.setBackground(null); - hyperlink.setImage(TaskListImages.getImage(TaskListImages.NOTIFICATION_CLOSE)); + hyperlink.setImage(TasksUiImages.getImage(TasksUiImages.NOTIFICATION_CLOSE)); hyperlink.addHyperlinkListener(new HyperlinkAdapter() { public void linkActivated(HyperlinkEvent e) { close(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java index 690aa4180..d9e71f08e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java @@ -77,7 +77,7 @@ public class TaskListNotificationQueryIncoming implements ITaskListNotification } public Image getOverlayIcon() { - return TaskListImages.getImage(TaskListImages.OVERLAY_INCOMMING); + return TasksUiImages.getImage(TasksUiImages.OVERLAY_INCOMMING); } public Date getDate() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java index ed49a634f..19f5a63cc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java @@ -63,7 +63,7 @@ public class TaskListNotificationReminder implements ITaskListNotification { } public Image getOverlayIcon() { - return TaskListImages.getImage(TaskListImages.CALENDAR); + return TasksUiImages.getImage(TasksUiImages.CALENDAR); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java index aeafaee2c..3d9441e5e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListImages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiImages.java @@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.Point; /** * @author Mik Kersten */ -public class TaskListImages { +public class TasksUiImages { private static ImageRegistry imageRegistry; @@ -35,6 +35,8 @@ public class TaskListImages { private static final String T_TOOL = "etool16"; + private static final String T_OBJ = "obj16"; + private static final String T_WIZBAN = "wizban"; private static final String T_OVR = "ovr16"; @@ -113,7 +115,7 @@ public class TaskListImages { public static final ImageDescriptor CONTEXT_TRANSFER = create(T_TOOL, "context-transfer.gif"); - public static final ImageDescriptor ATTACHMENT_PATCH = create(T_TOOL, "attachment-patch.gif"); + public static final ImageDescriptor ATTACHMENT_PATCH = create(T_OBJ, "attachment-patch.gif"); public static final ImageDescriptor OVERLAY_INCOMMING = create(T_EVIEW, "overlay-incoming.gif"); @@ -214,8 +216,8 @@ public class TaskListImages { public static final ImageDescriptor BANNER_IMPORT = create(T_WIZBAN, "banner-import.gif"); - public static final ImageDescriptor STATUS_WARNING = createWithOverlay(TaskListImages.STATUS_NORMAL, - TaskListImages.OVERLAY_WARNING, false, true); + public static final ImageDescriptor STATUS_WARNING = createWithOverlay(TasksUiImages.STATUS_NORMAL, + TasksUiImages.OVERLAY_WARNING, false, true); public static final ImageDescriptor BLANK = create(T_ELCL, "blank.gif"); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java index 9097657f8..fa733b6d7 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivityReportAction.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.planner.TaskActivityWizard; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; @@ -32,7 +32,7 @@ public class ActivityReportAction extends Action { setId(ID); setText(LABEL); setToolTipText(LABEL); - setImageDescriptor(TaskListImages.TASKLIST); + setImageDescriptor(TasksUiImages.TASKLIST); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java index a062bc710..f1cecb248 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.ui.TaskCommandIds; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.ui.PlatformUI; @@ -29,7 +29,7 @@ public class AddRepositoryAction extends Action { private static final String ID = "org.eclipse.mylar.tasklist.repositories.add"; public AddRepositoryAction() { - setImageDescriptor(TaskListImages.REPOSITORY_NEW); + setImageDescriptor(TasksUiImages.REPOSITORY_NEW); setText(TITLE); setId(ID); setEnabled(TasksUiPlugin.getRepositoryManager().hasUserManagedRepositoryConnectors()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CollapseAllAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CollapseAllAction.java index 33838cbbc..e0eaaff3e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CollapseAllAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CollapseAllAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; /** @@ -32,7 +32,7 @@ public class CollapseAllAction extends Action { setId(ID); setText(LABEL); setToolTipText(LABEL); - setImageDescriptor(TaskListImages.COLLAPSE_ALL); + setImageDescriptor(TasksUiImages.COLLAPSE_ALL); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java index fa2d972ae..d339dc57e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyTaskDetailsAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; @@ -40,7 +40,7 @@ public class CopyTaskDetailsAction extends BaseSelectionListenerAction { super(LABEL); setToolTipText(LABEL); setId(ID); - setImageDescriptor(TaskListImages.COPY); + setImageDescriptor(TasksUiImages.COPY); if (setAccelerator) { setAccelerator(SWT.MOD1 + 'c'); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DiscardOutgoingAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DiscardOutgoingAction.java index 862ac138d..732a50d77 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DiscardOutgoingAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DiscardOutgoingAction.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; @@ -42,7 +42,7 @@ public class DiscardOutgoingAction extends Action { setText(ACTION_NAME); setToolTipText(ACTION_NAME); setId(ID); - setImageDescriptor(TaskListImages.STATUS_NORMAL); + setImageDescriptor(TasksUiImages.STATUS_NORMAL); if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof AbstractRepositoryTask)) { AbstractRepositoryTask task = (AbstractRepositoryTask) selectedElements.get(0); setEnabled(task.getSyncState().equals(RepositoryTaskSyncState.OUTGOING)); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ExpandAllAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ExpandAllAction.java index 11e26cb53..2716b0f78 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ExpandAllAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ExpandAllAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; /** @@ -32,7 +32,7 @@ public class ExpandAllAction extends Action { setId(ID); setText(LABEL); setToolTipText(LABEL); - setImageDescriptor(TaskListImages.EXPAND_ALL); + setImageDescriptor(TasksUiImages.EXPAND_ALL); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java index dbe72931a..b5d2e6cbd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterArchiveContainerAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -33,7 +33,7 @@ public class FilterArchiveContainerAction extends Action { setText(LABEL); setToolTipText(LABEL); setId(ID); - setImageDescriptor(TaskListImages.FILTER_ARCHIVE); + setImageDescriptor(TasksUiImages.FILTER_ARCHIVE); setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_ARCHIVE_MODE)); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java index 6f83cdb37..4c1292a2c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/FilterCompletedTasksAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -33,7 +33,7 @@ public class FilterCompletedTasksAction extends Action { setText(LABEL); setToolTipText(LABEL); setId(ID); - setImageDescriptor(TaskListImages.FILTER_COMPLETE); + setImageDescriptor(TasksUiImages.FILTER_COMPLETE); setChecked(TasksUiPlugin.getDefault().getPreferenceStore().contains(TaskListPreferenceConstants.FILTER_COMPLETE_MODE)); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoIntoAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoIntoAction.java index dbcc30235..44d33129e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoIntoAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoIntoAction.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; @@ -34,7 +34,7 @@ public class GoIntoAction extends Action implements IViewActionDelegate { setId(ID); setText(LABEL); setToolTipText(LABEL); - setImageDescriptor(TaskListImages.GO_INTO); + setImageDescriptor(TasksUiImages.GO_INTO); } public void init(IViewPart view) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoUpAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoUpAction.java index 739584fbb..aed9d75c8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoUpAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/GoUpAction.java @@ -11,7 +11,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.ui.part.DrillDownAdapter; @@ -23,7 +23,7 @@ public class GoUpAction extends Action { setText("Go Up To Root"); setToolTipText("Go Up To Root"); setId(ID); - setImageDescriptor(TaskListImages.GO_UP); + setImageDescriptor(TasksUiImages.GO_UP); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java index bd3d9dd38..fa7c8861d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.mylar.internal.tasks.core.WebQueryHit; import org.eclipse.mylar.internal.tasks.core.WebTask; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListElement; @@ -39,7 +39,7 @@ public class MarkTaskCompleteAction extends Action { setText(ACTION_NAME); setToolTipText("Mark "+ACTION_NAME); setId(ID); - setImageDescriptor(TaskListImages.TASK_COMPLETE); + setImageDescriptor(TasksUiImages.TASK_COMPLETE); if(selectedElements.size() == 1 && (selectedElements.get(0) instanceof Task)) { Task task = (Task)selectedElements.get(0); if (task instanceof WebTask) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java index 1f59bb6fb..9b56d973e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java @@ -16,7 +16,7 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.mylar.internal.tasks.core.WebQueryHit; import org.eclipse.mylar.internal.tasks.core.WebTask; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.ITaskListElement; @@ -38,7 +38,7 @@ public class MarkTaskIncompleteAction extends Action { setText(ACTION_NAME); setToolTipText("Mark "+ACTION_NAME); setId(ID); - setImageDescriptor(TaskListImages.TASK_INCOMPLETE); + setImageDescriptor(TasksUiImages.TASK_INCOMPLETE); if(selectedElements.size() == 1 && (selectedElements.get(0) instanceof ITask)) { Task task = (Task)selectedElements.get(0); setEnabled(task.isLocal()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java index 47bbb4e13..80c110cb2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskUnreadAction.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import java.util.List; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITaskListElement; import org.eclipse.mylar.tasks.core.Task; @@ -34,7 +34,7 @@ public class MarkTaskUnreadAction extends AbstractRepositoryTasksAction { setToolTipText(ACTION_NAME); setToolTipText("Mark " + ACTION_NAME); setId(ID); - setImageDescriptor(TaskListImages.STATUS_NORMAL_INCOMING); + setImageDescriptor(TasksUiImages.STATUS_NORMAL_INCOMING); if (selectedElements.size() == 1 && (selectedElements.get(0) instanceof Task)) { Task task = (Task) selectedElements.get(0); setEnabled(!task.isLocal()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java index bc6048b6c..c0666a92f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java @@ -16,7 +16,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.TaskCategory; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IViewActionDelegate; @@ -38,7 +38,7 @@ public class NewCategoryAction extends Action implements IViewActionDelegate { setText("New Category..."); setToolTipText("New Category..."); setId(ID); - setImageDescriptor(TaskListImages.CATEGORY_NEW); + setImageDescriptor(TasksUiImages.CATEGORY_NEW); } public void init(IViewPart view) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java index e8b6fac85..22d77a98f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java @@ -19,7 +19,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.views.TaskInputDialog; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; @@ -49,7 +49,7 @@ public class NewLocalTaskAction extends Action implements IViewActionDelegate { setText(TaskInputDialog.LABEL_SHELL); setToolTipText(TaskInputDialog.LABEL_SHELL); setId(ID); - setImageDescriptor(TaskListImages.TASK_NEW); + setImageDescriptor(TasksUiImages.TASK_NEW); } public void init(IViewPart view) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PresentationDropDownSelectionAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PresentationDropDownSelectionAction.java index ab86ee5c8..a4f65458c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PresentationDropDownSelectionAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PresentationDropDownSelectionAction.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuCreator; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.ITaskListPresentation; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.swt.widgets.Control; @@ -43,7 +43,7 @@ public class PresentationDropDownSelectionAction extends Action implements IMenu setToolTipText(LABEL_NAME); setId(ID); setEnabled(true); - setImageDescriptor(TaskListImages.TASKLIST_MODE); + setImageDescriptor(TasksUiImages.TASKLIST_MODE); } protected void addActionsToMenu() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java index c1c34adfb..d0002fc52 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskActivationHistory; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; @@ -33,7 +33,7 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction { setToolTipText("Previous Task"); setId(ID); setEnabled(true); - setImageDescriptor(TaskListImages.NAVIGATE_PREVIOUS); + setImageDescriptor(TasksUiImages.NAVIGATE_PREVIOUS); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java index 0383b1582..ee64192a0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.core.TaskCategory; @@ -37,7 +37,7 @@ public class RemoveFromCategoryAction extends Action { this.view = view; setText("Remove From Category"); setId(ID); - setImageDescriptor(TaskListImages.REMOVE); + setImageDescriptor(TasksUiImages.REMOVE); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java index 09508006f..e3943198f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeEditorAction.java @@ -15,7 +15,7 @@ import java.util.Iterator; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITask; @@ -38,7 +38,7 @@ public class SynchronizeEditorAction extends BaseSelectionListenerAction { super(LABEL); setToolTipText(LABEL); setId(ID); - setImageDescriptor(TaskListImages.REFRESH); + setImageDescriptor(TasksUiImages.REFRESH); // setAccelerator(SWT.MOD1 + 'r'); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java index ab96c3d24..44efda25b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskActivateAction.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -31,7 +31,7 @@ public class TaskActivateAction extends Action implements IViewActionDelegate { public TaskActivateAction() { setId(ID); setText("Activate"); - setImageDescriptor(TaskListImages.TASK_ACTIVE_CENTERED); + setImageDescriptor(TasksUiImages.TASK_ACTIVE_CENTERED); } public void init(IViewPart view) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java index 9e9e75243..b46da6db2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.tasks.core.ITask; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -29,7 +29,7 @@ public class TaskDeactivateAction extends Action { public TaskDeactivateAction() { setId(ID); setText("Deactivate"); - setImageDescriptor(TaskListImages.TASK_INACTIVE); + setImageDescriptor(TasksUiImages.TASK_INACTIVE); } public void run(ITask task) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java index f2d50cb01..ebd2d70a8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlinePage.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.TaskComment; import org.eclipse.mylar.tasks.ui.editors.AbstractRepositoryTaskEditor; import org.eclipse.mylar.tasks.ui.editors.RepositoryTaskOutlineNode; @@ -83,13 +83,13 @@ public class RepositoryTaskOutlinePage extends ContentOutlinePage { if (RepositoryTaskOutlineNode.LABEL_COMMENTS.equals(node.getContents())|| RepositoryTaskOutlineNode.LABEL_NEW_COMMENT.equals(node.getContents())) { - return TaskListImages.getImage(TaskListImages.COMMENT); + return TasksUiImages.getImage(TasksUiImages.COMMENT); } if (RepositoryTaskOutlineNode.LABEL_DESCRIPTION.equals(node.getContents())) { - return TaskListImages.getImage(TaskListImages.TASK_NOTES); + return TasksUiImages.getImage(TasksUiImages.TASK_NOTES); } else if (node.getComment() != null) { - return TaskListImages.getImage(TaskListImages.PERSON); + return TasksUiImages.getImage(TasksUiImages.PERSON); } else { - return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY); + return TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY); } } else { return super.getImage(element); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java index 7bb102019..3eef1f704 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylar.internal.tasks.ui.AddExistingTaskJob; import org.eclipse.mylar.internal.tasks.ui.IDynamicSubMenuContributor; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.actions.AttachFileAction; import org.eclipse.mylar.internal.tasks.ui.actions.CopyTaskDetailsAction; import org.eclipse.mylar.internal.tasks.ui.actions.OpenWithBrowserAction; @@ -184,7 +184,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib }; String text = category.getSummary(); action.setText(text); - action.setImageDescriptor(TaskListImages.CATEGORY); + action.setImageDescriptor(TasksUiImages.CATEGORY); subMenuManager.add(action); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index 4f6be5640..3040381ae 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -22,7 +22,7 @@ import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.actions.NewLocalTaskAction; import org.eclipse.mylar.internal.tasks.ui.views.TaskListView; import org.eclipse.mylar.monitor.ui.MylarMonitorUiPlugin; @@ -613,7 +613,7 @@ public class TaskPlanningEditor extends TaskFormPage { ImageHyperlink clearScheduledDate = toolkit.createImageHyperlink(nameValueComp, SWT.NONE); - clearScheduledDate.setImage(TaskListImages.getImage(TaskListImages.REMOVE)); + clearScheduledDate.setImage(TasksUiImages.getImage(TasksUiImages.REMOVE)); clearScheduledDate.setToolTipText(CLEAR); clearScheduledDate.addHyperlinkListener(new HyperlinkAdapter() { @@ -649,7 +649,7 @@ public class TaskPlanningEditor extends TaskFormPage { toolkit.paintBordersFor(nameValueComp); ImageHyperlink clearDueDate = toolkit.createImageHyperlink(nameValueComp, SWT.NONE); - clearDueDate.setImage(TaskListImages.getImage(TaskListImages.REMOVE)); + clearDueDate.setImage(TasksUiImages.getImage(TasksUiImages.REMOVE)); clearDueDate.setToolTipText(CLEAR); clearDueDate.addHyperlinkListener(new HyperlinkAdapter() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java index d93b5aa7f..dfb0468bf 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/RemoveTaskAction.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.planner; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.ITask; /** @@ -29,7 +29,7 @@ public class RemoveTaskAction extends Action { this.viewer = view; setText("Remove Selected"); setId(ID); - setImageDescriptor(TaskListImages.REMOVE); + setImageDescriptor(TasksUiImages.REMOVE); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java index dbd3aef3f..22b8e14ba 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java @@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.IDynamicSubMenuContributor; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.ITaskListExternalizer; import org.eclipse.mylar.tasks.core.RepositoryTemplate; @@ -280,7 +280,7 @@ public class TasksUiExtensionReader { .getName(), iconPath); if (descriptor != null) { TasksUiPlugin.getDefault().addBrandingIcon(((AbstractRepositoryConnectorUi)connectorUi).getRepositoryType(), - TaskListImages.getImage(descriptor)); + TasksUiImages.getImage(descriptor)); } } String overlayIconPath = element.getAttribute(ATTR_OVERLAY_ICON); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java index 9bda4ebae..17bf00dfa 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/PriorityDropDownAction.java @@ -11,7 +11,7 @@ package org.eclipse.mylar.internal.tasks.ui.views; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IMenuCreator; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.tasks.core.Task; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -47,7 +47,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { this.taskListView = taskListView; setText(FILTER_PRIORITY_LABEL); setToolTipText(FILTER_PRIORITY_LABEL); - setImageDescriptor(TaskListImages.FILTER_PRIORITY); + setImageDescriptor(TasksUiImages.FILTER_PRIORITY); setMenuCreator(this); } @@ -89,7 +89,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { }; priority1.setEnabled(true); priority1.setText(Task.PriorityLevel.P1.getDescription()); - priority1.setImageDescriptor(TaskListImages.PRIORITY_1); + priority1.setImageDescriptor(TasksUiImages.PRIORITY_1); ActionContributionItem item = new ActionContributionItem(priority1); item.fill(dropDownMenu, -1); @@ -106,7 +106,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { }; priority2.setEnabled(true); priority2.setText(Task.PriorityLevel.P2.getDescription()); - priority2.setImageDescriptor(TaskListImages.PRIORITY_2); + priority2.setImageDescriptor(TasksUiImages.PRIORITY_2); item = new ActionContributionItem(priority2); item.fill(dropDownMenu, -1); @@ -123,7 +123,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { }; priority3.setEnabled(true); priority3.setText(Task.PriorityLevel.P3.getDescription()); - priority3.setImageDescriptor(TaskListImages.PRIORITY_3); + priority3.setImageDescriptor(TasksUiImages.PRIORITY_3); item = new ActionContributionItem(priority3); item.fill(dropDownMenu, -1); @@ -140,7 +140,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { }; priority4.setEnabled(true); priority4.setText(Task.PriorityLevel.P4.getDescription()); - priority4.setImageDescriptor(TaskListImages.PRIORITY_4); + priority4.setImageDescriptor(TasksUiImages.PRIORITY_4); item = new ActionContributionItem(priority4); item.fill(dropDownMenu, -1); @@ -156,7 +156,7 @@ class PriorityDropDownAction extends Action implements IMenuCreator { } }; priority5.setEnabled(true); - priority5.setImageDescriptor(TaskListImages.PRIORITY_5); + priority5.setImageDescriptor(TasksUiImages.PRIORITY_5); priority5.setText(Task.PriorityLevel.P5.getDescription()); item = new ActionContributionItem(priority5); item.fill(dropDownMenu, -1); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java index 83164eb6c..605b2d145 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TableDecoratingLabelProvider.java @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.context.core.ContextCorePlugin; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.ITask; @@ -43,16 +43,16 @@ public class TableDecoratingLabelProvider extends DecoratingLabelProvider implem ITask task = TaskElementLabelProvider.getCorrespondingTask((ITaskListElement)element); if (task != null) { if (task.isActive()) { - return TaskListImages.getImage(TaskListImages.TASK_ACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE); } else { if (ContextCorePlugin.getContextManager().hasContext(task.getHandleIdentifier())) { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE_CONTEXT); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE_CONTEXT); } else { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE); } } } else { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE); } } } else if (columnIndex == 1) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java index bee5491fa..a0ec18689 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java @@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.AbstractTaskContainer; import org.eclipse.mylar.tasks.core.DateRangeActivityDelegate; @@ -54,7 +54,7 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) { if (element instanceof DateRangeContainer) { - return TaskListImages.getImage(TaskListImages.CALENDAR); + return TasksUiImages.getImage(TasksUiImages.CALENDAR); } else if (element instanceof DateRangeActivityDelegate) { return super.getImage(((DateRangeActivityDelegate) element).getCorrespondingTask()); } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java index 432096388..4f991eee6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.mylar.internal.tasks.ui.ITaskHighlighter; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -49,17 +49,17 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro @Override public Image getImage(Object element) { if (element instanceof TaskArchive) { - return TaskListImages.getImage(TaskListImages.CATEGORY_ARCHIVE); + return TasksUiImages.getImage(TasksUiImages.CATEGORY_ARCHIVE); } else if (element instanceof TaskCategory) { - return TaskListImages.getImage(TaskListImages.CATEGORY); + return TasksUiImages.getImage(TasksUiImages.CATEGORY); } else if (element instanceof AbstractRepositoryQuery) { - return TaskListImages.getImage(TaskListImages.QUERY); + return TasksUiImages.getImage(TasksUiImages.QUERY); } else if (element instanceof AbstractQueryHit) { AbstractQueryHit hit = (AbstractQueryHit) element; if (hit.getCorrespondingTask() != null) { return getImage(hit.getCorrespondingTask()); } else { - return TaskListImages.getImage(TaskListImages.TASK_REMOTE); + return TasksUiImages.getImage(TasksUiImages.TASK_REMOTE); } } else if (element instanceof ITask) { ITask task = (ITask) element; @@ -69,36 +69,36 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin .getRepositoryUi(((AbstractRepositoryTask) task).getRepositoryKind()); if (connectorUi != null && !connectorUi.hasRichEditor()) { - return TaskListImages.getImage(TaskListImages.TASK_COMPLETED); + return TasksUiImages.getImage(TasksUiImages.TASK_COMPLETED); } else { - return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_COMPLETED); + return TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY_COMPLETED); } } else { - return TaskListImages.getImage(TaskListImages.TASK_COMPLETED); + return TasksUiImages.getImage(TasksUiImages.TASK_COMPLETED); } } else if (task.getNotes() != null && !task.getNotes().trim().equals("")) { if (task instanceof AbstractRepositoryTask) { AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin .getRepositoryUi(((AbstractRepositoryTask) task).getRepositoryKind()); if (connectorUi != null && !connectorUi.hasRichEditor()) { - return TaskListImages.getImage(TaskListImages.TASK_NOTES); + return TasksUiImages.getImage(TasksUiImages.TASK_NOTES); } else { - return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_NOTES); + return TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY_NOTES); } } else { - return TaskListImages.getImage(TaskListImages.TASK_NOTES); + return TasksUiImages.getImage(TasksUiImages.TASK_NOTES); } } else { if (task instanceof AbstractRepositoryTask) { AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin .getRepositoryUi(((AbstractRepositoryTask) task).getRepositoryKind()); if (connectorUi != null && !connectorUi.hasRichEditor()) { - return TaskListImages.getImage(TaskListImages.TASK); + return TasksUiImages.getImage(TasksUiImages.TASK); } else { - return TaskListImages.getImage(TaskListImages.TASK_REPOSITORY); + return TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY); } } else { - return TaskListImages.getImage(TaskListImages.TASK); + return TasksUiImages.getImage(TasksUiImages.TASK); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java index 240cf72d1..94f21e5cb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ITableFontProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -90,23 +90,23 @@ public class TaskListTableLabelProvider extends DecoratingLabelProvider implemen } if (columnIndex == 0) { if (element instanceof DateRangeContainer) { - return TaskListImages.getImage(TaskListImages.CALENDAR); + return TasksUiImages.getImage(TasksUiImages.CALENDAR); } else if (element instanceof AbstractTaskContainer) { return super.getImage(element); } else { ITask task = TaskElementLabelProvider.getCorrespondingTask((ITaskListElement) element); if (task != null) { if (task.isActive()) { - return TaskListImages.getImage(TaskListImages.TASK_ACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_ACTIVE); } else { if (ContextCorePlugin.getContextManager().hasContext(task.getHandleIdentifier())) { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE_CONTEXT); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE_CONTEXT); } else { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE); } } } else { - return TaskListImages.getImage(TaskListImages.TASK_INACTIVE); + return TasksUiImages.getImage(TasksUiImages.TASK_INACTIVE); } } } else if (columnIndex == 1) { @@ -129,30 +129,30 @@ public class TaskListTableLabelProvider extends DecoratingLabelProvider implemen if (repositoryTask != null) { ImageDescriptor image = null; if (repositoryTask.getSyncState() == RepositoryTaskSyncState.OUTGOING) { - image = TaskListImages.STATUS_NORMAL_OUTGOING; + image = TasksUiImages.STATUS_NORMAL_OUTGOING; } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING) { - image = TaskListImages.STATUS_NORMAL_INCOMING; + image = TasksUiImages.STATUS_NORMAL_INCOMING; } else if (repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) { - image = TaskListImages.STATUS_NORMAL_CONFLICT; + image = TasksUiImages.STATUS_NORMAL_CONFLICT; } if (image == null && repositoryTask.getStatus() != null) { - return TaskListImages.getImage(TaskListImages.STATUS_WARNING); + return TasksUiImages.getImage(TasksUiImages.STATUS_WARNING); } else if (image != null) { - return TaskListImages.getImage(image); + return TasksUiImages.getImage(image); } } else if (element instanceof AbstractQueryHit) { - return TaskListImages.getImage(TaskListImages.STATUS_NORMAL_INCOMING); + return TasksUiImages.getImage(TasksUiImages.STATUS_NORMAL_INCOMING); } else if (element instanceof AbstractTaskContainer) { AbstractTaskContainer container = (AbstractTaskContainer) element; if (container instanceof AbstractRepositoryQuery) { AbstractRepositoryQuery query = (AbstractRepositoryQuery) container; if (query.getStatus() != null) { - return TaskListImages.getImage(TaskListImages.STATUS_WARNING); + return TasksUiImages.getImage(TasksUiImages.STATUS_WARNING); } } if (view != null && !Arrays.asList(view.getViewer().getExpandedElements()).contains(element) && hasIncoming(container)) { - return TaskListImages.getImage(TaskListImages.STATUS_NORMAL_INCOMING); + return TasksUiImages.getImage(TasksUiImages.STATUS_NORMAL_INCOMING); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index 2844199c1..fde3243d6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -54,7 +54,7 @@ import org.eclipse.mylar.internal.tasks.ui.IDynamicSubMenuContributor; import org.eclipse.mylar.internal.tasks.ui.TaskArchiveFilter; import org.eclipse.mylar.internal.tasks.ui.TaskCompletionFilter; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPatternFilter; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.TaskPriorityFilter; @@ -276,7 +276,7 @@ public class TaskListView extends ViewPart { } public ImageDescriptor getImageDescriptor() { - return TaskListImages.CATEGORY; + return TasksUiImages.CATEGORY; } }; @@ -292,7 +292,7 @@ public class TaskListView extends ViewPart { } public ImageDescriptor getImageDescriptor() { - return TaskListImages.CALENDAR; + return TasksUiImages.CALENDAR; } }; @@ -1503,7 +1503,7 @@ public class TaskListView extends ViewPart { isPaused = paused; IStatusLineManager statusLineManager = getViewSite().getActionBars().getStatusLineManager(); if (isPaused) { - statusLineManager.setMessage(TaskListImages.getImage(TaskListImages.TASKLIST), + statusLineManager.setMessage(TasksUiImages.getImage(TasksUiImages.TASKLIST), "Mylar context capture paused"); setPartName("(paused) " + PART_NAME); } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java index f8106359e..42d546510 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskRepositoryLabelProvider.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.views; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -41,10 +41,10 @@ public class TaskRepositoryLabelProvider implements ILabelProvider { if (image != null) { return image; } else { - return TaskListImages.getImage(TaskListImages.REPOSITORY); + return TasksUiImages.getImage(TasksUiImages.REPOSITORY); } } else if (object instanceof TaskRepository) { - return TaskListImages.getImage(TaskListImages.REPOSITORY); + return TasksUiImages.getImage(TasksUiImages.REPOSITORY); } return null; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java index 787892529..3de413c5b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards; import java.util.Collection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -44,7 +44,7 @@ public abstract class AbstractRepositoryClientWizard extends Wizard implements I protected AbstractRepositoryClientWizard(String repositoryType) { this.repositoryType = repositoryType; - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } public void setRepositoryConnector(AbstractRepositoryConnector repositoryConnector) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java index 257b48e35..40ead07e1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextAttachWizard.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -46,7 +46,7 @@ public class ContextAttachWizard extends Wizard { task.getRepositoryUrl()); this.task = task; setWindowTitle(ContextRetrieveWizard.TITLE); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY_CONTEXT); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY_CONTEXT); } @Override @@ -71,7 +71,7 @@ public class ContextAttachWizard extends Wizard { IWorkbenchSite site = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite(); if (site instanceof IViewSite) { IStatusLineManager statusLineManager = ((IViewSite)site).getActionBars().getStatusLineManager(); - statusLineManager.setMessage(TaskListImages.getImage(TaskListImages.TASKLIST), + statusLineManager.setMessage(TasksUiImages.getImage(TasksUiImages.TASKLIST), "Context attached to task: " + task.getSummary()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java index defb4b047..b3acc6949 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizard.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.RepositoryAttachment; @@ -47,7 +47,7 @@ public class ContextRetrieveWizard extends Wizard { task.getRepositoryUrl()); this.task = task; setWindowTitle(TITLE); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY_CONTEXT); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY_CONTEXT); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java index ea7714b32..28ee41d16 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; @@ -42,7 +42,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard { abstractRepositorySettingsPage.setVersion(repository.getVersion()); abstractRepositorySettingsPage.setWizard(this); setNeedsProgressMonitor(true); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); setWindowTitle(TITLE); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ExistingTaskWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ExistingTaskWizardPage.java index fb61d4923..0c257abd6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ExistingTaskWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ExistingTaskWizardPage.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -38,7 +38,7 @@ public class ExistingTaskWizardPage extends WizardPage { super(TITLE); setTitle(TITLE); setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } public void createControl(Composite parent) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/MultiRepositoryAwareWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/MultiRepositoryAwareWizard.java index b8f019153..80f361b22 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/MultiRepositoryAwareWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/MultiRepositoryAwareWizard.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; @@ -30,7 +30,7 @@ public class MultiRepositoryAwareWizard extends Wizard implements INewWizard { setForcePreviousAndNextButtons(true); setNeedsProgressMonitor(true); setWindowTitle(title); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } public void init(IWorkbench workbench, IStructuredSelection selection) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java index ed5685fb5..8fd6a0899 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentPage.java @@ -20,7 +20,7 @@ import java.util.Map; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.LocalAttachment; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -172,7 +172,7 @@ public class NewAttachmentPage extends WizardPage { attachContextButton = new Button(composite, SWT.CHECK); attachContextButton.setLayoutData(new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false, 2, 1)); attachContextButton.setText("Attach Context"); - attachContextButton.setImage(TaskListImages.getImage(TaskListImages.CONTEXT_ATTACH)); + attachContextButton.setImage(TasksUiImages.getImage(TasksUiImages.CONTEXT_ATTACH)); attachContextButton.setEnabled((((NewAttachmentWizard) getWizard()).hasContext())); /* diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java index fa61fffb8..f66c3eff5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java @@ -28,7 +28,7 @@ import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylar.context.core.ContextCorePlugin; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; @@ -69,7 +69,7 @@ public class NewAttachmentWizard extends Wizard { this.repository = repository; setNeedsProgressMonitor(true); setWindowTitle("Add Attachment"); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); attachment = new LocalAttachment(); attachment.setFilePath(""); inputPage = new InputAttachmentSourcePage(this); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizardPage.java index d7f51c712..0c5efd854 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizardPage.java @@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -98,7 +98,7 @@ public class TaskDataImportWizardPage extends WizardPage { TasksUiPlugin.PLUGIN_ID, "icons/wizban/banner-import.gif")); setPageComplete(false); setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_IMPORT); + setImageDescriptor(TasksUiImages.BANNER_IMPORT); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java index 695953cde..feefe3aeb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.core.util.DateUtil; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractQueryHit; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; @@ -80,7 +80,7 @@ class SynchronizeQueryJob extends Job { repositoryQuery.setStatus(null); monitor.setTaskName("Synchronizing: " + repositoryQuery.getSummary()); - setProperty(IProgressConstants.ICON_PROPERTY, TaskListImages.REPOSITORY_SYNCHRONIZE); + setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE); TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository( repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl()); if (repository == null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java index a0a15c4fa..63febdb13 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryTask; import org.eclipse.mylar.tasks.core.ITaskDataHandler; @@ -60,7 +60,7 @@ class SynchronizeTaskJob extends Job { public IStatus run(IProgressMonitor monitor) { try { monitor.beginTask(LABEL_SYNCHRONIZE_TASK, repositoryTasks.size()); - setProperty(IProgressConstants.ICON_PROPERTY, TaskListImages.REPOSITORY_SYNCHRONIZE); + setProperty(IProgressConstants.ICON_PROPERTY, TasksUiImages.REPOSITORY_SYNCHRONIZE); for (final AbstractRepositoryTask repositoryTask : repositoryTasks) { if (monitor.isCanceled()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java index 08ff5d1e3..6f280b021 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java @@ -35,7 +35,7 @@ import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.editors.CategoryEditorInput; import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView; @@ -87,15 +87,15 @@ public class TasksUiUtil { } switch (priorityLevel) { case P1: - return TaskListImages.getImage(TaskListImages.PRIORITY_1); + return TasksUiImages.getImage(TasksUiImages.PRIORITY_1); case P2: - return TaskListImages.getImage(TaskListImages.PRIORITY_2); + return TasksUiImages.getImage(TasksUiImages.PRIORITY_2); case P3: - return TaskListImages.getImage(TaskListImages.PRIORITY_3); + return TasksUiImages.getImage(TasksUiImages.PRIORITY_3); case P4: - return TaskListImages.getImage(TaskListImages.PRIORITY_4); + return TasksUiImages.getImage(TasksUiImages.PRIORITY_4); case P5: - return TaskListImages.getImage(TaskListImages.PRIORITY_5); + return TasksUiImages.getImage(TasksUiImages.PRIORITY_5); default: return null; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index 96bae9572..d78c57524 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -60,7 +60,7 @@ import org.eclipse.mylar.core.MylarStatusHandler; import org.eclipse.mylar.internal.core.util.DateUtil; import org.eclipse.mylar.internal.tasks.core.CommentQuoter; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.actions.AttachFileAction; import org.eclipse.mylar.internal.tasks.ui.actions.CopyToClipboardAction; import org.eclipse.mylar.internal.tasks.ui.actions.SaveRemoteFileAction; @@ -808,7 +808,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { ImageHyperlink hyperlink = toolkit.createImageHyperlink(headerInfoComposite, SWT.NONE); hyperlink.setText(linkName); hyperlink.setToolTipText(kindLabel + " " + LABEL_HISTORY); - hyperlink.setImage(TaskListImages.getImage(TaskListImages.TASK_REPOSITORY_HISTORY)); + hyperlink.setImage(TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY_HISTORY)); hyperlink.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { @@ -1482,7 +1482,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { final String commentBody) { final ImageHyperlink replyLink = new ImageHyperlink(section, SWT.NULL); toolkit.adapt(replyLink, true, true); - replyLink.setImage(TaskListImages.getImage(TaskListImages.REPLY)); + replyLink.setImage(TasksUiImages.getImage(TasksUiImages.REPLY)); replyLink.setToolTipText(LABEL_REPLY); // no need for the background - transparency will take care of it replyLink.setBackground(null); @@ -1645,7 +1645,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { ImageHyperlink hyperlink = new ImageHyperlink(commentsSection, SWT.NONE); toolkit.adapt(hyperlink, true, true); hyperlink.setBackground(null); - hyperlink.setImage(TaskListImages.getImage(TaskListImages.EXPAND_ALL)); + hyperlink.setImage(TasksUiImages.getImage(TasksUiImages.EXPAND_ALL)); hyperlink.addHyperlinkListener(new HyperlinkAdapter() { public void linkActivated(HyperlinkEvent e) { revealAllComments(); @@ -2441,7 +2441,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { protected void addAttachContextButton(Composite buttonComposite, ITask task) { attachContextButton = toolkit.createButton(buttonComposite, "Attach Context", SWT.CHECK); - attachContextButton.setImage(TaskListImages.getImage(TaskListImages.CONTEXT_ATTACH)); + attachContextButton.setImage(TasksUiImages.getImage(TasksUiImages.CONTEXT_ATTACH)); } /** @@ -2474,7 +2474,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { final Button addSelfButton = toolkit.createButton(composite, "Add me to CC", SWT.CHECK); addSelfButton.setSelection(RepositoryTaskAttribute.TRUE.equals(taskData .getAttributeValue(RepositoryTaskAttribute.ADD_SELF_CC))); - addSelfButton.setImage(TaskListImages.getImage(TaskListImages.PERSON)); + addSelfButton.setImage(TasksUiImages.getImage(TasksUiImages.PERSON)); addSelfButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java index b1064aa35..151ed97b4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorInput.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.tasks.ui.editors; import java.util.Set; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylar.tasks.core.RepositoryTaskData; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -79,7 +79,7 @@ public abstract class AbstractTaskEditorInput implements IEditorInput { } public ImageDescriptor getImageDescriptor() { - return TaskListImages.REPOSITORY; + return TasksUiImages.REPOSITORY; } public IPersistableElement getPersistable() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentTableLabelProvider.java index c00d7be76..60e6f35ea 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentTableLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentTableLabelProvider.java @@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableColorProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.RepositoryAttachment; import org.eclipse.swt.graphics.Color; @@ -46,9 +46,9 @@ public class AttachmentTableLabelProvider extends DecoratingLabelProvider implem RepositoryAttachment attachment = (RepositoryAttachment) element; if (columnIndex == 0) { if (AbstractRepositoryConnector.MYLAR_CONTEXT_DESCRIPTION.equals(attachment.getDescription())) { - return TaskListImages.getImage(TaskListImages.CONTEXT_TRANSFER); + return TasksUiImages.getImage(TasksUiImages.CONTEXT_TRANSFER); } else if (attachment.isPatch()) { - return TaskListImages.getImage(TaskListImages.ATTACHMENT_PATCH); + return TasksUiImages.getImage(TasksUiImages.ATTACHMENT_PATCH); } else { return WorkbenchImages.getImage(ISharedImages.IMG_OBJ_FILE); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index fa9f2ca62..1b8fbbf73 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -22,7 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylar.core.MylarStatusHandler; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorActionContributor; import org.eclipse.mylar.internal.tasks.ui.editors.TaskPlanningEditor; @@ -412,7 +412,7 @@ public class TaskEditor extends SharedHeaderFormEditor { taskEditorInput = (TaskEditorInput) getEditorInput(); task = taskEditorInput.getTask(); setPartName(taskEditorInput.getLabel()); - setPageImage(0, TaskListImages.getImage(TaskListImages.CALENDAR)); + setPageImage(0, TasksUiImages.getImage(TasksUiImages.CALENDAR)); } int selectedIndex = index; @@ -426,7 +426,7 @@ public class TaskEditor extends SharedHeaderFormEditor { editor.init(getEditorSite(), input); index = addPage(taskEditor); if (input.getImageDescriptor() != null) { - setPageImage(index, TaskListImages.getImage(input.getImageDescriptor())); + setPageImage(index, TasksUiImages.getImage(input.getImageDescriptor())); } if (editor instanceof AbstractRepositoryTaskEditor) { @@ -456,7 +456,7 @@ public class TaskEditor extends SharedHeaderFormEditor { String urlToOpen = getUrl(); if (urlToOpen != null && !urlToOpen.equals("")) { browserPageIndex = createBrowserPage(urlToOpen); - setPageImage(browserPageIndex, TaskListImages.getImage(TaskListImages.OVERLAY_WEB)); + setPageImage(browserPageIndex, TasksUiImages.getImage(TasksUiImages.OVERLAY_WEB)); if (selectedIndex == 0 && taskEditorInput != null && !taskEditorInput.isNewTask()) { selectedIndex = browserPageIndex; } @@ -467,11 +467,11 @@ public class TaskEditor extends SharedHeaderFormEditor { } if (task instanceof AbstractRepositoryTask) { - setTitleImage(TaskListImages.getImage(TaskListImages.TASK_REPOSITORY)); + setTitleImage(TasksUiImages.getImage(TasksUiImages.TASK_REPOSITORY)); } else if (getEditorInput() instanceof AbstractTaskEditorInput) { - this.setTitleImage(TaskListImages.getImage(TaskListImages.TASK_REMOTE)); + this.setTitleImage(TasksUiImages.getImage(TasksUiImages.TASK_REMOTE)); } else if (getUrl() != null) { - setTitleImage(TaskListImages.getImage(TaskListImages.TASK_WEB)); + setTitleImage(TasksUiImages.getImage(TasksUiImages.TASK_WEB)); } } catch (PartInitException e) { @@ -505,7 +505,7 @@ public class TaskEditor extends SharedHeaderFormEditor { @Override protected void createHeaderContents(IManagedForm headerForm) { getToolkit().decorateFormHeading(headerForm.getForm().getForm()); - headerForm.getForm().setImage(TaskListImages.getImage(TaskListImages.TASK)); + headerForm.getForm().setImage(TasksUiImages.getImage(TasksUiImages.TASK)); IEditorInput input = getEditorInput(); if (input instanceof TaskEditorInput) { @@ -535,9 +535,9 @@ public class TaskEditor extends SharedHeaderFormEditor { private void setFormHeaderImage(String repositoryKind) { ImageDescriptor overlay = TasksUiPlugin.getDefault().getOverlayIcon(repositoryKind); - ImageDescriptor imageDescriptor = TaskListImages.createWithOverlay(TaskListImages.REPOSITORY, overlay, false, + ImageDescriptor imageDescriptor = TasksUiImages.createWithOverlay(TasksUiImages.REPOSITORY, overlay, false, false); - getHeaderForm().getForm().setImage(TaskListImages.getImage(imageDescriptor)); + getHeaderForm().getForm().setImage(TasksUiImages.getImage(imageDescriptor)); } public Form getTopForm() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java index 993b829de..5b7eca252 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java @@ -14,7 +14,7 @@ package org.eclipse.mylar.tasks.ui.search; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.core.TaskRepositoryManager; @@ -55,7 +55,7 @@ public abstract class AbstractRepositoryQueryPage extends WizardPage implements this(wizardTitle, null); setTitle(TITLE); setDescription(DESCRIPTION); - setImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setImageDescriptor(TasksUiImages.BANNER_REPOSITORY); setPageComplete(false); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java index 043558bd5..1bc5428f0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractEditQueryWizard.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.tasks.ui.wizards; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -37,7 +37,7 @@ public abstract class AbstractEditQueryWizard extends Wizard { this.query = query; setNeedsProgressMonitor(true); setWindowTitle(TITLE); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } @Override diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java index 368394ddd..2cf86c653 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewWebTaskWizard.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.tasks.ui.wizards; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.wizards.NewWebTaskPage; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiUtil; @@ -37,7 +37,7 @@ public class NewWebTaskWizard extends Wizard implements INewWizard { this.newTaskUrl = newTaskUrl; setWindowTitle("New Repository Task"); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } public void init(IWorkbench workbench, IStructuredSelection selection) { diff --git a/org.eclipse.mylyn.trac.ui/.classpath b/org.eclipse.mylyn.trac.ui/.classpath index 4e67fbe59..92f16e233 100644 --- a/org.eclipse.mylyn.trac.ui/.classpath +++ b/org.eclipse.mylyn.trac.ui/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"> <accessrules> - <accessrule kind="accessible" pattern="**/TaskListImages"/> + <accessrule kind="accessible" pattern="**/TasksUiImages"/> <accessrule kind="accessible" pattern="**/TaskListSynchronizationScheduler"/> <accessrule kind="accessible" pattern="**/TaskListPreferenceConstants"/> <accessrule kind="discouraged" pattern="**/mylar/internal/tasks/**"/> diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java index 3b5ddd7f3..64deb8288 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java @@ -12,7 +12,7 @@ package org.eclipse.mylar.internal.trac.ui.wizard; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylar.tasks.core.TaskRepository; @@ -34,7 +34,7 @@ public class NewTracQueryWizard extends Wizard { setNeedsProgressMonitor(true); setWindowTitle(TITLE); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); } @Override diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java index 23b72ef43..46f357a45 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java @@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.trac.ui.wizard; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylar.internal.tasks.ui.TaskListImages; +import org.eclipse.mylar.internal.tasks.ui.TasksUiImages; import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants; import org.eclipse.mylar.tasks.core.TaskRepository; import org.eclipse.mylar.tasks.ui.TasksUiUtil; @@ -40,7 +40,7 @@ public class NewTracTaskWizard extends Wizard implements INewWizard { newTaskPage = new NewTracTaskPage(taskRepository); setWindowTitle("New Repository Task"); - setDefaultPageImageDescriptor(TaskListImages.BANNER_REPOSITORY); + setDefaultPageImageDescriptor(TasksUiImages.BANNER_REPOSITORY); setNeedsProgressMonitor(true); } |
