From 8d8c2d5bb197b6a36ec222d358fa14d4e573bf17 Mon Sep 17 00:00:00 2001 From: mkersten Date: Fri, 30 May 2008 02:19:13 +0000 Subject: NEW - bug 227660: track Mylyn 3.0 API creation and migration https://bugs.eclipse.org/bugs/show_bug.cgi?id=227660 --- .../ui/tasklist/BugzillaTaskEditorFactory.java | 2 +- .../internal/help/ui/dialogs/UiLegendDialog.java | 7 +-- .../tasks/core/data/TaskDataExternalizer.java | 6 +-- .../mylyn/internal/tasks/ui/TaskSearchPage.java | 3 +- .../mylyn/internal/tasks/ui/TasksUiPlugin.java | 2 +- .../tasks/ui/actions/OpenRepositoryTask.java | 3 +- .../ui/actions/OpenTaskListElementAction.java | 3 +- .../tasks/ui/actions/QueryCloneAction.java | 3 +- .../tasks/ui/commands/OpenSelectedTaskHandler.java | 4 +- .../ui/deprecated/AbstractTaskEditorFactory.java | 55 ++++++++++++++++++++++ .../tasks/ui/util/TaskListElementImporter.java | 5 +- .../tasks/ui/util/TasksUiExtensionReader.java | 2 +- .../internal/tasks/ui/util/TasksUiInternal.java | 34 ++++++++++++- .../tasks/ui/views/TaskListTableSorter.java | 3 +- .../tasks/ui/wizards/NewAttachmentWizard.java | 5 +- .../eclipse/mylyn/tasks/ui/ITasksUiConstants.java | 11 ++--- .../mylyn/tasks/ui/TaskElementLabelProvider.java | 2 +- .../org/eclipse/mylyn/tasks/ui/TasksUiImages.java | 2 +- .../org/eclipse/mylyn/tasks/ui/TasksUiUtil.java | 33 ------------- .../org/eclipse/mylyn/tasks/ui/WebHyperlink.java | 51 -------------------- .../ui/editors/AbstractTaskEditorFactory.java | 53 --------------------- .../tasks/ui/editors/AbstractTaskEditorPage.java | 2 +- .../eclipse/mylyn/tasks/ui/editors/TaskEditor.java | 1 + .../mylyn/tasks/ui/wizards/NewWebTaskWizard.java | 3 +- .../internal/trac/ui/TracHyperlinkUtilTest.java | 1 - .../mylyn/internal/trac/ui/TracHyperlinkUtil.java | 1 - .../mylyn/internal/trac/ui/WebHyperlink.java | 51 ++++++++++++++++++++ .../trac/ui/editor/TracTaskEditorFactory.java | 2 +- 28 files changed, 169 insertions(+), 181 deletions(-) create mode 100644 org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractTaskEditorFactory.java delete mode 100644 org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/WebHyperlink.java delete mode 100644 org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorFactory.java create mode 100644 org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/WebHyperlink.java diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java index 7fa2b805f..f64a31ea3 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskEditorFactory.java @@ -13,11 +13,11 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; import org.eclipse.mylyn.internal.bugzilla.ui.editor.BugzillaTaskEditor; import org.eclipse.mylyn.internal.bugzilla.ui.editor.NewBugzillaTaskEditor; import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractRepositoryTaskEditor; +import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractTaskEditorFactory; import org.eclipse.mylyn.internal.tasks.ui.deprecated.RepositoryTaskEditorInput; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUi; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorFactory; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; import org.eclipse.ui.IEditorInput; diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java index 728c1845e..2be16145c 100644 --- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java +++ b/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java @@ -19,10 +19,11 @@ import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFonts; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; -import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.IRepositoryElement; +import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.ITask.PriorityLevel; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; +import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.LegendElement; import org.eclipse.mylyn.tasks.ui.TaskElementLabelProvider; import org.eclipse.mylyn.tasks.ui.TasksUi; @@ -298,8 +299,8 @@ public class UiLegendDialog extends PopupDialog { public void linkActivated(HyperlinkEvent e) { PreferenceDialog dlg = PreferencesUtil.createPreferenceDialogOn(PlatformUI.getWorkbench() .getActiveWorkbenchWindow() - .getShell(), TasksUiUtil.PREFS_PAGE_ID_COLORS_AND_FONTS, - new String[] { TasksUiUtil.PREFS_PAGE_ID_COLORS_AND_FONTS }, null); + .getShell(), ITasksUiConstants.ID_PREFERENCES_COLORS_AND_FONTS, + new String[] { ITasksUiConstants.ID_PREFERENCES_COLORS_AND_FONTS }, null); dlg.open(); } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataExternalizer.java index 8add1dec5..3791227f0 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataExternalizer.java @@ -21,7 +21,7 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; -import org.eclipse.mylyn.tasks.core.ITaskRepositoryManager; +import org.eclipse.mylyn.tasks.core.IRepositoryManager; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler; import org.eclipse.mylyn.tasks.core.data.ITaskDataWorkingCopy; @@ -35,9 +35,9 @@ import org.xml.sax.helpers.XMLReaderFactory; */ public class TaskDataExternalizer { - private final ITaskRepositoryManager taskRepositoryManager; + private final IRepositoryManager taskRepositoryManager; - public TaskDataExternalizer(ITaskRepositoryManager taskRepositoryManager) { + public TaskDataExternalizer(IRepositoryManager taskRepositoryManager) { this.taskRepositoryManager = taskRepositoryManager; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java index 52770babb..c1ffc3fd3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java @@ -26,7 +26,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUi; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage; @@ -107,7 +106,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage { boolean openSuccessful = TasksUiUtil.openTask(repository, key); if (!openSuccessful) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - ITasksUiConstants.TITLE_DIALOG, "No task found matching key: " + key); + "Task Search", "No task found matching key: " + key); } return openSuccessful; } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java index cb2877d1a..96fa81550 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java @@ -74,6 +74,7 @@ import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationMana import org.eclipse.mylyn.internal.tasks.core.externalization.IExternalizationParticipant; import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizationParticipant; import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer; +import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractTaskEditorFactory; import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotification; import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationQueryIncoming; import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationReminder; @@ -94,7 +95,6 @@ import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider; import org.eclipse.mylyn.tasks.ui.TasksUi; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorFactory; import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IStartup; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java index 412339208..d7b5da312 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java @@ -19,7 +19,6 @@ import org.eclipse.mylyn.internal.tasks.ui.AddExistingTaskJob; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.commands.RemoteTaskSelectionDialog; import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; @@ -96,7 +95,7 @@ public class OpenRepositoryTask extends Action implements IWorkbenchWindowAction } if (!openSuccessful) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - ITasksUiConstants.TITLE_DIALOG, "Could not find matching repository task."); + "Open Task", "Could not find matching repository task."); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java index 50876f5c7..0e7c4a069 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java @@ -17,7 +17,6 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.mylyn.internal.tasks.core.AbstractTask; import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; @@ -48,7 +47,7 @@ public class OpenTaskListElementAction extends Action { List list = ((IStructuredSelection) selection).toList(); for (Object element : list) { if (element instanceof ITask && event != null && (event.keyCode & SWT.MOD1) != 0) { - TasksUiUtil.openTaskInBackground((AbstractTask) element, true); + TasksUiInternal.openTaskInBackground((AbstractTask) element, true); } else if (element instanceof ITask) { TasksUiInternal.refreshAndOpenTaskListElement((ITask) element); } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java index d413a9e17..cde3801f9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java @@ -24,7 +24,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; @@ -74,7 +73,7 @@ public class QueryCloneAction extends Action implements IViewActionDelegate { public void run(RepositoryQuery selectedQuery) { if (selectedQuery == null) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - ITasksUiConstants.TITLE_DIALOG, "No query selected."); + "Clone Query", "No query selected."); return; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenSelectedTaskHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenSelectedTaskHandler.java index 093a5e305..856ffd369 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenSelectedTaskHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenSelectedTaskHandler.java @@ -10,10 +10,10 @@ package org.eclipse.mylyn.internal.tasks.ui.commands; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.mylyn.internal.tasks.core.AbstractTask; +import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.IRepositoryElement; import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.TasksUiUtil; /** * @author Steffen Pingel @@ -23,7 +23,7 @@ public class OpenSelectedTaskHandler extends AbstractTaskListViewHandler { @Override protected void execute(ExecutionEvent event, TaskListView taskListView, IRepositoryElement item) { if (item instanceof ITask) { - TasksUiUtil.openTaskInBackground((AbstractTask) item, true); + TasksUiInternal.openTaskInBackground((AbstractTask) item, true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractTaskEditorFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractTaskEditorFactory.java new file mode 100644 index 000000000..073e2d05f --- /dev/null +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractTaskEditorFactory.java @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Mylyn project committers and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ + +package org.eclipse.mylyn.internal.tasks.ui.deprecated; + +import org.eclipse.mylyn.tasks.core.ITask; +import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory; +import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; + +/** + * Extend to add tabs to task editors. + * + * @author Mik Kersten + * @since 2.0 + * @deprecated use {@link AbstractTaskEditorPageFactory} instead + */ +@Deprecated +public abstract class AbstractTaskEditorFactory { + + public abstract IEditorPart createEditor(TaskEditor parentEditor, IEditorInput editorInput); + + /** + * @since 3.0 + */ + public abstract IEditorInput createEditorInput(ITask task); + + public abstract String getTitle(); + + /** + * @since 3.0 + */ + public abstract boolean canCreateEditorFor(ITask task); + + public abstract boolean canCreateEditorFor(IEditorInput input); + + public boolean providesOutline() { + return false; + } + + /** + * @return A higher integer for high priority, low integer for low priority. Higher priority editors will be placed + * earlier in the tab list. + */ + public int getTabOrderPriority() { + return 1; + } + +} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListElementImporter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListElementImporter.java index bde8681f5..1e9382924 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListElementImporter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListElementImporter.java @@ -60,7 +60,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.core.AbstractTaskListMigrator; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUi; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -120,6 +119,8 @@ public class TaskListElementImporter { private final TaskRepositoryManager repositoryManager; + private static final String MESSAGE_RESTORE = "Could not read task list. Consider restoring via File -> Import -> Mylyn Task Data"; + public TaskListElementImporter(TaskRepositoryManager repositoryManager, TasksModel tasksModel) { this.repositoryManager = repositoryManager; this.delagatingExternalizer = new DelegatingTaskExternalizer(tasksModel); @@ -512,7 +513,7 @@ public class TaskListElementImporter { inFile.renameTo(new File(name)); } if (child == null) { - StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, ITasksUiConstants.MESSAGE_RESTORE, e)); + StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, MESSAGE_RESTORE, e)); } else { StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "Tasks may have been lost from " + child.getNodeName(), e)); 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 10fd202c6..15f0d6cb2 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 @@ -26,6 +26,7 @@ import org.eclipse.mylyn.internal.tasks.core.deprecated.AbstractTaskListFactory; import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer; import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; +import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractTaskEditorFactory; import org.eclipse.mylyn.internal.tasks.ui.views.AbstractTaskListPresentation; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractDuplicateDetector; @@ -35,7 +36,6 @@ import org.eclipse.mylyn.tasks.core.RepositoryTemplate; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; import org.eclipse.mylyn.tasks.ui.AbstractTaskRepositoryLinkProvider; import org.eclipse.mylyn.tasks.ui.TasksUi; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorFactory; import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPageFactory; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java index 65dc37849..886b7cded 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java @@ -83,7 +83,6 @@ import org.eclipse.mylyn.tasks.core.data.TaskData; import org.eclipse.mylyn.tasks.core.sync.SynchronizationJob; import org.eclipse.mylyn.tasks.core.sync.TaskJob; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUi; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; @@ -95,6 +94,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPreferenceConstants; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkingSet; @@ -495,7 +495,7 @@ public class TasksUiInternal { taskList.addTask(newTask, view.getDrilledIntoCategory()); } else { if (view != null && view.getDrilledIntoCategory() != null) { - MessageDialog.openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG, + MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Create Task", "The new task has been added to the root of the list, since tasks can not be added to a query."); } taskList.addTask(newTask, TasksUiPlugin.getTaskList().getDefaultCategory()); @@ -785,4 +785,34 @@ public class TasksUiInternal { return true; } + /** + * @since 3.0 + */ + public static boolean openTaskInBackground(ITask task, boolean bringToTop) { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if (window != null) { + IEditorPart activeEditor = null; + IWorkbenchPart activePart = null; + IWorkbenchPage activePage = window.getActivePage(); + if (activePage != null) { + activeEditor = activePage.getActiveEditor(); + activePart = activePage.getActivePart(); + } + boolean opened = TasksUiUtil.openTask(task); + if (opened && activePage != null) { + if (!bringToTop && activeEditor != null) { + activePage.bringToTop(activeEditor); + } + if (activePart != null) { + activePage.activate(activePart); + } + } + return opened; + } else { + StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Unable to open editor for \"" + + task.getSummary() + "\": no active workbench window")); + } + return false; + } + } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java index 3afc9f7fe..bbd91329f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java @@ -20,7 +20,6 @@ import org.eclipse.mylyn.tasks.core.IRepositoryElement; import org.eclipse.mylyn.tasks.core.IRepositoryQuery; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.ITaskContainer; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.ui.PlatformUI; /** @@ -60,7 +59,7 @@ public class TaskListTableSorter extends ViewerSorter { public void setColumn(String column) { if (view.isFocusedMode()) { MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - ITasksUiConstants.TITLE_DIALOG, + "Task Sorting", "Manual sorting is disabled in focused mode, sort order will not take effect until focused mode is disabled."); } } 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 bcdd4fdd1..7fab59c86 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 @@ -43,7 +43,6 @@ import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.ITask.SynchronizationState; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUi; import org.eclipse.mylyn.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; @@ -222,8 +221,8 @@ public class NewAttachmentWizard extends Wizard { public void run() { if (event.getResult().getException() != null) { - MessageDialog.openError(Display.getDefault().getActiveShell(), - ITasksUiConstants.TITLE_DIALOG, event.getResult().getMessage()); + MessageDialog.openError(Display.getDefault().getActiveShell(), "Task Attachment", + event.getResult().getMessage()); } forceRefreshInplace(task); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITasksUiConstants.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITasksUiConstants.java index 8cdec021e..3ae92adf3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITasksUiConstants.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ITasksUiConstants.java @@ -11,17 +11,10 @@ package org.eclipse.mylyn.tasks.ui; /** * @author Mik Kersten * @since 3.0 + * @noimplement This interface is not intended to be implemented by clients. */ public interface ITasksUiConstants { - @Deprecated - public static final String TITLE_DIALOG = "Mylyn Information"; - - @Deprecated - public static final String MESSAGE_RESTORE = "Could not read task list. Consider restoring via File -> Import -> Mylyn Task Data"; - - public static final String URL_HOMEPAGE = "http://eclipse.org/mylyn"; - public static final String ID_COMMAND_MARK_TASK_UNREAD = "org.eclipse.mylyn.tasks.ui.command.markTaskUnread"; public static final String ID_COMMAND_MARK_TASK_READ = "org.eclipse.mylyn.tasks.ui.command.markTaskRead"; @@ -30,4 +23,6 @@ public interface ITasksUiConstants { public static final String ID_PERSPECTIVE_PLANNING = "org.eclipse.mylyn.tasks.ui.perspectives.planning"; + public static final String ID_PREFERENCES_COLORS_AND_FONTS = "org.eclipse.ui.preferencePages.ColorsAndFonts"; + } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java index 72ae54c4a..a27c31687 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskElementLabelProvider.java @@ -91,7 +91,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro private CompositeImageDescriptor getImageDescriptor(Object object) { CompositeImageDescriptor compositeDescriptor = new CompositeImageDescriptor(); if (object instanceof UncategorizedTaskContainer) { - compositeDescriptor.icon = TasksUiImages.CATEGORY_ARCHIVE; + compositeDescriptor.icon = TasksUiImages.CATEGORY_UNCATEGORIZED; return compositeDescriptor; } else if (object instanceof TaskCategory) { compositeDescriptor.icon = TasksUiImages.CATEGORY; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java index 180a925d3..12ef15056 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiImages.java @@ -72,7 +72,7 @@ public class TasksUiImages { public static final ImageDescriptor CATEGORY_NEW = create(TOOL, "category-new.gif"); - public static final ImageDescriptor CATEGORY_ARCHIVE = create(TOOL, "category-archive.gif"); + public static final ImageDescriptor CATEGORY_UNCATEGORIZED = create(TOOL, "category-archive.gif"); public static final ImageDescriptor QUERY = create(TOOL, "query.gif"); 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 f7adad083..0e2996461 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 @@ -52,7 +52,6 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -77,8 +76,6 @@ public class TasksUiUtil { */ public static final int FLAG_NO_RICH_EDITOR = 1 << 17; - public static final String PREFS_PAGE_ID_COLORS_AND_FONTS = "org.eclipse.ui.preferencePages.ColorsAndFonts"; - private static final String ATTRIBUTE_OUTGOING_NEW_CONNECTOR_KIND = "outgoingNewConnectorKind"; /** @@ -264,36 +261,6 @@ public class TasksUiUtil { return openTask(repository, taskId); } - /** - * @since 3.0 - */ - public static boolean openTaskInBackground(ITask task, boolean bringToTop) { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window != null) { - IEditorPart activeEditor = null; - IWorkbenchPart activePart = null; - IWorkbenchPage activePage = window.getActivePage(); - if (activePage != null) { - activeEditor = activePage.getActiveEditor(); - activePart = activePage.getActivePart(); - } - boolean opened = openTask(task); - if (opened && activePage != null) { - if (!bringToTop && activeEditor != null) { - activePage.bringToTop(activeEditor); - } - if (activePart != null) { - activePage.activate(activePart); - } - } - return opened; - } else { - StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Unable to open editor for \"" - + task.getSummary() + "\": no active workbench window")); - } - return false; - } - /** * @since 3.0 */ diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/WebHyperlink.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/WebHyperlink.java deleted file mode 100644 index f37523d95..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/WebHyperlink.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Mylyn project committers and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui; - -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.hyperlink.IHyperlink; - -/** - * Encapsulates link from text to a URL. - * - * @author Steffen Pingel - * @since 2.0 - */ -//API 3.0 move to util package? -public class WebHyperlink implements IHyperlink { - - private final IRegion region; - - private final String url; - - public WebHyperlink(IRegion region, String url) { - this.region = region; - this.url = url; - } - - public IRegion getHyperlinkRegion() { - return region; - } - - public String getTypeLabel() { - return null; - } - - public String getHyperlinkText() { - return "Open URL " + url; - } - - public void open() { - TasksUiUtil.openTask(url); - } - - public String getURLString() { - return url; - } - -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorFactory.java deleted file mode 100644 index d0fb0d1b5..000000000 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorFactory.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Mylyn project committers and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ - -package org.eclipse.mylyn.tasks.ui.editors; - -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; - -/** - * Extend to add tabs to task editors. - * - * @author Mik Kersten - * @since 2.0 - * @deprecated use {@link AbstractTaskEditorPageFactory} instead - */ -@Deprecated -public abstract class AbstractTaskEditorFactory { - - public abstract IEditorPart createEditor(TaskEditor parentEditor, IEditorInput editorInput); - - /** - * @since 3.0 - */ - public abstract IEditorInput createEditorInput(ITask task); - - public abstract String getTitle(); - - /** - * @since 3.0 - */ - public abstract boolean canCreateEditorFor(ITask task); - - public abstract boolean canCreateEditorFor(IEditorInput input); - - public boolean providesOutline() { - return false; - } - - /** - * @return A higher integer for high priority, low integer for low priority. Higher priority editors will be placed - * earlier in the tab list. - */ - public int getTabOrderPriority() { - return 1; - } - -} diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java index dfe7c4559..bd63a966d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java @@ -157,7 +157,7 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect TasksUiInternal.getTaskList().addTask(newTask, parent); close(); TasksUiInternal.getTaskList().deleteTask(getTask()); - TasksUiUtil.openTaskInBackground(newTask, false); + TasksUiInternal.openTaskInBackground(newTask, false); } public void run() { 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 f4294d33d..7f3d0d057 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 @@ -40,6 +40,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.actions.ToggleTaskActivationAction; import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractRepositoryTaskEditor; import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractRepositoryTaskEditorInput; +import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractTaskEditorFactory; import org.eclipse.mylyn.internal.tasks.ui.deprecated.NewTaskEditorInput; import org.eclipse.mylyn.internal.tasks.ui.deprecated.RepositoryTaskEditorInput; import org.eclipse.mylyn.internal.tasks.ui.editors.EditorBusyIndicator; 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 44365d85b..1fd16b7e4 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 @@ -16,7 +16,6 @@ import org.eclipse.mylyn.internal.tasks.core.deprecated.TaskSelection; import org.eclipse.mylyn.internal.tasks.ui.wizards.NewWebTaskPage; import org.eclipse.mylyn.tasks.core.ITaskMapping; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.swt.dnd.Clipboard; @@ -91,7 +90,7 @@ public class NewWebTaskWizard extends Wizard implements INewWizard { MessageDialog.openInformation( getShell(), - ITasksUiConstants.TITLE_DIALOG, + "New Task", "This connector does not provide a rich task editor for creating tasks.\n\n" + "The error contents have been placed in the clipboard so that you can paste them into the entry form."); } diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtilTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtilTest.java index fec9256be..2e0d0ad4e 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtilTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtilTest.java @@ -14,7 +14,6 @@ import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskHyperlink; -import org.eclipse.mylyn.tasks.ui.WebHyperlink; public class TracHyperlinkUtilTest extends TestCase { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java index 340482abb..19b1cb3bf 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java @@ -23,7 +23,6 @@ import org.eclipse.mylyn.commons.core.StatusHandler; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskHyperlink; -import org.eclipse.mylyn.tasks.ui.WebHyperlink; /** * Utility class for detecting Trac hyperlinks. diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/WebHyperlink.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/WebHyperlink.java new file mode 100644 index 000000000..4431531f4 --- /dev/null +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/WebHyperlink.java @@ -0,0 +1,51 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Mylyn project committers and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.mylyn.internal.trac.ui; + +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.mylyn.tasks.ui.TasksUiUtil; + +/** + * Encapsulates link from text to a URL. + * + * @author Steffen Pingel + * @since 2.0 + */ +public class WebHyperlink implements IHyperlink { + + private final IRegion region; + + private final String url; + + public WebHyperlink(IRegion region, String url) { + this.region = region; + this.url = url; + } + + public IRegion getHyperlinkRegion() { + return region; + } + + public String getTypeLabel() { + return null; + } + + public String getHyperlinkText() { + return "Open URL " + url; + } + + public void open() { + TasksUiUtil.openTask(url); + } + + public String getURLString() { + return url; + } + +} diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java index 7ad7b910f..3b8d899bf 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java @@ -10,6 +10,7 @@ package org.eclipse.mylyn.internal.trac.ui.editor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages; +import org.eclipse.mylyn.internal.tasks.ui.deprecated.AbstractTaskEditorFactory; import org.eclipse.mylyn.internal.tasks.ui.deprecated.RepositoryTaskEditorInput; import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector; @@ -17,7 +18,6 @@ import org.eclipse.mylyn.internal.trac.core.TracTask; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUi; -import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorFactory; import org.eclipse.mylyn.tasks.ui.editors.BrowserFormPage; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; -- cgit v1.2.3