diff options
71 files changed, 202 insertions, 284 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskHyperlinkDetectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskHyperlinkDetectorTest.java index 81e2d3abf..baf67f3b3 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskHyperlinkDetectorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskHyperlinkDetectorTest.java @@ -17,9 +17,9 @@ import org.eclipse.jface.text.Document; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewer; +import org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.ui.editors.RepositoryTextViewer; -import org.eclipse.mylyn.tasks.ui.editors.TaskHyperlinkDetector; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java index e202e05fb..8eaace14f 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java @@ -30,6 +30,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPER import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.RepositoryOperation; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; @@ -39,7 +40,6 @@ import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor; -import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector; import org.eclipse.swt.SWT; @@ -686,32 +686,6 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { } - /** - * A listener for selection of a comment. - */ - protected class CommentListener implements Listener { - - /** The comment that this listener is for. */ - private TaskComment taskComment; - - /** - * Creates a new <code>CommentListener</code>. - * - * @param taskComment - * The comment that this listener is for. - */ - public CommentListener(TaskComment taskComment) { - this.taskComment = taskComment; - } - - public void handleEvent(Event event) { - fireSelectionChanged(new SelectionChangedEvent( - selectionProvider, - new StructuredSelection(new RepositoryTaskSelection(taskData.getId(), taskData.getRepositoryUrl(), - taskData.getRepositoryKind(), taskComment.getCreated(), taskComment, taskData.getSummary())))); - } - } - @Override protected void validateInput() { diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java index b4ca1bf4a..ab0266174 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java @@ -717,7 +717,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L // TODO: avoid overriding? public boolean performAction() { if (restoreQueryOptions) { - saveWidgetValues(); + saveState(); } getPatternData(summaryPattern, summaryOperation, previousSummaryPatterns); @@ -1538,7 +1538,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L emailPattern.setText(settings.get(STORE_EMAILADDRESS_ID + repoId)); } - public void saveWidgetValues() { + public void saveState() { String repoId = "." + repository.getUrl(); IDialogSettings settings = getDialogSettings(); settings.put(STORE_PRODUCT_ID + repoId, product.getSelection()); 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 6eac12faa..9e46cd92b 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 @@ -305,7 +305,7 @@ public class UiLegendDialog extends PopupDialog { Collection<AbstractRepositoryConnector> connectors = TasksUiPlugin.getRepositoryManager() .getRepositoryConnectors(); for (AbstractRepositoryConnector connector : connectors) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()); if (connectorUi != null) { List<AbstractTaskContainer> elements = connectorUi.getLegendItems(); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java index 6b10ce992..facc529f7 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java @@ -85,7 +85,7 @@ public class RepositorySettingsPageTest extends TestCase { public void testNeedsAnonyoumousLogin() { TaskRepository repository = new TaskRepository("kind", "http://localhost/"); - TasksUiPlugin.addRepositoryConnectorUi(new MockTaskConnectorUi()); + TasksUiPlugin.getDefault().addRepositoryConnectorUi(new MockTaskConnectorUi()); MockRepositorySettingsPage page = new MockRepositorySettingsPage(new MockTaskConnectorUi()); page.setNeedsAnonymousLogin(true); diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml index 67bbec244..c0b670a9b 100644 --- a/org.eclipse.mylyn.tasks.ui/plugin.xml +++ b/org.eclipse.mylyn.tasks.ui/plugin.xml @@ -555,14 +555,14 @@ <extension point="org.eclipse.mylyn.tasks.ui.editors"> <hyperlinkDetector - class="org.eclipse.mylyn.tasks.ui.editors.TaskUrlHyperlinkDetector" + class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskUrlHyperlinkDetector" id="org.eclipse.mylyn.tasks.ui.hyperlink.detector.url"/> </extension> <extension point="org.eclipse.mylyn.tasks.ui.editors"> <hyperlinkDetector - class="org.eclipse.mylyn.tasks.ui.editors.TaskHyperlinkDetector" + class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector" id="org.eclipse.mylyn.tasks.ui.hyperlink.detector.tasks"/> </extension> @@ -732,7 +732,7 @@ point="org.eclipse.core.runtime.adapters"> <factory adaptableType="org.eclipse.mylyn.tasks.core.AbstractTaskContainer" - class="org.eclipse.mylyn.tasks.ui.search.SearchScoreComputerAdapterFactory"> + class="org.eclipse.mylyn.internal.tasks.ui.search.SearchScoreComputerAdapterFactory"> <adapter type="org.eclipse.search.ui.ISearchPageScoreComputer"> </adapter> @@ -742,13 +742,13 @@ <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> <hyperlinkDetector - class="org.eclipse.mylyn.tasks.ui.editors.TaskHyperlinkDetector" + class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector" id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.task" name="Mylyn Tasks" targetId="org.eclipse.ui.DefaultTextEditor"> </hyperlinkDetector> <hyperlinkDetector - class="org.eclipse.mylyn.tasks.ui.editors.TaskUrlHyperlinkDetector" + class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskUrlHyperlinkDetector" description="Mylyn enabled URL hyperlink detector" id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.url" name="Mylyn URLs" diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java index da2c88777..ed3901b44 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java @@ -104,7 +104,7 @@ public class OpenRepositoryTaskJob extends Job { } finally { monitor.done(); } - return new Status(IStatus.OK, TasksUiPlugin.PLUGIN_ID, IStatus.OK, "", null); + return new Status(IStatus.OK, TasksUiPlugin.ID_PLUGIN, IStatus.OK, "", null); } private void openEditor(final TaskRepository repository, final RepositoryTaskData taskData) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java index f33b74c4e..1df7a9f2a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/SynchronizeTaskJob.java @@ -96,7 +96,7 @@ class SynchronizeTaskJob extends Job { repositoryTask.getConnectorKind(), repositoryTask.getRepositoryUrl()); if (repository == null) { - repositoryTask.setSynchronizationStatus(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, + repositoryTask.setSynchronizationStatus(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, 0, "Associated repository could not be found. Ensure proper repository configuration of " + repositoryTask.getRepositoryUrl() + " in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", null)); @@ -166,7 +166,7 @@ class SynchronizeTaskJob extends Job { task.getConnectorKind(), task.getRepositoryUrl()); try { if (repository == null) { - throw new CoreException(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, + throw new CoreException(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, 0, "Associated repository could not be found. Ensure proper repository configuration of " + task.getRepositoryUrl() + " in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", null)); 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 7b64482f9..f4b94b0f5 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 @@ -179,7 +179,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage { String repositoryUrl = repositoryCombo.getItem(pageIndex); repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryUrl); if (repository != null) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind()); if (connectorUi != null) { WizardPage searchPage = connectorUi.getSearchPage(repository, null); if (searchPage != null && searchPage instanceof ISearchPage) { @@ -213,7 +213,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage { List<TaskRepository> repositories = TasksUiPlugin.getRepositoryManager().getAllRepositories(); List<TaskRepository> searchableRepositories = new ArrayList<TaskRepository>(); for (TaskRepository repository : repositories) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind()); if (connectorUi != null && connectorUi.hasSearchPage()) { searchableRepositories.add(repository); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskTransfer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java index 0ff8f3a5c..a6adbf7dc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskTransfer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui; +package org.eclipse.mylyn.internal.tasks.ui; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -15,6 +15,7 @@ import java.io.DataOutputStream; import java.io.IOException; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyAttachmentToClipboardJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyAttachmentToClipboardJob.java index 9b61eaca0..6379f24c1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyAttachmentToClipboardJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/CopyAttachmentToClipboardJob.java @@ -52,7 +52,7 @@ public class CopyAttachmentToClipboardJob extends Job { attachment.getRepositoryKind()); AbstractAttachmentHandler handler = connector.getAttachmentHandler(); if (handler == null) { - return new RepositoryStatus(IStatus.INFO, TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_INTERNAL, + return new RepositoryStatus(IStatus.INFO, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_INTERNAL, "The repository does not support attachments."); } 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 d74630755..46e75b9f4 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 @@ -13,12 +13,12 @@ package org.eclipse.mylyn.internal.tasks.ui.actions; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; -import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DownloadAttachmentJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DownloadAttachmentJob.java index 42885a6eb..366cd3373 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DownloadAttachmentJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DownloadAttachmentJob.java @@ -56,7 +56,7 @@ public class DownloadAttachmentJob extends Job { this.attachment.getRepositoryKind()); AbstractAttachmentHandler handler = connector.getAttachmentHandler(); if (handler == null) { - return new RepositoryStatus(repository, IStatus.INFO, TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_INTERNAL, + return new RepositoryStatus(repository, IStatus.INFO, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_INTERNAL, "The repository does not support attachments."); } @@ -68,7 +68,7 @@ public class DownloadAttachmentJob extends Job { StatusManager.displayStatus("Download Attachment", e.getStatus()); return Status.OK_STATUS; } catch (IOException e) { - return new RepositoryStatus(repository, IStatus.WARNING, TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_IO, + return new RepositoryStatus(repository, IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_IO, "Error while writing to attachment file.", e); } finally { if (out != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java index 77c3785d6..5c744284c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewTaskAction.java @@ -44,7 +44,7 @@ public class NewTaskAction extends Action implements IViewActionDelegate { if (repositories.size() == 1) { // NOTE: this click-saving should be generalized TaskRepository taskRepository = repositories.get(0); - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(taskRepository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(taskRepository.getConnectorKind()); wizard = connectorUi.getNewTaskWizard(taskRepository); if (connectorUi instanceof LocalTaskConnectorUi) { wizard.performFinish(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java index 6b32be91d..8c7ecfe97 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java @@ -319,14 +319,14 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { private void validate() { if (idText.getText().trim().equals("")) { - updateStatus(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, "Enter a valid task ID", null)); + updateStatus(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, 0, "Enter a valid task ID", null)); return; } if (tasksViewer.getSelection().isEmpty() && repositoriesViewer.getSelection().isEmpty()) { - updateStatus(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, "Select a task or repository", null)); + updateStatus(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, 0, "Select a task or repository", null)); return; } - updateStatus(new Status(IStatus.OK, TasksUiPlugin.PLUGIN_ID, 0, "", null)); + updateStatus(new Status(IStatus.OK, TasksUiPlugin.ID_PLUGIN, 0, "", null)); } private String[] selectedIds; 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/internal/tasks/ui/editors/AttachmentTableLabelProvider.java index ddc8d7325..d37853c15 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/internal/tasks/ui/editors/AttachmentTableLabelProvider.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ILabelDecorator; @@ -18,6 +18,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractAttachmentHandler; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; +import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentsTableContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentsTableContentProvider.java index 786629467..4b0c80d01 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AttachmentsTableContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentsTableContentProvider.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import java.util.List; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/EditorBusyIndicator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java index 6e2338de9..e57195547 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/EditorBusyIndicator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorBusyIndicator.java @@ -1,4 +1,4 @@ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import java.util.Timer; import java.util.TimerTask; @@ -9,6 +9,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.WorkbenchPlugin; +/** + * @author Shawn Minto + */ public class EditorBusyIndicator { private boolean showingBusy = false; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/IBusyEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IBusyEditor.java index c02e1684b..961ea147b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/IBusyEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/IBusyEditor.java @@ -6,10 +6,13 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import org.eclipse.swt.graphics.Image; +/** + * @author Shawn Minto + */ public interface IBusyEditor { public void setTitleImage(Image image); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java index 10acd4361..f68a17f43 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskOutlineNode.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskOutlineNode.java @@ -8,13 +8,12 @@ * Contributors: * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import java.util.ArrayList; import java.util.Iterator; import java.util.Locale; -import org.eclipse.mylyn.internal.tasks.ui.editors.IRepositoryTaskSelection; import org.eclipse.mylyn.tasks.core.TaskComment; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; 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 ce2f36380..eb8b6f35f 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 @@ -20,7 +20,6 @@ import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.TaskComment; import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor; -import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskOutlineNode; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.ISelectionListener; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskSelection.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskSelection.java index 4482e5fd3..d19c89e71 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskSelection.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTaskSelection.java @@ -9,9 +9,8 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; -import org.eclipse.mylyn.internal.tasks.ui.editors.IRepositoryTaskSelection; import org.eclipse.mylyn.tasks.core.TaskComment; /** @@ -36,20 +35,6 @@ public class RepositoryTaskSelection implements IRepositoryTaskSelection { */ protected TaskComment taskComment; - // /** - // * Creates a new <code>RepositoryTaskSelection</code> with no supplied - // * contents or comment. - // * - // * @param taskId - // * The taskId of the Bugzilla object that the selection was on. - // * @param server - // * The server of the Bugzilla object that the selection was on. - // */ - // public RepositoryTaskSelection(String id, String server, String summary) - // { - // this(id, server, null, null, summary); - // } - /** * Creates a new <code>RepositoryTaskSelection</code> with no supplied * comment. diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTextViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java index e7701307f..ab5989410 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTextViewer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewer.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.IOverviewRuler; 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 58a2bf9c2..3db8e5ace 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 @@ -48,7 +48,6 @@ import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor; import org.eclipse.mylyn.tasks.ui.editors.NewTaskEditorInput; import org.eclipse.mylyn.tasks.ui.editors.RepositoryTaskEditorInput; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; -import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java index 509abede8..61495152f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskFormPage.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import java.util.ArrayList; import java.util.Iterator; @@ -38,9 +38,8 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ImageUtilities; import org.eclipse.jface.text.source.OverviewRuler; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; -import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryViewerConfig; -import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor; import org.eclipse.mylyn.tasks.core.TaskRepository; +import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.FocusEvent; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskHyperlinkDetector.java index 9e93e6634..6ce859add 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskHyperlinkDetector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskHyperlinkDetector.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; @@ -63,7 +63,7 @@ public class TaskHyperlinkDetector extends AbstractHyperlinkDetector { return null; } - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind()); if (connectorUi == null) { return null; } 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 75082ce68..4a5f2e565 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 @@ -38,7 +38,6 @@ import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; -import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.events.KeyEvent; @@ -630,7 +629,7 @@ public class TaskPlanningEditor extends TaskFormPage { }); if (task instanceof AbstractTask && !(task instanceof LocalTask)) { - AbstractRepositoryConnectorUi connector = TasksUiPlugin.getRepositoryUi(((AbstractTask) task).getConnectorKind()); + AbstractRepositoryConnectorUi connector = TasksUiPlugin.getConnectorUi(((AbstractTask) task).getConnectorKind()); if (connector != null && connector.supportsDueDates((AbstractTask) task)) { dueDatePicker.setEnabled(false); clearDueDate.setEnabled(false); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java index b1fcdaad9..66e46c7a4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskSpellingReconcileStrategy.java @@ -27,7 +27,7 @@ import org.eclipse.jface.text.reconciler.IReconcilerExtension; import org.eclipse.jface.text.reconciler.IReconcilingStrategy; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.IAnnotationModel; -import org.eclipse.mylyn.tasks.ui.editors.TaskFormPage.ErrorAnnotation; +import org.eclipse.mylyn.internal.tasks.ui.editors.TaskFormPage.ErrorAnnotation; import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector; import org.eclipse.ui.texteditor.spelling.SpellingContext; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlink.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlink.java index e1d07b37b..270f72d41 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlink.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlink.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.hyperlink.URLHyperlink; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java index 46261ff35..5ad46f7f6 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlinkDetector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.editors; +package org.eclipse.mylyn.internal.tasks.ui.editors; import java.net.MalformedURLException; import java.net.URL; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java index 9c7eb9b5e..f7a3d7d8f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/properties/ProjectPropertiesLinkProvider.java @@ -40,7 +40,7 @@ public class ProjectPropertiesLinkProvider extends AbstractTaskRepositoryLinkPro } IScopeContext projectScope = new ProjectScope(project); - IEclipsePreferences projectNode = projectScope.getNode(TasksUiPlugin.PLUGIN_ID); + IEclipsePreferences projectNode = projectScope.getNode(TasksUiPlugin.ID_PLUGIN); if (projectNode != null) { String kind = projectNode.get(PROJECT_REPOSITORY_KIND, ""); String urlString = projectNode.get(PROJECT_REPOSITORY_URL, ""); @@ -64,7 +64,7 @@ public class ProjectPropertiesLinkProvider extends AbstractTaskRepositoryLinkPro } IScopeContext projectScope = new ProjectScope(project); - IEclipsePreferences projectNode = projectScope.getNode(TasksUiPlugin.PLUGIN_ID); + IEclipsePreferences projectNode = projectScope.getNode(TasksUiPlugin.ID_PLUGIN); if (projectNode != null) { projectNode.put(PROJECT_REPOSITORY_KIND, repository.getConnectorKind()); projectNode.put(PROJECT_REPOSITORY_URL, repository.getUrl()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java index 65f4c0416..fc5e3a3e0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java @@ -63,7 +63,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple public static final int ORDER_DEFAULT = ORDER_PRIORITY; - private static final String KEY_SORTING = TasksUiPlugin.PLUGIN_ID + ".search.resultpage.sorting"; //$NON-NLS-1$ + private static final String KEY_SORTING = TasksUiPlugin.ID_PLUGIN + ".search.resultpage.sorting"; //$NON-NLS-1$ private SearchResultContentProvider taskContentProvider; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchScoreComputerAdapterFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchScoreComputerAdapterFactory.java index cbb065ed4..97be58098 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchScoreComputerAdapterFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/SearchScoreComputerAdapterFactory.java @@ -9,7 +9,7 @@ * University Of British Columbia - initial API and implementation *******************************************************************************/ -package org.eclipse.mylyn.tasks.ui.search; +package org.eclipse.mylyn.internal.tasks.ui.search; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.mylyn.internal.tasks.ui.TaskSearchPage; 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 9eea133f3..4a37207d2 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 @@ -303,7 +303,7 @@ public class TasksUiExtensionReader { Object connectorUiObject = element.createExecutableExtension(ATTR_CLASS); if (connectorUiObject instanceof AbstractRepositoryConnectorUi) { AbstractRepositoryConnectorUi connectorUi = (AbstractRepositoryConnectorUi) connectorUiObject; - TasksUiPlugin.addRepositoryConnectorUi((AbstractRepositoryConnectorUi) connectorUi); + TasksUiPlugin.getDefault().addRepositoryConnectorUi((AbstractRepositoryConnectorUi) connectorUi); String customNotificationsString = element.getAttribute(ATTR_CUSTOM_NOTIFICATIONS); if (customNotificationsString != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java index ab14de13d..ab99eb680 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java @@ -13,6 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.views; import java.lang.reflect.Field; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -31,6 +32,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.dialogs.FilteredTree; import org.eclipse.ui.dialogs.PatternFilter; import org.eclipse.ui.internal.WorkbenchMessages; +import org.osgi.framework.Bundle; /** * @author Mik Kersten @@ -49,6 +51,8 @@ public abstract class AbstractFilteredTree extends FilteredTree { private boolean showProgress = false; + private boolean eclipse_3_3_workbench = false; + /** * HACK: using reflection to gain access */ @@ -64,6 +68,11 @@ public abstract class AbstractFilteredTree extends FilteredTree { StatusManager.fail(e, "Could not get refresh job", false); } setInitialText(""); + + Bundle bundle = Platform.getBundle("org.eclipse.ui.workbench"); + if (bundle.getLocation().contains("_3.3.")) { + eclipse_3_3_workbench = true; + } } @Override @@ -169,7 +178,7 @@ public abstract class AbstractFilteredTree extends FilteredTree { refreshPolicy.textChanged(filterText.getText()); } - if (TasksUiPlugin.getDefault().isEclipse_3_3_workbench()) { + if (eclipse_3_3_workbench) { // bug 165353 work-around for premature return at // FilteredTree.java:374 updateToolbar(true); 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 38c25e20f..77ae67c20 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 @@ -97,12 +97,12 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro AbstractRepositoryConnectorUi connectorUi = null; if (element instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) element; - connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractTask) element).getConnectorKind()); + connectorUi = TasksUiPlugin.getConnectorUi(((AbstractTask) element).getConnectorKind()); if (connectorUi != null) { compositeDescriptor.overlayKind = connectorUi.getTaskKindOverlay(repositoryTask); } } else if (element instanceof AbstractRepositoryQuery) { - connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractRepositoryQuery) element).getRepositoryKind()); + connectorUi = TasksUiPlugin.getConnectorUi(((AbstractRepositoryQuery) element).getRepositoryKind()); } if (connectorUi != null) { @@ -173,7 +173,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro AbstractRepositoryConnectorUi connectorUi; if (element instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) element; - connectorUi = TasksUiPlugin.getRepositoryUi(((AbstractTask) element).getConnectorKind()); + connectorUi = TasksUiPlugin.getConnectorUi(((AbstractTask) element).getConnectorKind()); if (connectorUi != null) { return connectorUi.getTaskPriorityOverlay(repositoryTask); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java index 6e4e5f540..fa44d9df1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDragSourceListener.java @@ -19,10 +19,10 @@ import java.util.List; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylyn.context.core.ContextCorePlugin; +import org.eclipse.mylyn.internal.tasks.ui.TaskTransfer; import org.eclipse.mylyn.internal.tasks.ui.actions.CopyTaskDetailsAction; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; -import org.eclipse.mylyn.tasks.ui.TaskTransfer; import org.eclipse.swt.dnd.DragSourceEvent; import org.eclipse.swt.dnd.DragSourceListener; import org.eclipse.swt.dnd.FileTransfer; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index b0af3d7ea..5fb3c2250 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -31,13 +31,13 @@ import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob; +import org.eclipse.mylyn.internal.tasks.ui.TaskTransfer; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.ui.TaskTransfer; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.swt.dnd.DND; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java index 872247ee5..7564d6fbb 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTipHandler.java @@ -128,7 +128,7 @@ public class TaskListToolTipHandler { } else if (element instanceof AbstractTask) { AbstractTask task = (AbstractTask) element; StringBuilder sb = new StringBuilder(); - sb.append(TasksUiPlugin.getRepositoryUi(task.getConnectorKind()).getTaskKindLabel(task)); + sb.append(TasksUiPlugin.getConnectorUi(task.getConnectorKind()).getTaskKindLabel(task)); String key = task.getTaskKey(); if (key != null) { sb.append(" "); 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 d73544868..cc09b13a2 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 @@ -63,6 +63,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskCompletionFilter; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TaskListPatternFilter; import org.eclipse.mylyn.internal.tasks.ui.TaskPriorityFilter; +import org.eclipse.mylyn.internal.tasks.ui.TaskTransfer; import org.eclipse.mylyn.internal.tasks.ui.TaskWorkingSetFilter; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; @@ -100,7 +101,6 @@ import org.eclipse.mylyn.tasks.core.ITaskActivityListener; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; import org.eclipse.mylyn.tasks.core.TaskContainerDelta; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; -import org.eclipse.mylyn.tasks.ui.TaskTransfer; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; @@ -698,7 +698,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { updateDescription(null); } } - + private void updateDescription(AbstractTask task) { if (getSite() == null || getSite().getPage() == null) return; @@ -727,11 +727,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } public void addTaskToHistory(AbstractTask task) { - if (!TasksUiPlugin.getDefault().isMultipleActiveTasksMode()) { - TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task); - // nextTaskAction.setEnabled(taskHistory.hasNext()); - // previousTaskAction.setEnabled(TasksUiPlugin.getTaskListManager().getTaskActivationHistory().hasPrevious()); - } + TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task); } @Override @@ -802,10 +798,6 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { addFilter(filterArchive); } - if (TasksUiPlugin.getDefault().isMultipleActiveTasksMode()) { - togglePreviousAction(false); - } - // Restore "link with editor" value; by default true boolean linkValue = true; if (taskListMemento != null && taskListMemento.getString(MEMENTO_LINK_WITH_EDITOR) != null) { @@ -967,7 +959,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { restoreState(); updateDescription(); - + getSite().setSelectionProvider(getViewer()); getSite().getPage().addPartListener(editorListener); } @@ -1240,7 +1232,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } } } - + manager.add(new Separator(ID_SEPARATOR_REPOSITORY)); if (element instanceof AbstractRepositoryQuery || element instanceof TaskCategory) { @@ -1738,7 +1730,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { if (getSite() != null && getSite().getPage() != null) { filterWorkingSet.setCurrentWorkingSet(getSite().getPage().getAggregateWorkingSet()); } - + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { filteredTree.indicateActiveTaskWorkingSet(); @@ -1797,5 +1789,5 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { return Collections.emptySet(); } } - + } 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 3b68627d6..79f7c5459 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 @@ -67,7 +67,7 @@ public abstract class AbstractRepositoryClientWizard extends Wizard implements I connector = connectors.toArray(new AbstractRepositoryConnector[1])[0]; } setRepositoryConnector(connector); - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()); AbstractRepositorySettingsPage nextPage = connectorUi.getSettingsPage(); setRepositorySettingsPage(nextPage); nextPage.setWizard(this); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java index b1bce29a4..0ffc3f7e2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java @@ -39,7 +39,7 @@ public class AddExistingTaskWizard extends MultiRepositoryAwareWizard { @Override protected IWizard createWizard(TaskRepository taskRepository) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi( + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi( taskRepository.getConnectorKind()); return connectorUi.getAddExistingTaskWizard(taskRepository); } 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 dd51028ac..0f4a86dbd 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 @@ -35,7 +35,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard { public EditRepositoryWizard(TaskRepository repository) { super(); this.repository = repository; - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi( + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi( repository.getConnectorKind()); abstractRepositorySettingsPage = connectorUi.getSettingsPage(); abstractRepositorySettingsPage.setRepository(repository); @@ -69,7 +69,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard { repository.setProperty(TaskRepository.PROXY_USEDEFAULT, String.valueOf(abstractRepositorySettingsPage.getUseDefaultProxy())); repository.setProperty(TaskRepository.PROXY_HOSTNAME, abstractRepositorySettingsPage.getProxyHostname()); repository.setProperty(TaskRepository.PROXY_PORT, abstractRepositorySettingsPage.getProxyPort()); - repository.setProxyAuthenticationCredentials(abstractRepositorySettingsPage.getProxyUsername(), abstractRepositorySettingsPage.getProxyPassword()); + repository.setProxyAuthenticationCredentials(abstractRepositorySettingsPage.getProxyUserName(), abstractRepositorySettingsPage.getProxyPassword()); abstractRepositorySettingsPage.updateProperties(repository); 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 ef3028948..5b51e3094 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 @@ -142,7 +142,7 @@ public class NewAttachmentWizard extends Wizard { if (InputAttachmentSourcePage.CLIPBOARD_LABEL.equals(path)) { String contents = inputPage.getClipboardContents(); if (contents == null) { - throw new InvocationTargetException(new CoreException(new RepositoryStatus(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_INTERNAL, "Clipboard is empty", null))); + throw new InvocationTargetException(new CoreException(new RepositoryStatus(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_INTERNAL, "Clipboard is empty", null))); } attachment.setContent(contents.getBytes()); attachment.setFilename(CLIPBOARD_FILENAME); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java index 2112f7b8f..8d473cbde 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java @@ -37,7 +37,7 @@ public class NewQueryWizard extends MultiRepositoryAwareWizard { @Override protected IWizard createWizard(TaskRepository taskRepository) { - AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryUi(taskRepository.getConnectorKind()); + AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getConnectorUi(taskRepository.getConnectorKind()); return repositoryUi.getQueryWizard(taskRepository, null); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java index 98e83a95a..d1943993e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewTaskPage.java @@ -29,7 +29,7 @@ public class NewTaskPage extends SelectRepositoryPage { @Override protected IWizard createWizard(TaskRepository taskRepository) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi( + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi( taskRepository.getConnectorKind()); return connectorUi.getNewTaskWizard(taskRepository); // TODO remove unused parameter } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java index efebafa0a..24afaa4ce 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java @@ -115,7 +115,7 @@ public class SelectRepositoryClientPage extends WizardPage { @Override public IWizardPage getNextPage() { if (isPageComplete()) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi( + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi( wizard.getRepositoryConnector().getConnectorKind()); AbstractRepositorySettingsPage nextPage = connectorUi.getSettingsPage(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizardPage.java index c89d90a4f..a625909fd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizardPage.java @@ -78,7 +78,7 @@ public class TaskDataExportWizardPage extends WizardPage { public TaskDataExportWizardPage() { super("org.eclipse.mylyn.tasklist.exportPage", PAGE_TITLE, TasksUiPlugin.imageDescriptorFromPlugin( - TasksUiPlugin.PLUGIN_ID, "icons/wizban/banner-export.gif")); + TasksUiPlugin.ID_PLUGIN, "icons/wizban/banner-export.gif")); setPageComplete(false); } 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 6dcd5127a..c66aec1b2 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 @@ -94,7 +94,7 @@ public class TaskDataImportWizardPage extends WizardPage { public TaskDataImportWizardPage() { super("org.eclipse.mylyn.tasklist.importPage", PAGE_TITLE, TasksUiPlugin.imageDescriptorFromPlugin( - TasksUiPlugin.PLUGIN_ID, "icons/wizban/banner-import.gif")); + TasksUiPlugin.ID_PLUGIN, "icons/wizban/banner-import.gif")); setPageComplete(false); setDescription(DESCRIPTION); setImageDescriptor(TasksUiImages.BANNER_IMPORT); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index 384c8a6b3..25afbb2a3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -69,6 +69,7 @@ import org.eclipse.swt.widgets.Display; * Provides facilities for using and managing the Task List and task activity information. * * TODO: pull task activity management out into new TaskActivityManager + * NOTE: likely to change for 3.0 * * @author Mik Kersten * @author Rob Elves (task activity) @@ -824,10 +825,7 @@ public class TaskListManager implements IPropertyChangeListener { } public void activateTask(AbstractTask task) { - if (!TasksUiPlugin.getDefault().isMultipleActiveTasksMode()) { - deactivateAllTasks(); - } - + deactivateAllTasks(); try { taskList.setActive(task, true); for (ITaskActivityListener listener : new ArrayList<ITaskActivityListener>(activityListeners)) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java index 068209813..d780b901e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java @@ -92,17 +92,18 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** - * @author Mik Kersten + * Main entry point for the Tasks UI. * - * TODO: this class is in serious need of refactoring + * @author Mik Kersten + * @since 2.0 */ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { - private static final String FOLDER_OFFLINE = "offline"; - public static final String LABEL_VIEW_REPOSITORIES = "Task Repositories view"; - public static final String PLUGIN_ID = "org.eclipse.mylyn.tasklist"; + public static final String ID_PLUGIN = "org.eclipse.mylyn.tasks.ui"; + + private static final String FOLDER_OFFLINE = "offline"; private static final String DIRECTORY_METADATA = ".metadata"; @@ -122,7 +123,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { private static RepositorySynchronizationManager synchronizationManager; - private static Map<String, AbstractRepositoryConnectorUi> repositoryConnectorUis = new HashMap<String, AbstractRepositoryConnectorUi>(); + private static Map<String, AbstractRepositoryConnectorUi> repositoryConnectorUiMap = new HashMap<String, AbstractRepositoryConnectorUi>(); private TaskListSaveManager taskListSaveManager; @@ -143,8 +144,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { private ITaskHighlighter highlighter; - private static boolean shellActive = true; - private boolean initialized = false; private Map<String, Image> brandingIcons = new HashMap<String, Image>(); @@ -153,8 +152,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { private Set<AbstractDuplicateDetector> duplicateDetectors = new HashSet<AbstractDuplicateDetector>(); - private boolean eclipse_3_3_workbench = false; - private ISaveParticipant saveParticipant; private static final class OrderComparator implements Comparator<AbstractTaskRepositoryLinkProvider> { @@ -233,31 +230,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } }; - /** - * TODO: move into reminder mechanisms - */ - private IWindowListener WINDOW_LISTENER = new IWindowListener() { - /** - * bug 1002249: too slow to save state here - */ - public void windowDeactivated(IWorkbenchWindow window) { - shellActive = false; - } - - public void windowActivated(IWorkbenchWindow window) { - // getDefault().checkTaskListBackup(); - shellActive = true; - } - - public void windowOpened(IWorkbenchWindow window) { - // ignore - } - - public void windowClosed(IWorkbenchWindow window) { - // ignore - } - }; - private static ITaskListNotificationProvider REMINDER_NOTIFICATION_PROVIDER = new ITaskListNotificationProvider() { public Set<ITaskListNotification> getNotifications() { @@ -283,7 +255,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { for (TaskRepository repository : getRepositoryManager().getAllRepositories()) { AbstractRepositoryConnector connector = getRepositoryManager().getRepositoryConnector( repository.getConnectorKind()); - AbstractRepositoryConnectorUi connectorUi = getRepositoryUi(repository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = getConnectorUi(repository.getConnectorKind()); if (connectorUi != null && !connectorUi.isCustomNotificationHandling()) { for (AbstractTask repositoryTask : TasksUiPlugin.getTaskListManager() .getTaskList() @@ -300,7 +272,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } // New query hits for (AbstractRepositoryQuery query : TasksUiPlugin.getTaskListManager().getTaskList().getQueries()) { - AbstractRepositoryConnectorUi connectorUi = getRepositoryUi(query.getRepositoryKind()); + AbstractRepositoryConnectorUi connectorUi = getConnectorUi(query.getRepositoryKind()); if (!connectorUi.isCustomNotificationHandling()) { for (AbstractTask hit : query.getChildren()) { if (hit.isNotified() == false) { @@ -416,9 +388,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { // relies on images. TasksUiExtensionReader.initWorkbenchUiExtensions(); - // TasksUiExtensionReader.initWorkbenchUiExtensions(); - PlatformUI.getWorkbench().addWindowListener(WINDOW_LISTENER); - // Needs to happen asynchronously to avoid bug 159706 if (taskListManager.getTaskList().getActiveTask() != null) { taskListManager.activateTask(taskListManager.getTaskList().getActiveTask()); @@ -471,11 +440,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } } }); - - Bundle bundle = Platform.getBundle("org.eclipse.ui.workbench"); - if (bundle.getLocation().contains("_3.3.")) { - eclipse_3_3_workbench = true; - } } catch (Exception e) { e.printStackTrace(); StatusManager.fail(e, "Mylar Task List initialization failed", false); @@ -568,7 +532,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { ContextCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener( PREFERENCE_LISTENER); } - PlatformUI.getWorkbench().removeWindowListener(WINDOW_LISTENER); INSTANCE = null; } } catch (Exception e) { @@ -639,8 +602,8 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { return taskListManager; } - public TaskListNotificationManager getTaskListNotificationManager() { - return taskListNotificationManager; + public static TaskListNotificationManager getTaskListNotificationManager() { + return INSTANCE.taskListNotificationManager; } /** @@ -650,17 +613,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { return INSTANCE; } - // private void checkTaskListBackup() { - // Date currentTime = new Date(); - // if (currentTime.getTime() > lastBackup.getTime() + - // AUTOMATIC_BACKUP_SAVE_INTERVAL) {// - // TaskListSaveMode.fromStringToLong(getPrefs().getString(SAVE_TASKLIST_MODE))) - // // { - // TasksUiPlugin.getDefault().getTaskListSaveManager().createTaskListBackupFile(); - // lastBackup = new Date(); - // } - // } - private Map<String, List<IDynamicSubMenuContributor>> menuContributors = new HashMap<String, List<IDynamicSubMenuContributor>>(); public Map<String, List<IDynamicSubMenuContributor>> getDynamicMenuMap() { @@ -676,11 +628,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { contributors.add(contributor); } - // TODO: remove - public boolean isMultipleActiveTasksMode() { - return getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE); - } - public String[] getSaveOptions() { String[] options = { TaskListSaveMode.ONE_HOUR.toString(), TaskListSaveMode.THREE_HOURS.toString(), TaskListSaveMode.DAY.toString() }; @@ -708,10 +655,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { this.taskEditorFactories.add(contextEditor); } - public boolean isShellActive() { - return TasksUiPlugin.shellActive; - } - public static TaskRepositoryManager getRepositoryManager() { return taskRepositoryManager; } @@ -763,21 +706,23 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { taskDataManager.start(); } - public TaskDataManager getTaskDataManager() { - if (taskDataManager == null) { + public static TaskDataManager getTaskDataManager() { + if (INSTANCE == null || INSTANCE.taskDataManager == null) { StatusManager.fail(null, "Offline reports file not created, try restarting.", true); + return null; + } else { + return INSTANCE.taskDataManager; } - return taskDataManager; } - public static void addRepositoryConnectorUi(AbstractRepositoryConnectorUi repositoryConnectorUi) { - if (!repositoryConnectorUis.values().contains(repositoryConnectorUi)) { - repositoryConnectorUis.put(repositoryConnectorUi.getConnectorKind(), repositoryConnectorUi); + public void addRepositoryConnectorUi(AbstractRepositoryConnectorUi repositoryConnectorUi) { + if (!repositoryConnectorUiMap.values().contains(repositoryConnectorUi)) { + repositoryConnectorUiMap.put(repositoryConnectorUi.getConnectorKind(), repositoryConnectorUi); } } - public static AbstractRepositoryConnectorUi getRepositoryUi(String kind) { - return repositoryConnectorUis.get(kind); + public static AbstractRepositoryConnectorUi getConnectorUi(String kind) { + return repositoryConnectorUiMap.get(kind); } public static TaskListSynchronizationScheduler getSynchronizationScheduler() { @@ -873,15 +818,11 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { return null; } - public boolean isEclipse_3_3_workbench() { - return eclipse_3_3_workbench; - } - /** * Public for testing. */ - public TaskListSaveManager getTaskListSaveManager() { - return taskListSaveManager; + public static TaskListSaveManager getTaskListSaveManager() { + return INSTANCE.taskListSaveManager; } public String getNextNewRepositoryTaskId() { @@ -960,13 +901,6 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { descriptionText += "Attributes changed"; } } -// else { -// String description = taskData.getDescription(); -// if (description != null) { -// notification.setDescription(description); -// } -// } - return descriptionText; } 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 deff241c3..bc64f0dec 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 @@ -149,7 +149,7 @@ public class TasksUiUtil { TasksUiUtil.refreshAndOpenTaskListElement(task); opened = true; } else { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repository.getConnectorKind()); if (connectorUi != null) { try { opened = connectorUi.openRepositoryTask(repository.getUrl(), taskId); @@ -182,7 +182,7 @@ public class TasksUiUtil { AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager() .getConnectorForRepositoryTaskUrl(fullUrl); if (connector != null) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()); if (repositoryUrl != null && taskId != null) { opened = connectorUi.openRepositoryTask(repositoryUrl, taskId); } else { @@ -255,7 +255,7 @@ public class TasksUiUtil { TasksUiUtil.openEditor((TaskCategory) element); } else if (element instanceof AbstractRepositoryQuery) { AbstractRepositoryQuery query = (AbstractRepositoryQuery) element; - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(query.getRepositoryKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(query.getRepositoryKind()); connectorUi.openEditQueryDialog(query); } } @@ -268,7 +268,7 @@ public class TasksUiUtil { String taskEditorId = TaskEditor.ID_EDITOR; if (task instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) task; - AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryUi(repositoryTask.getConnectorKind()); + AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getConnectorUi(repositoryTask.getConnectorKind()); String customTaskEditorId = repositoryUi.getTaskEditorId(repositoryTask); if (customTaskEditorId != null) { taskEditorId = customTaskEditorId; 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 index 99e0702e2..2c74884f6 100644 --- 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 @@ -14,13 +14,16 @@ 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 */ public class WebHyperlink implements IHyperlink { private final IRegion region; - private String url; + private final String url; public WebHyperlink(IRegion region, String url) { this.region = region; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java index 62c8d6238..d0f659e90 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java @@ -29,6 +29,8 @@ import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskOutlineNode; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskCategory; @@ -67,6 +69,7 @@ import org.eclipse.ui.themes.IThemeManager; * server. * * @author Rob Elves (modifications) + * @since 2.0 */ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepositoryTaskEditor { @@ -456,8 +459,8 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository } @Override - public AbstractTask handleNewBugPost(String id, IProgressMonitor monitor) throws CoreException { - final AbstractTask newTask = super.handleNewBugPost(id, monitor); + public AbstractTask updateSubmittedTask(String id, IProgressMonitor monitor) throws CoreException { + final AbstractTask newTask = super.updateSubmittedTask(id, monitor); if (newTask != null) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { 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 9fc682c0c..44573cab9 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 @@ -74,11 +74,16 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.DownloadAttachmentJob; import org.eclipse.mylyn.internal.tasks.ui.actions.SynchronizeEditorAction; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction; +import org.eclipse.mylyn.internal.tasks.ui.editors.AttachmentTableLabelProvider; +import org.eclipse.mylyn.internal.tasks.ui.editors.AttachmentsTableContentProvider; import org.eclipse.mylyn.internal.tasks.ui.editors.ContentOutlineTools; import org.eclipse.mylyn.internal.tasks.ui.editors.IRepositoryTaskAttributeListener; import org.eclipse.mylyn.internal.tasks.ui.editors.IRepositoryTaskSelection; import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryAttachmentEditorInput; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskOutlineNode; import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskOutlinePage; +import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskSelection; +import org.eclipse.mylyn.internal.tasks.ui.editors.TaskFormPage; import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -161,10 +166,15 @@ import org.eclipse.ui.views.contentoutline.ContentOutline; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; /** + * Extend to provide customized task editing. + * + * NOTE: likely to change for 3.0 + * * @author Mik Kersten * @author Rob Elves * @author Jeff Pound (Attachment work) * @author Steffen Pingel + * @since 2.0 */ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { @@ -1917,7 +1927,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { } } - protected String formatDate(String dateString) { + public String formatDate(String dateString) { return dateString; } @@ -2697,11 +2707,11 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { final boolean isNew = taskData.isNew(); if (isNew) { if (taskId != null) { - modifiedTask = handleNewBugPost(taskId, new SubProgressMonitor(monitor, 1)); + modifiedTask = updateSubmittedTask(taskId, new SubProgressMonitor(monitor, 1)); } else { // null taskId, assume task could not be created... throw new CoreException( - new RepositoryStatus(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, + new RepositoryStatus(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_INTERNAL, "Task could not be created. No additional information was provided by the connector.")); } @@ -2910,7 +2920,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { return Status.OK_STATUS; } - protected AbstractTask handleNewBugPost(String postResult, IProgressMonitor monitor) throws CoreException { + protected AbstractTask updateSubmittedTask(String postResult, IProgressMonitor monitor) throws CoreException { final AbstractTask newTask = connector.createTaskFromExistingId(repository, postResult, monitor); if (newTask != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java index 3755fa296..bdb1b3db8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java @@ -23,7 +23,12 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; /** + * Input for task editors. + * + * NOTE: likely to change for 3.0 + * * @author Rob Elves (modifications) + * @since 2.0 */ public abstract class AbstractRepositoryTaskEditorInput implements IEditorInput { 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 index dceecf660..3282bf4bd 100644 --- 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 @@ -16,7 +16,10 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; /** + * Extend to add tabs to task editors. + * * @author Mik Kersten + * @since 2.0 */ public abstract class AbstractTaskEditorFactory { @@ -38,7 +41,7 @@ public abstract class AbstractTaskEditorFactory { * @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 getPriority() { + public int getTabOrderPriority() { return 1; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java index be234d6cd..846a42499 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/NewTaskEditorInput.java @@ -15,7 +15,10 @@ import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.TaskRepository; /** + * Provides input to editors with unsubmitted tasks (i.e., those that do not yet exist on the repository). + * * @author Rob Elves + * @since 2.0 */ public class NewTaskEditorInput extends RepositoryTaskEditorInput { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java index 34c75d804..e59a1857b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorDropListener.java @@ -23,12 +23,12 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.widgets.Control; /** + * Not API. + * * @author Mik Kersten */ class RepositoryTaskEditorDropListener implements DropTargetListener { - /** - * - */ + private final AbstractRepositoryTaskEditor AbstractTaskEditor; private final FileTransfer fileTransfer; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java index 80f53ba3e..276f315c9 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/RepositoryTaskEditorInput.java @@ -15,8 +15,11 @@ import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; /** + * Input to editors for existing tasks (i.e., those that exist present in the repository). + * * @author Mik Kersten * @author Rob Elves + * @since 2.0 */ public class RepositoryTaskEditorInput extends AbstractRepositoryTaskEditorInput { 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 9003517d1..f1e49d006 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 @@ -27,6 +27,8 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; +import org.eclipse.mylyn.internal.tasks.ui.editors.EditorBusyIndicator; +import org.eclipse.mylyn.internal.tasks.ui.editors.IBusyEditor; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorActionContributor; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskPlanningEditor; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -265,7 +267,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi Collections.sort(factories, new Comparator<AbstractTaskEditorFactory>() { public int compare(AbstractTaskEditorFactory o1, AbstractTaskEditorFactory o2) { - return o1.getPriority() - o2.getPriority(); + return o1.getTabOrderPriority() - o2.getTabOrderPriority(); } }); for (AbstractTaskEditorFactory factory : TasksUiPlugin.getDefault().getTaskEditorFactories()) { @@ -440,7 +442,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi private void setFormHeaderLabel(RepositoryTaskData taskData) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(taskData.getRepositoryKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(taskData.getRepositoryKind()); String kindLabel = taskData.getTaskKind(); @@ -470,7 +472,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi private void setFormHeaderLabel(AbstractTask repositoryTask) { - AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repositoryTask.getConnectorKind()); + AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getConnectorUi(repositoryTask.getConnectorKind()); String kindLabel = ""; if (connectorUi != null) { kindLabel = connectorUi.getTaskKindLabel(repositoryTask); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java index 5400405b8..b2fdfbc0f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditorInput.java @@ -21,9 +21,14 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.IPersistableElement; /** + * Input for task editors that can have nested pages. + * + * NOTE: likely to change for 3.0 + * * @author Eric Booth * @author Rob Elves * @author Mik Kersten + * @since 1.0 */ public class TaskEditorInput implements IEditorInput, IPersistableElement { 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 b89bfde3f..e136b7e47 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 @@ -35,7 +35,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; /** + * Extend to provide repository-specific query page to the Workbench search dialog. + * * @author Rob Elves + * @since 2.0 */ public abstract class AbstractRepositoryQueryPage extends WizardPage implements ISearchPage { @@ -113,7 +116,7 @@ public abstract class AbstractRepositoryQueryPage extends WizardPage implements public abstract AbstractRepositoryQuery getQuery(); - public void saveWidgetValues() { + public void saveState() { // empty } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java index b1a1e4ee4..73af45747 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/RepositorySearchResult.java @@ -19,10 +19,11 @@ import org.eclipse.search.ui.text.IEditorMatchAdapter; import org.eclipse.search.ui.text.IFileMatchAdapter; /** - * The collection of all the matches. + * Captures the results of a task repository search. * - * @author Rob Elves (moved into task.ui) + * @author Rob Elves * @see org.eclipse.search.ui.text.AbstractTextSearchResult + * @since 2.0 */ public class RepositorySearchResult extends AbstractTextSearchResult { @@ -45,14 +46,6 @@ public class RepositorySearchResult extends AbstractTextSearchResult { @Override public IEditorMatchAdapter getEditorMatchAdapter() { - // IBugzillaResultEditorMatchAdapter adapter = - // BugzillaUiPlugin.getResultEditorMatchAdapter(); - // if (adapter == null) { - // return null; - // } else { - // adapter.setResult(this); - // return adapter; - // } return null; } @@ -68,11 +61,6 @@ public class RepositorySearchResult extends AbstractTextSearchResult { return null; } - /* - * (non-Javadoc) - * - * @see org.eclipse.search.ui.ISearchResult#getLabel() - */ public String getLabel() { return getMatchCount() == 1 ? getSingularLabel() : getPluralLabel(); } @@ -95,29 +83,14 @@ public class RepositorySearchResult extends AbstractTextSearchResult { return "Task search - " + getMatchCount() + " matches"; } - /* - * (non-Javadoc) - * - * @see org.eclipse.search.ui.ISearchResult#getTooltip() - */ public String getTooltip() { return getLabel(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor() - */ public ImageDescriptor getImageDescriptor() { return SearchPluginImages.DESC_OBJ_TSEARCH_DPDN; } - /* - * (non-Javadoc) - * - * @see org.eclipse.search.ui.ISearchResult#getQuery() - */ public ISearchQuery getQuery() { return repositoryQuery; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java index e36fb52da..60b557b4e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java @@ -40,15 +40,14 @@ import org.eclipse.ui.PlatformUI; /** * Used for returning results from Eclipse Search view. Collects results of a - * repository search + * repository search. * * @author Rob Elves + * @since 2.0 */ public class SearchHitCollector implements ISearchQuery, ITaskCollector { - public static final int MAX_HITS = 5000; - - public static final String MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope."; + private static final String LABEL_MAX_HITS_REACHED = "Max allowed number of hits returned exceeded. Some hits may not be displayed. Please narrow query scope."; protected Set<AbstractTask> taskResults = new HashSet<AbstractTask>(); @@ -165,7 +164,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { public ISearchResult getSearchResult() { if (searchResult.getMatchCount() >= QueryHitCollector.MAX_HITS) { StatusManager.displayStatus("Maximum hits reached", RepositoryStatus.createStatus(repository.getUrl(), - IStatus.WARNING, TasksUiPlugin.PLUGIN_ID, MAX_HITS_REACHED)); + IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, LABEL_MAX_HITS_REACHED)); } return searchResult; } @@ -189,7 +188,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { StatusManager.displayStatus("Search failed", status); } } else { - return new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.OK, + return new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, IStatus.OK, "repository connector could not be found", null); } 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 a9635dfff..8c4bda146 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 @@ -20,7 +20,11 @@ import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.search.AbstractRepositoryQueryPage; /** + * Extend to provide a custom edit query dialog, typically invoked by the user requesting + * properties on a query node in the Task List. + * * @author Mik Kersten + * @since 1.0 */ public abstract class AbstractEditQueryWizard extends Wizard { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java index f46be190f..80ba45075 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java @@ -64,6 +64,9 @@ import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.internal.net.ProxyPreferencePage; /** + * Extend to provide custom repository settings. This page is typically invoked by the user + * requesting properties via the Task Repositories view. + * * @author Mik Kersten * @author Rob Elves * @author Steffen Pingel @@ -590,7 +593,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { // repository = createTaskRepository(); // } if (repository != null) { - String accountCreationUrl = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()) + String accountCreationUrl = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()) .getAccountCreationUrl(repository); if (accountCreationUrl != null) { TasksUiUtil.openUrl(accountCreationUrl, false); @@ -609,7 +612,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { repository = createTaskRepository(); } if (repository != null) { - String accountManagementUrl = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()) + String accountManagementUrl = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()) .getAccountManagementUrl(repository); if (accountManagementUrl != null) { TasksUiUtil.openUrl(accountManagementUrl, false); @@ -887,12 +890,12 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { void updateHyperlinks() { if (getServerUrl() != null && getServerUrl().length() > 0) { TaskRepository repository = createTaskRepository(); - String accountCreationUrl = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()) + String accountCreationUrl = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()) .getAccountCreationUrl(repository); createAccountHyperlink.setEnabled(accountCreationUrl != null); createAccountHyperlink.setVisible(accountCreationUrl != null); - String accountManagementUrl = TasksUiPlugin.getRepositoryUi(connector.getConnectorKind()) + String accountManagementUrl = TasksUiPlugin.getConnectorUi(connector.getConnectorKind()) .getAccountManagementUrl(repository); manageAccountHyperlink.setEnabled(accountManagementUrl != null); manageAccountHyperlink.setVisible(accountManagementUrl != null); @@ -960,7 +963,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { } } - public String getProxyUsername() { + public String getProxyUserName() { if (needsProxy()) { return proxyUserNameEditor.getStringValue(); } else { @@ -1124,8 +1127,8 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { repository.setProperty(TaskRepository.PROXY_HOSTNAME, getProxyHostname()); repository.setProperty(TaskRepository.PROXY_PORT, getProxyPort()); - if (getProxyUsername().length() > 0 && getProxyPassword().length() > 0) { - repository.setProxyAuthenticationCredentials(getProxyUsername(), getProxyPassword()); + if (getProxyUserName().length() > 0 && getProxyPassword().length() > 0) { + repository.setProxyAuthenticationCredentials(getProxyUserName(), getProxyPassword()); } // repository.setProperty(TaskRepository.PROXY_USERNAME, // getProxyUsername()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java index 46291a0f3..df95d8646 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/NewTaskWizard.java @@ -34,7 +34,10 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; /** + * Extend for customizing how new tasks editors are created. + * * @author Steffen Pingel + * @since 2.0 */ public class NewTaskWizard extends Wizard implements INewWizard { @@ -64,7 +67,7 @@ public class NewTaskWizard extends Wizard implements INewWizard { final AbstractTaskDataHandler taskDataHandler = (AbstractTaskDataHandler) connector.getTaskDataHandler(); if (taskDataHandler == null) { StatusManager.displayStatus("Error creating new task", new RepositoryStatus(IStatus.ERROR, - TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_REPOSITORY, "The selected repository does not support creating new tasks.")); + TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_REPOSITORY, "The selected repository does not support creating new tasks.")); return false; } @@ -80,7 +83,7 @@ public class NewTaskWizard extends Wizard implements INewWizard { try { if (!taskDataHandler.initializeTaskData(taskRepository, taskData, monitor)) { throw new CoreException(new RepositoryStatus(IStatus.ERROR, - TasksUiPlugin.PLUGIN_ID, RepositoryStatus.ERROR_REPOSITORY, "The selected repository does not support creating new tasks.")); } + TasksUiPlugin.ID_PLUGIN, RepositoryStatus.ERROR_REPOSITORY, "The selected repository does not support creating new tasks.")); } } catch (CoreException e) { throw new InvocationTargetException(e); } 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 9c5c05aab..4543da4d1 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 @@ -26,6 +26,7 @@ import org.eclipse.ui.IWorkbench; * @author Eugene Kuleshov * @author Mik Kersten * @author Steffen Pingel + * @since 2.0 */ public class NewWebTaskWizard extends Wizard implements INewWizard { diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java index ad2c875ae..f614cfe35 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositorySettingsPageTest.java @@ -41,7 +41,7 @@ public class TracRepositorySettingsPageTest extends AbstractTracClientTest { protected void setUp() throws Exception { super.setUp(); - connector = (TracConnectorUi) TasksUiPlugin.getRepositoryUi(TracCorePlugin.REPOSITORY_KIND); + connector = (TracConnectorUi) TasksUiPlugin.getConnectorUi(TracCorePlugin.REPOSITORY_KIND); page = new TracRepositorySettingsPage(connector); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java index 3c5477eb5..b8659f791 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java @@ -487,7 +487,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage { @Override public boolean performAction() { if (inSearchContainer()) { - saveWidgetValues(); + saveState(); } return super.performAction(); @@ -515,7 +515,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage { return true; } - public void saveWidgetValues() { + public void saveState() { String repoId = "." + repository.getUrl(); IDialogSettings settings = getDialogSettings(); settings.put(SEARCH_URL_ID + repoId, getTracSearch().toUrl()); |