diff options
| author | mkersten | 2007-06-15 22:04:59 +0000 |
|---|---|---|
| committer | mkersten | 2007-06-15 22:04:59 +0000 |
| commit | 48b245f04e3ed60817b444f519a0bffee1dc5ad3 (patch) | |
| tree | 4e2e88a2687698f85d1b357bd13679e121cfd956 | |
| parent | b3c452a26034ddb2ddd2a9ff61f3c02c6f826c93 (diff) | |
| download | org.eclipse.mylyn.tasks-48b245f04e3ed60817b444f519a0bffee1dc5ad3.tar.gz org.eclipse.mylyn.tasks-48b245f04e3ed60817b444f519a0bffee1dc5ad3.tar.xz org.eclipse.mylyn.tasks-48b245f04e3ed60817b444f519a0bffee1dc5ad3.zip | |
NEW - bug 191780: [api] Refactor MylarStatusHandler and IStatusHandler
https://bugs.eclipse.org/bugs/show_bug.cgi?id=191780
92 files changed, 320 insertions, 321 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF index 5542af1db..f91b4d297 100644 --- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 2.0.0.v20070615-0900 Bundle-Activator: org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.mylyn.tasks.core, - org.eclipse.mylyn, - org.eclipse.mylyn.web.core + org.eclipse.mylyn.web.core, + org.eclipse.mylyn.monitor.core Eclipse-AutoStart: true Bundle-Vendor: Eclipse.org Bundle-ClassPath: . diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index b4aab562e..bc6b44d55 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -49,12 +49,12 @@ import org.apache.commons.httpclient.params.HttpMethodParams; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.history.BugzillaTaskHistoryParser; import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; -import org.eclipse.mylyn.tasks.core.ITaskCollector; import org.eclipse.mylyn.tasks.core.ITaskAttachment; +import org.eclipse.mylyn.tasks.core.ITaskCollector; import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryOperation; import org.eclipse.mylyn.tasks.core.RepositoryStatus; @@ -688,7 +688,7 @@ public class BugzillaClient { return postMethod; } else { postMethod.releaseConnection(); - MylarStatusHandler.log("Post failed: " + HttpStatus.getStatusText(status), this); + StatusManager.log("Post failed: " + HttpStatus.getStatusText(status), this); throw new IOException("Communication error occurred during upload. \n\n" + HttpStatus.getStatusText(status)); } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java index c2ffdc646..6b976a481 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaCorePlugin.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -340,7 +340,7 @@ public class BugzillaCorePlugin extends Plugin { } } catch (Exception e) { - MylarStatusHandler.fail(e, "could not set platform options", false); + StatusManager.fail(e, "could not set platform options", false); } } } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index f3be5249b..e99928ad1 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -28,7 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -281,7 +281,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { return true; } catch (UnsupportedEncodingException e) { // XXX throw CoreException instead? - MylarStatusHandler.fail(e, "Repository configured with unsupported encoding: " + StatusManager.fail(e, "Repository configured with unsupported encoding: " + repository.getCharacterEncoding() + "\n\n Unable to determine changed tasks.", true); return false; } finally { @@ -399,7 +399,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { try { return BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, taskId); } catch (Exception ex) { - MylarStatusHandler.fail(ex, "Error constructing task url for " + repositoryUrl + " id:" + taskId, false); + StatusManager.fail(ex, "Error constructing task url for " + repositoryUrl + " id:" + taskId, false); } return null; } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java index 5fb080fde..3d152d1a0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java @@ -18,10 +18,10 @@ import java.util.Set; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_RESOLUTION; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory; import org.eclipse.mylyn.tasks.core.ITaskDataHandler; import org.eclipse.mylyn.tasks.core.RepositoryOperation; @@ -144,7 +144,7 @@ public class BugzillaTaskDataHandler implements ITaskDataHandler { try { status = BUGZILLA_REPORT_STATUS.valueOf(bugReport.getStatus()); } catch (RuntimeException e) { - MylarStatusHandler.log(e, "Unrecognized status: " + bugReport.getStatus()); + StatusManager.log(e, "Unrecognized status: " + bugReport.getStatus()); status = BUGZILLA_REPORT_STATUS.NEW; } switch (status) { diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java index 0c7b1fbd0..38d76387d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxBugzillaQueryContentHandler.java @@ -16,7 +16,6 @@ import java.util.Set; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskCollector; -import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.web.core.HtmlStreamTokenizer; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF index 6bf4d6fdc..93f708d12 100644 --- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.mylyn.context.core, org.eclipse.mylyn.tasks.ui, org.eclipse.mylyn.tasks.core, - org.eclipse.mylyn + org.eclipse.mylyn.monitor.core Eclipse-AutoStart: true Export-Package: org.eclipse.mylyn.internal.bugzilla.ui, org.eclipse.mylyn.internal.bugzilla.ui.editor, diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java index f77861d33..cfafc88b8 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaUiPlugin.java @@ -20,11 +20,11 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.core.RepositoryConfiguration; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -222,7 +222,7 @@ public class BugzillaUiPlugin extends AbstractUIPlugin { try { config = BugzillaCorePlugin.getRepositoryConfiguration(repository, false); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not retrieve repository configuration for: " + repository, true); + StatusManager.fail(e, "Could not retrieve repository configuration for: " + repository, true); return; } 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 0b173e9b8..f6ea26cda 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 @@ -22,11 +22,11 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION; +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.tasks.core.AbstractTask; @@ -357,7 +357,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor { try { operation = BUGZILLA_OPERATION.valueOf(repositoryOperation.getKnobName()); } catch (RuntimeException e) { - MylarStatusHandler.log(e, "Unrecognized operatoin: " + repositoryOperation.getKnobName()); + StatusManager.log(e, "Unrecognized operatoin: " + repositoryOperation.getKnobName()); operation = null; } 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 feb63711f..9ca3fd100 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 @@ -23,11 +23,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; @@ -1198,7 +1198,7 @@ public class BugzillaSearchPage extends AbstractRepositoryQueryPage implements L connector.updateAttributes(repository, monitor); BugzillaUiPlugin.updateQueryOptions(repository, monitor); } catch (final CoreException ce) { - MylarStatusHandler.displayStatus("Update failed", ce.getStatus()); + StatusManager.displayStatus("Update failed", ce.getStatus()); } finally { monitor.done(); } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java index 44a638f55..7f06fe29c 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java @@ -21,7 +21,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClientFactory; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; @@ -29,6 +28,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaStatus; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.core.RepositoryConfiguration; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BugzillaServerVersion; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.RepositoryTemplate; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -156,7 +156,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa } } if (i == -1) { - MylarStatusHandler.log("Could not resolve repository version: " + version, this); + StatusManager.log("Could not resolve repository version: " + version, this); setVersion(IBugzillaConstants.BugzillaServerVersion.SERVER_218.toString()); } } @@ -357,7 +357,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa status = new BugzillaStatus(Status.WARNING, BugzillaCorePlugin.PLUGIN_ID, RepositoryStatus.ERROR_NETWORK, serverUrl, e.getMessage()); } - MylarStatusHandler.displayStatus("Validation failed", status); + StatusManager.displayStatus("Validation failed", status); setStatus(status); } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java index c14551dc3..9d8462997 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/NewBugzillaQueryWizard.java @@ -14,9 +14,9 @@ package org.eclipse.mylyn.internal.bugzilla.ui.tasklist; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -82,7 +82,7 @@ public class NewBugzillaQueryWizard extends Wizard { try { getContainer().run(true, false, op); } catch (Exception e) { - MylarStatusHandler.log(e, "There was a problem executing the query refresh"); + StatusManager.log(e, "There was a problem executing the query refresh"); } // } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java index a8d0f192d..51ee8309d 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/BugzillaProductPage.java @@ -38,7 +38,6 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector; @@ -46,6 +45,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.internal.bugzilla.ui.BugzillaUiPlugin; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; @@ -222,16 +222,16 @@ public class BugzillaProductPage extends WizardPage { connector.updateAttributes(repository, monitor); } catch (CoreException ce) { if (ce.getStatus().getException() instanceof GeneralSecurityException) { - MylarStatusHandler.fail(ce, + StatusManager.fail(ce, "Bugzilla could not log you in to get the information you requested since login name or password is incorrect.\n" + "Please ensure proper configuration in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ". ", true); } else if (ce.getStatus().getException() instanceof IOException) { - MylarStatusHandler.fail(ce, + StatusManager.fail(ce, "Connection Error, please ensure proper configuration in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", true); } else { - MylarStatusHandler.fail(ce, "Error updating repository attributes for " + StatusManager.fail(ce, "Error updating repository attributes for " + repository.getUrl(), true); } return; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesWriter.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesWriter.java index 2d0ca6eac..0041b4e69 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesWriter.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/SaxRepositoriesWriter.java @@ -22,7 +22,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.monitor.core.util.XmlStringConverter; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.xml.sax.ContentHandler; @@ -61,7 +61,7 @@ public class SaxRepositoriesWriter { new SAXSource(new RepositoriesWriter(), new TaskRepositoriesInputSource(repositories)), new StreamResult(outputStream)); } catch (TransformerException e) { - MylarStatusHandler.fail(e, "could not write repositories", false); + StatusManager.fail(e, "could not write repositories", false); throw new IOException(e.getMessage()); } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java index 2dc480340..4724695f8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskDataManager.java @@ -31,7 +31,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; @@ -76,7 +76,7 @@ public class TaskDataManager { try { readOfflineData(); } catch (Throwable e) { - MylarStatusHandler.fail(e, "Error loading offline task data", false); + StatusManager.fail(e, "Error loading offline task data", false); if (restoreFromBackup()) { try { readOfflineData(); @@ -112,7 +112,7 @@ public class TaskDataManager { if (backupFile.exists()) { if (primaryFile.exists()) { if (!primaryFile.delete()) { - MylarStatusHandler.log("Unable to retire primary offline data", this); + StatusManager.log("Unable to retire primary offline data", this); } } this.primaryFile = primaryPath.toFile(); @@ -121,7 +121,7 @@ public class TaskDataManager { this.backupFile = backupPath.toFile(); return true; } else { - MylarStatusHandler.log("Unable to restore from offline backup", this); + StatusManager.log("Unable to restore from offline backup", this); } } return false; @@ -202,7 +202,7 @@ public class TaskDataManager { clone = (RepositoryTaskData) ObjectCloner.deepCopy(data); updateAttributeFactory(clone); } catch (Exception e) { - MylarStatusHandler.fail(e, "Error constructing modifiable task", false); + StatusManager.fail(e, "Error constructing modifiable task", false); return null; } for (RepositoryTaskAttribute attribute : getLocalChanges(handle)) { @@ -328,14 +328,14 @@ public class TaskDataManager { try { in.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close stream", false); + StatusManager.fail(e, "Could not close stream", false); } } if (fileInputStream != null) { try { fileInputStream.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close stream", false); + StatusManager.fail(e, "Could not close stream", false); } } } @@ -381,13 +381,13 @@ public class TaskDataManager { try { if (backupFile.exists()) { if (!backupFile.delete()) { - MylarStatusHandler.log("Unable to retire old offline backup.", this); + StatusManager.log("Unable to retire old offline backup.", this); return; } } if (primaryFile.exists() && !primaryFile.renameTo(backupFile)) { - MylarStatusHandler.log("Unable to backup offline data.", this); + StatusManager.log("Unable to backup offline data.", this); return; } @@ -395,21 +395,21 @@ public class TaskDataManager { out = new ObjectOutputStream(fileOuputStream); out.writeObject(dataStore); } catch (Exception e) { - MylarStatusHandler.fail(e, "Error occurred during save of offline task data.", false); + StatusManager.fail(e, "Error occurred during save of offline task data.", false); restoreFromBackup(); } finally { if (out != null) { try { out.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close stream", false); + StatusManager.fail(e, "Could not close stream", false); } } if (fileOuputStream != null) { try { fileOuputStream.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close stream", false); + StatusManager.fail(e, "Could not close stream", false); } } } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoriesExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoriesExternalizer.java index aeefc9875..9b734dabd 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoriesExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskRepositoriesExternalizer.java @@ -22,7 +22,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; import org.xml.sax.InputSource; @@ -63,13 +63,13 @@ public class TaskRepositoriesExternalizer { outputStream.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not write: " + file.getAbsolutePath(), true); + StatusManager.fail(e, "Could not write: " + file.getAbsolutePath(), true); } finally { if (outputStream != null) { try { outputStream.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Unable to terminate output stream to repositories file.", false); + StatusManager.fail(e, "Unable to terminate output stream to repositories file.", false); } } } @@ -90,14 +90,14 @@ public class TaskRepositoriesExternalizer { return contentHandler.getRepositories(); } catch (Throwable e) { file.renameTo(new File(file.getAbsolutePath() + "-save")); - MylarStatusHandler.log(e, "Error while reading context file"); + StatusManager.log(e, "Error while reading context file"); return null; } finally { if (inputStream != null) { try { inputStream.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Failed to close repositories input stream.", false); + StatusManager.fail(e, "Failed to close repositories input stream.", false); } } } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractAttachmentHandler.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractAttachmentHandler.java index 219157e68..01cd315da 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractAttachmentHandler.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractAttachmentHandler.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; /** * @author Steffen Pingel @@ -53,7 +53,7 @@ public abstract class AbstractAttachmentHandler implements IAttachmentHandler { try { in.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Error closing attachment stream", false); + StatusManager.fail(e, "Error closing attachment stream", false); } } } finally { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java index fad1df265..428a819d9 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; @@ -339,7 +339,7 @@ public abstract class AbstractRepositoryConnector { try { out.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close context file", false); + StatusManager.fail(e, "Could not close context file", false); } } } catch (FileNotFoundException e) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java index 6dfaf4cea..33f0ade10 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; /** * @author Rob Elves @@ -48,12 +48,12 @@ public class AttributeContainer implements Serializable { public void addAttribute(String key, RepositoryTaskAttribute attribute) { if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return; } String mapped = attributeFactory.mapCommonAttributeKey(key); if(mapped == null) { - MylarStatusHandler.log("Mylar Error: mapped value for "+key+" returned null.", this); + StatusManager.log("Mylar Error: mapped value for "+key+" returned null.", this); return; } if (!attributes.containsKey(mapped)) { attributeKeys.add(mapped); @@ -63,7 +63,7 @@ public class AttributeContainer implements Serializable { public RepositoryTaskAttribute getAttribute(String key) { if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return null; } String mapped = attributeFactory.mapCommonAttributeKey(key); @@ -93,7 +93,7 @@ public class AttributeContainer implements Serializable { public void addAttributeValue(String key, String value) { if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return; } RepositoryTaskAttribute attrib = getAttribute(key); @@ -112,7 +112,7 @@ public class AttributeContainer implements Serializable { */ public void setAttributeValue(String key, String value) { if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return; } RepositoryTaskAttribute attrib = getAttribute(key); @@ -125,7 +125,7 @@ public class AttributeContainer implements Serializable { public String getAttributeValue(String key) { if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return ""; } String returnValue = ""; @@ -139,7 +139,7 @@ public class AttributeContainer implements Serializable { public List<String> getAttributeValues(String key) { List<String> returnValue = new ArrayList<String>(); if (attributeFactory == null) { - MylarStatusHandler.log(ERROR_NO_ATTRIBUTE_FACTORY, this); + StatusManager.log(ERROR_NO_ATTRIBUTE_FACTORY, this); return returnValue; } RepositoryTaskAttribute attrib = getAttribute(key); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java index a2995d956..23e2428a4 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; @@ -582,7 +582,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { try { date = format.parse(dateString); } catch (ParseException e) { - MylarStatusHandler.fail(e, "Could not parse end date", false); + StatusManager.fail(e, "Could not parse end date", false); } return date; } @@ -619,7 +619,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { // if (element == null) createQueryHitElement(hit, doc, node); } catch (Exception e) { - MylarStatusHandler.log(e, e.getMessage()); + StatusManager.log(e, e.getMessage()); } } parent.appendChild(node); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java index c47ef489b..96601968a 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; @@ -620,7 +620,7 @@ public class TaskList { delta.add(new TaskContainerDelta(task, kind)); listener.containersChanged(delta); } catch (Throwable t) { - MylarStatusHandler.fail(t, "Notification failed for: " + listener, false); + StatusManager.fail(t, "Notification failed for: " + listener, false); } } } @@ -638,7 +638,7 @@ public class TaskList { try { listener.containersChanged(delta); } catch (Throwable t) { - MylarStatusHandler.fail(t, "notification failed for: " + listener, false); + StatusManager.fail(t, "notification failed for: " + listener, false); } } } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java index 7d81e8de3..d31b6723e 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java @@ -22,7 +22,7 @@ import java.util.TimeZone; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.web.core.WebClientUtil; /** @@ -235,7 +235,7 @@ public class TaskRepository { } isCachedUserName = false; } catch (CoreException e) { - MylarStatusHandler.fail(e, "could not flush authorization credentials", true); + StatusManager.fail(e, "could not flush authorization credentials", true); } } } @@ -255,7 +255,7 @@ public class TaskRepository { headlessCreds.putAll(map); } } catch (CoreException e) { - MylarStatusHandler.fail(e, "Could not set authorization credentials", true); + StatusManager.fail(e, "Could not set authorization credentials", true); } } } @@ -269,7 +269,7 @@ public class TaskRepository { } catch (MalformedURLException ex) { return Platform.getAuthorizationInfo(DEFAULT_URL, getUrl(), AUTH_SCHEME); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not retrieve authentication credentials", false); + StatusManager.fail(e, "Could not retrieve authentication credentials", false); } } else { Map<String, String> headlessCreds = credentials.get(getUrl()); diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java index d2c5f4a10..3c4b7bebe 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Set; import org.eclipse.core.runtime.Platform; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.TaskRepositoriesExternalizer; /** @@ -236,7 +236,7 @@ public class TaskRepositoryManager { try { listener.repositoriesRead(); } catch (Throwable t) { - MylarStatusHandler.fail(t, "repository listener failed", false); + StatusManager.fail(t, "repository listener failed", false); } } return repositoryMap; @@ -278,7 +278,7 @@ public class TaskRepositoryManager { } } } catch (Throwable t) { - MylarStatusHandler.fail(t, "could not load repositories", false); + StatusManager.fail(t, "could not load repositories", false); } } @@ -366,7 +366,7 @@ public class TaskRepositoryManager { File repositoriesFile = new File(destinationPath); externalizer.writeRepositoriesToXML(repositoriesToWrite, repositoriesFile); } catch (Throwable t) { - MylarStatusHandler.fail(t, "could not save repositories", false); + StatusManager.fail(t, "could not save repositories", false); return false; } return true; diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java index b26ff3c19..51b52c0a2 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AttachmentJobTest.java @@ -14,7 +14,7 @@ import java.io.RandomAccessFile; import junit.framework.TestCase; import org.eclipse.core.runtime.Status; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.actions.CopyAttachmentToClipboardJob; import org.eclipse.mylyn.internal.tasks.ui.actions.DownloadAttachmentJob; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; @@ -64,7 +64,7 @@ public class AttachmentJobTest extends TestCase { manager.addRepositoryConnector(connector); statusHandler = new MockStatusHandler(); - MylarStatusHandler.addStatusHandler(statusHandler); + StatusManager.addStatusHandler(statusHandler); attachment = new RepositoryAttachment(null); attachment.setRepositoryKind(repository.getKind()); @@ -74,7 +74,7 @@ public class AttachmentJobTest extends TestCase { @Override protected void tearDown() throws Exception { if (statusHandler != null) { - MylarStatusHandler.removeStatusHandler(statusHandler); + StatusManager.removeStatusHandler(statusHandler); } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java index f5d7feb87..c40aea4ef 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore; @@ -168,7 +168,7 @@ class TaskListDataMigration implements IRunnableWithProgress { return false; if (newTasklistFile.exists()) { if (!newTasklistFile.delete()) { - MylarStatusHandler.fail(null, "Could not overwrite tasklist", false); + StatusManager.fail(null, "Could not overwrite tasklist", false); return false; } } @@ -178,12 +178,12 @@ class TaskListDataMigration implements IRunnableWithProgress { monitor.beginTask("Migrate Tasklist Data", 1); ZipFileUtil.createZipFile(newTasklistFile, filesToZip, new SubProgressMonitor(monitor, 1)); if (!oldTasklistFile.delete()) { - MylarStatusHandler.fail(null, "Could not remove old tasklist.", false); + StatusManager.fail(null, "Could not remove old tasklist.", false); return false; } monitor.worked(1); } catch (Exception e) { - MylarStatusHandler.fail(e, "Error occurred while migrating old tasklist: " + e.getMessage(), true); + StatusManager.fail(e, "Error occurred while migrating old tasklist: " + e.getMessage(), true); return false; } finally { monitor.done(); @@ -198,7 +198,7 @@ class TaskListDataMigration implements IRunnableWithProgress { return false; if (newRepositoriesFile.exists()) { if (!newRepositoriesFile.delete()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not overwrite repositories file. Check read/write permission on data directory.", false); return false; } @@ -209,7 +209,7 @@ class TaskListDataMigration implements IRunnableWithProgress { monitor.beginTask("Migrate Repository Data", 1); ZipFileUtil.createZipFile(newRepositoriesFile, filesToZip, new SubProgressMonitor(monitor, 1)); if (!oldRepositoriesFile.delete()) { - MylarStatusHandler + StatusManager .fail( null, "Could not remove old repositories file. Check read/write permission on data directory.", @@ -218,7 +218,7 @@ class TaskListDataMigration implements IRunnableWithProgress { } monitor.worked(1); } catch (Exception e) { - MylarStatusHandler.fail(e, "Error occurred while migrating old repositories data: " + e.getMessage(), true); + StatusManager.fail(e, "Error occurred while migrating old repositories data: " + e.getMessage(), true); return false; } finally { monitor.done(); @@ -242,7 +242,7 @@ class TaskListDataMigration implements IRunnableWithProgress { File contextsFolder = new File(dataDirectory, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY); if (!contextsFolder.exists()) { if (!contextsFolder.mkdir()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not create contexts folder. Check read/write permission on data directory.", false); return false; } @@ -253,7 +253,7 @@ class TaskListDataMigration implements IRunnableWithProgress { File newContextFile = new File(contextsFolder, file.getName()+".zip"); if (newContextFile.exists()) { if (!newContextFile.delete()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not overwrite context file. Check read/write permission on data directory.", false); return false; @@ -261,14 +261,14 @@ class TaskListDataMigration implements IRunnableWithProgress { } ZipFileUtil.createZipFile(newContextFile, filesToZip, new SubProgressMonitor(monitor, 1)); if (!file.delete()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not remove old context file. Check read/write permission on data directory.", false); return false; } monitor.worked(1); } } catch (Exception e) { - MylarStatusHandler.fail(e, "Error occurred while migrating old repositories data: " + e.getMessage(), true); + StatusManager.fail(e, "Error occurred while migrating old repositories data: " + e.getMessage(), true); return false; } finally { monitor.done(); @@ -284,7 +284,7 @@ class TaskListDataMigration implements IRunnableWithProgress { File contextsFolder = new File(dataDirectory, WorkspaceAwareContextStore.CONTEXTS_DIRECTORY); if (!contextsFolder.exists()) { if (!contextsFolder.mkdir()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not create contexts folder. Check read/write permission on data directory.", false); return false; } @@ -294,7 +294,7 @@ class TaskListDataMigration implements IRunnableWithProgress { if (newActivityFile.exists()) { if (!newActivityFile.delete()) { - MylarStatusHandler.fail(null, + StatusManager.fail(null, "Could not overwrite activity file. Check read/write permission on data directory.", false); return false; } @@ -305,7 +305,7 @@ class TaskListDataMigration implements IRunnableWithProgress { monitor.beginTask("Migrate Activity Data", 1); ZipFileUtil.createZipFile(newActivityFile, filesToZip, new SubProgressMonitor(monitor, 1)); if (!oldActivityFile.delete()) { - MylarStatusHandler + StatusManager .fail( null, "Could not remove old activity file. Check read/write permission on data directory.", @@ -314,7 +314,7 @@ class TaskListDataMigration implements IRunnableWithProgress { } monitor.worked(1); } catch (Exception e) { - MylarStatusHandler.fail(e, "Error occurred while migrating old activity data: " + e.getMessage(), true); + StatusManager.fail(e, "Error occurred while migrating old activity data: " + e.getMessage(), true); return false; } finally { monitor.done(); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockStatusHandler.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockStatusHandler.java index d94f60281..be79bdc12 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockStatusHandler.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockStatusHandler.java @@ -11,7 +11,7 @@ package org.eclipse.mylyn.tasks.tests.connector; import junit.framework.TestCase; import org.eclipse.core.runtime.IStatus; -import org.eclipse.mylyn.core.IStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.IStatusHandler; public class MockStatusHandler implements IStatusHandler { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java index 10974003a..860a37856 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java @@ -10,7 +10,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -107,7 +107,7 @@ public class AddExistingTaskJob extends Job { }); } } catch (final CoreException e) { - MylarStatusHandler.fail(e.getStatus().getException(), e.getMessage(), true); + StatusManager.fail(e.getStatus().getException(), e.getMessage(), true); } finally { monitor.done(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryAwareStatusHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryAwareStatusHandler.java index 0d31e8550..28e3e8834 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryAwareStatusHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryAwareStatusHandler.java @@ -13,8 +13,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylyn.core.IStatusHandler; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.IStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.util.WebBrowserDialog; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.swt.widgets.Shell; @@ -53,7 +53,7 @@ public class RepositoryAwareStatusHandler implements IStatusHandler { public void displayStatus(final String title, final IStatus status) { if (status.getCode() == RepositoryStatus.ERROR_INTERNAL) { - MylarStatusHandler.log(status); + StatusManager.log(status); fail(status, true); return; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java index 5224c48c6..5b0c15a81 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RetrieveTitleFromUrlJob.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.TitleEvent; @@ -72,7 +72,7 @@ public abstract class RetrieveTitleFromUrlJob extends Job implements TitleListen try { Thread.sleep(SLEEP_INTERVAL_MILLIS); } catch (InterruptedException e) { - MylarStatusHandler.fail(e, "Thread interrupted during sleep", false); + StatusManager.fail(e, "Thread interrupted during sleep", false); } timeWaitedMillis += SLEEP_INTERVAL_MILLIS; } 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 8da9253cc..d404a5e3e 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 @@ -19,7 +19,7 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; @@ -151,7 +151,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage { searchPage = new DeadSearchPage(repository); searchPage.setContainer(pageContainer); searchPage.createControl(fParentComposite); - MylarStatusHandler.log(e, "Error occurred while constructing search page for " + repository.getUrl() + " [" + StatusManager.log(e, "Error occurred while constructing search page for " + repository.getUrl() + " [" + repository.getKind() + "]"); searchPage.getControl().setData(PAGE_KEY, searchPage); return searchPage.getControl(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java index c015168a3..edc0da38a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.ITaskCommandIds; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -41,7 +41,7 @@ public class AddRepositoryAction extends Action { try { handlerSvc.executeCommand(ITaskCommandIds.ADD_TASK_REPOSITORY, null); } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryTaskAction.java index 940de8eb4..bada23d49 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryTaskAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AddRepositoryTaskAction.java @@ -16,7 +16,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.wizards.AddExistingTaskWizard; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IViewActionDelegate; @@ -46,7 +46,7 @@ public class AddRepositoryTaskAction extends Action implements IViewActionDelega } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } 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 38e689b03..29af066ae 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 @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.IAttachmentHandler; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; @@ -60,7 +60,7 @@ public class CopyAttachmentToClipboardJob extends Job { try { handler.downloadAttachment(repository, attachment, out, monitor); } catch (final CoreException e) { - MylarStatusHandler.displayStatus("Copy Attachment to Clipboard", e.getStatus()); + StatusManager.displayStatus("Copy Attachment to Clipboard", e.getStatus()); return Status.OK_STATUS; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskRepositoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskRepositoryAction.java index bdd7c415a..7852b1a0f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskRepositoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteTaskRepositoryAction.java @@ -17,7 +17,7 @@ import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -85,7 +85,7 @@ public class DeleteTaskRepositoryAction extends AbstractTaskRepositoryAction { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } } 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 a8908a4ff..bd4d43847 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 @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.IAttachmentHandler; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; @@ -65,7 +65,7 @@ public class DownloadAttachmentJob extends Job { out = new FileOutputStream(this.targetFile); handler.downloadAttachment(repository, attachment, out, monitor); } catch (final CoreException e) { - MylarStatusHandler.displayStatus("Download Attachment", e.getStatus()); + 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, @@ -75,7 +75,7 @@ public class DownloadAttachmentJob extends Job { try { out.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not close attachment file: " + this.targetFile.getAbsolutePath(), + StatusManager.fail(e, "Could not close attachment file: " + this.targetFile.getAbsolutePath(), false); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewQueryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewQueryAction.java index aa8c7b76a..8e8c7d213 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewQueryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewQueryAction.java @@ -16,7 +16,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.wizards.NewQueryWizard; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IViewActionDelegate; @@ -46,7 +46,7 @@ public class NewQueryAction extends Action implements IViewActionDelegate { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java index f0840c3e3..ab3d8829b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RemoveFromCategoryAction.java @@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; @@ -76,7 +76,7 @@ public class RemoveFromCategoryAction extends Action { } } } catch (NullPointerException npe) { - MylarStatusHandler.fail(npe, "Could not remove task from category, it may still be refreshing.", true); + StatusManager.fail(npe, "Could not remove task from category, it may still be refreshing.", true); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java index 6edcf48fb..0e520866f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RestoreTaskListAction.java @@ -13,7 +13,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IViewActionDelegate; @@ -43,7 +43,7 @@ public class RestoreTaskListAction implements IViewActionDelegate { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java index ef77b6ed6..df8383a95 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java @@ -12,7 +12,7 @@ package org.eclipse.mylyn.internal.tasks.ui.actions; import org.eclipse.jface.action.Action; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -40,7 +40,7 @@ public class TaskDeactivateAction extends Action { TasksUiUtil.closeEditorInActivePage(task); } } catch (Exception e) { - MylarStatusHandler.log(e, " Closing task editor on task deactivation failed"); + StatusManager.log(e, " Closing task editor on task deactivation failed"); } } 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 1dd678c24..d69ceeb47 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 @@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -209,7 +209,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { hndSvc.executeCommand(ITaskCommandIds.ADD_TASK_REPOSITORY, null); repositoriesViewer.setInput(getTaskRepositories()); } catch (CommandException ex) { - MylarStatusHandler.fail(ex, ex.getMessage(), true); + StatusManager.fail(ex, ex.getMessage(), true); } } }); 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 5f75c63f6..ce2f36380 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 @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.mylyn.core.MylarStatusHandler; +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; @@ -118,7 +118,7 @@ public class RepositoryTaskOutlinePage extends ContentOutlinePage { viewer.setComparer(new RepositoryTaskOutlineComparer()); viewer.expandAll(); } catch (Exception e) { - MylarStatusHandler.fail(e, "could not create bugzilla outline", true); + StatusManager.fail(e, "could not create bugzilla outline", true); } getSite().getPage().addSelectionListener(selectionListener); } 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 87fb8f912..31d46450d 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 @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.text.TextViewer; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob; @@ -424,7 +424,7 @@ public class TaskPlanningEditor extends TaskFormPage { try { creationDateString = DateFormat.getDateInstance(DateFormat.LONG).format(task.getCreationDate()); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not format creation date", true); + StatusManager.fail(e, "Could not format creation date", true); } addNameValueComp(statusComposite, "Created:", creationDateString, SWT.FLAT | SWT.READ_ONLY); @@ -501,7 +501,7 @@ public class TaskPlanningEditor extends TaskFormPage { job.schedule(); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not open task web page", false); + StatusManager.fail(e, "could not open task web page", false); } } @@ -676,7 +676,7 @@ public class TaskPlanningEditor extends TaskFormPage { if (elapsedTimeString.equals("")) elapsedTimeString = NO_TIME_ELAPSED; } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not format elapsed time", true); + StatusManager.fail(e, "Could not format elapsed time", true); } final Text elapsedTimeText = new Text(nameValueComp, SWT.READ_ONLY | SWT.FLAT); @@ -702,7 +702,7 @@ public class TaskPlanningEditor extends TaskFormPage { } } catch (RuntimeException e1) { - MylarStatusHandler.fail(e1, "Could not format elapsed time", true); + StatusManager.fail(e1, "Could not format elapsed time", true); } elapsedTimeText.setText(elapsedTimeString); } @@ -782,7 +782,7 @@ public class TaskPlanningEditor extends TaskFormPage { try { completionDateString = DateFormat.getDateInstance(DateFormat.LONG).format(task.getCompletionDate()); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not format date", true); + StatusManager.fail(e, "Could not format date", true); return completionDateString; } return completionDateString; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java index 23fbe7e46..c84556ad2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.TaskList; @@ -65,7 +65,7 @@ public class TaskActivityEditorInput implements IEditorInput { } catch (InvocationTargetException e) { // operation was canceled } catch (InterruptedException e) { - MylarStatusHandler.log(e, "Could not generate report"); + StatusManager.log(e, "Could not generate report"); } completedTasks = completedTaskCollector.getTasks(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java index 59e25e4c5..4c7c4a3a2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorPart.java @@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -705,9 +705,9 @@ public class TaskActivityEditorPart extends EditorPart { writer.write("</body></html>"); writer.close(); } catch (FileNotFoundException e) { - MylarStatusHandler.log(e, "could not resolve file"); + StatusManager.log(e, "could not resolve file"); } catch (IOException e) { - MylarStatusHandler.log(e, "could not write to file"); + StatusManager.log(e, "could not write to file"); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java index e858bbb7f..664ad2d0d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java @@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.tasks.ui.planner; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.editors.TaskPlanningEditor; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IEditorInput; @@ -49,7 +49,7 @@ public class TaskActivityWizard extends Wizard implements INewWizard { .getSelectedContainers(), TasksUiPlugin.getTaskListManager().getTaskList()); page.openEditor(input, TaskPlanningEditor.ID_EDITOR_PLANNING); } catch (PartInitException ex) { - MylarStatusHandler.log(ex, "couldn't open summary editor"); + StatusManager.log(ex, "couldn't open summary editor"); } return true; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java index e725ae240..a29a3db7e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskPlannerLabelProvider.java @@ -15,7 +15,7 @@ import java.text.DateFormat; import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -51,7 +51,7 @@ public class TaskPlannerLabelProvider extends TaskElementLabelProvider implement if (task.getCreationDate() != null) { return DateFormat.getDateInstance(DateFormat.MEDIUM).format(task.getCreationDate()); } else { - MylarStatusHandler.log("Task has no creation date: " + task.getSummary(), this); + StatusManager.log("Task has no creation date: " + task.getSummary(), this); return "[unknown]"; } case 4: @@ -67,7 +67,7 @@ public class TaskPlannerLabelProvider extends TaskElementLabelProvider implement } } } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not produce completed task label", false); + StatusManager.fail(e, "Could not produce completed task label", false); return ""; } return null; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java index 41e7ba8c9..67148b8b4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java @@ -20,7 +20,7 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; @@ -64,7 +64,7 @@ public class TaskReportGenerator implements IRunnableWithProgress { } catch (InvocationTargetException e) { // operation was canceled } catch (InterruptedException e) { - MylarStatusHandler.log(e, "Could not collect tasks"); + StatusManager.log(e, "Could not collect tasks"); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/BackgroundSaveTimer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/BackgroundSaveTimer.java index 5739121a2..304c5906e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/BackgroundSaveTimer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/BackgroundSaveTimer.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.mylyn.internal.tasks.ui.util; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.monitor.core.ActivityTimerThread; import org.eclipse.mylyn.monitor.core.IActivityTimerListener; @@ -73,7 +73,7 @@ public class BackgroundSaveTimer implements IActivityTimerListener { listener.saveRequested(); // } } catch (RuntimeException e) { - MylarStatusHandler.log("Could not schedule save job", this); + StatusManager.log("Could not schedule save job", this); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java index 663acd93c..5bb15cbc2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportJob.java @@ -27,8 +27,8 @@ import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore; @@ -127,7 +127,7 @@ public class TaskDataExportJob implements IRunnableWithProgress { destRepositoriesFile.delete(); } if (!copy(sourceRepositoriesFile, destRepositoriesFile)) { - MylarStatusHandler.fail(new Exception("Export Exception"), + StatusManager.fail(new Exception("Export Exception"), "Could not export repositories file.", false); } monitor.worked(1); @@ -153,7 +153,7 @@ public class TaskDataExportJob implements IRunnableWithProgress { destTaskListFile.delete(); } if (!copy(sourceTaskListFile, destTaskListFile)) { - MylarStatusHandler.fail(new Exception("Export Exception"), "Could not export task list file.", + StatusManager.fail(new Exception("Export Exception"), "Could not export task list file.", false); } monitor.worked(1); @@ -186,7 +186,7 @@ public class TaskDataExportJob implements IRunnableWithProgress { } } } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not export activity history context file", true); + StatusManager.fail(e, "Could not export activity history context file", true); } } @@ -215,7 +215,7 @@ public class TaskDataExportJob implements IRunnableWithProgress { destTaskFile.delete(); } if (!copy(sourceTaskContextFile, destTaskFile) && !errorDisplayed) { - MylarStatusHandler.fail(new Exception("Export Exception: " + sourceTaskContextFile.getPath() + StatusManager.fail(new Exception("Export Exception: " + sourceTaskContextFile.getPath() + " -> " + destTaskFile.getPath()), "Could not export one or more task context files.", true); errorDisplayed = true; @@ -234,7 +234,7 @@ public class TaskDataExportJob implements IRunnableWithProgress { ZipFileUtil.createZipFile(destZipFile, filesToZip, TasksUiPlugin.getDefault().getDataDirectory(), monitor); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not create zip file.", true); + StatusManager.fail(e, "Could not create zip file.", true); } } monitor.done(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java index 05aaf5657..7d4424c34 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListSaveManager.java @@ -29,8 +29,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; @@ -72,7 +72,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground try { taskListSaverJob.runRequested(); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not auto save task list", false); + StatusManager.fail(e, "Could not auto save task list", false); } } } @@ -103,7 +103,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground internalSaveTaskList(); } } else if (PlatformUI.getWorkbench() != null && !PlatformUI.getWorkbench().isClosing()) { - MylarStatusHandler.log("Possible task list initialization failure, not saving list.", this); + StatusManager.log("Possible task list initialization failure, not saving list.", this); if (!initializationWarningDialogShow) { initializationWarningDialogShow = true; PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { @@ -147,7 +147,7 @@ public class TaskListSaveManager implements ITaskListChangeListener, IBackground File destDir = new File(targetFolderPath + File.separator + currFile.getName()); if (!destDir.exists()) { if (!destDir.mkdir()) { - MylarStatusHandler.log("Unable to create destination context folder: " + StatusManager.log("Unable to create destination context folder: " + destDir.getAbsolutePath(), this); continue; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java index 0a49b321f..0578f19be 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java @@ -40,7 +40,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; @@ -109,7 +109,7 @@ public class TaskListWriter { db = dbf.newDocumentBuilder(); doc = db.newDocument(); } catch (ParserConfigurationException e) { - MylarStatusHandler.log(e, "could not create document"); + StatusManager.log(e, "could not create document"); return; } @@ -134,10 +134,10 @@ public class TaskListWriter { delagatingExternalizer.createQueryElement(query, doc, root); } } catch (Throwable t) { - MylarStatusHandler.fail(t, "Did not externalize: " + query.getSummary(), true); + StatusManager.fail(t, "Did not externalize: " + query.getSummary(), true); } if (element == null) { - MylarStatusHandler.log("Did not externalize: " + query, this); + StatusManager.log("Did not externalize: " + query, this); } } // Collection<ITask> allTasks = @@ -182,10 +182,10 @@ public class TaskListWriter { // { delagatingExternalizer.createTaskElement(task, doc, root); } else if (element == null) { - MylarStatusHandler.log("Did not externalize: " + task, this); + StatusManager.log("Did not externalize: " + task, this); } } catch (Exception e) { - MylarStatusHandler.log(e, e.getMessage()); + StatusManager.log(e, e.getMessage()); } } @@ -206,7 +206,7 @@ public class TaskListWriter { outputStream.closeEntry(); outputStream.close(); } catch (Exception fnfe) { - MylarStatusHandler.log(fnfe, "TaskList could not be found"); + StatusManager.log(fnfe, "TaskList could not be found"); } } @@ -264,7 +264,7 @@ public class TaskListWriter { readVersion = root.getAttribute(ATTRIBUTE_VERSION); if (readVersion.equals(VALUE_VERSION_1_0_0)) { - MylarStatusHandler.log("version: " + readVersion + " not supported", this); + StatusManager.log("version: " + readVersion + " not supported", this); } else { NodeList list = root.getChildNodes(); @@ -438,7 +438,7 @@ public class TaskListWriter { File save = new File(name); if (save.exists()) { if (!save.delete()) { - MylarStatusHandler.log("Unable to delete old backup tasklist file", this); + StatusManager.log("Unable to delete old backup tasklist file", this); return; } } @@ -446,10 +446,10 @@ public class TaskListWriter { inFile.renameTo(new File(name)); } if (child == null) { - MylarStatusHandler.log(e, ITasksUiConstants.MESSAGE_RESTORE); + StatusManager.log(e, ITasksUiConstants.MESSAGE_RESTORE); } else { e.printStackTrace(); // in case logging plug-in has not yet started - MylarStatusHandler.log(e, "Tasks may have been lost from " + child.getNodeName()); + StatusManager.log(e, "Tasks may have been lost from " + child.getNodeName()); } } 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 824527e18..0c8f0f959 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 @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -226,10 +226,10 @@ public class TasksUiExtensionReader { duplicateDetector.setKind(element.getAttribute(ATTR_KIND)); TasksUiPlugin.getDefault().addDuplicateDetector((AbstractDuplicateDetector) duplicateDetector); } else { - MylarStatusHandler.log("Could not load duplicate detector: " + obj.getClass().getCanonicalName(), null); + StatusManager.log("Could not load duplicate detector: " + obj.getClass().getCanonicalName(), null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load duplicate detector extension"); + StatusManager.log(e, "Could not load duplicate detector extension"); } } @@ -240,11 +240,11 @@ public class TasksUiExtensionReader { TasksUiPlugin.getDefault().addRepositoryLinkProvider( (AbstractTaskRepositoryLinkProvider) repositoryLinkProvider); } else { - MylarStatusHandler.log("Could not load repository link provider: " + StatusManager.log("Could not load repository link provider: " + repositoryLinkProvider.getClass().getCanonicalName(), null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load repository link provider extension"); + StatusManager.log(e, "Could not load repository link provider extension"); } } @@ -254,11 +254,11 @@ public class TasksUiExtensionReader { if (hyperlinkDetector instanceof IHyperlinkDetector) { TasksUiPlugin.getDefault().addTaskHyperlinkDetector((IHyperlinkDetector) hyperlinkDetector); } else { - MylarStatusHandler.log("Could not load detector: " + hyperlinkDetector.getClass().getCanonicalName(), + StatusManager.log("Could not load detector: " + hyperlinkDetector.getClass().getCanonicalName(), null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load tasklist hyperlink detector extension"); + StatusManager.log(e, "Could not load tasklist hyperlink detector extension"); } } @@ -268,11 +268,11 @@ public class TasksUiExtensionReader { if (editor instanceof ITaskEditorFactory) { TasksUiPlugin.getDefault().addContextEditor((ITaskEditorFactory) editor); } else { - MylarStatusHandler.log("Could not load editor: " + editor.getClass().getCanonicalName() + StatusManager.log("Could not load editor: " + editor.getClass().getCanonicalName() + " must implement " + ITaskEditorFactory.class.getCanonicalName(), null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load tasklist listener extension"); + StatusManager.log(e, "Could not load tasklist listener extension"); } } @@ -290,11 +290,11 @@ public class TasksUiExtensionReader { repositoryConnector.setUserManaged(userManaged); } } else { - MylarStatusHandler.log("could not not load connector core: " + connectorCore, null); + StatusManager.log("could not not load connector core: " + connectorCore, null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load tasklist listener extension"); + StatusManager.log(e, "Could not load tasklist listener extension"); } } @@ -331,11 +331,11 @@ public class TasksUiExtensionReader { } } } else { - MylarStatusHandler.log("could not not load connector ui: " + connectorUiObject, null); + StatusManager.log("could not not load connector ui: " + connectorUiObject, null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load tasklist listener extension"); + StatusManager.log(e, "Could not load tasklist listener extension"); } } @@ -373,7 +373,7 @@ public class TasksUiExtensionReader { } } else { - MylarStatusHandler.log("Could not load repository template extension " + element.getName(), + StatusManager.log("Could not load repository template extension " + element.getName(), TasksUiExtensionReader.class); } } @@ -386,12 +386,12 @@ public class TasksUiExtensionReader { TasksUiPlugin.getDefault().addDynamicPopupContributor(menuPath, (IDynamicSubMenuContributor) dynamicPopupContributor); } else { - MylarStatusHandler.log("Could not load dynamic popup menu: " + StatusManager.log("Could not load dynamic popup menu: " + dynamicPopupContributor.getClass().getCanonicalName() + " must implement " + IDynamicSubMenuContributor.class.getCanonicalName(), null); } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load dynamic popup extension"); + StatusManager.log(e, "Could not load dynamic popup extension"); } } @@ -402,7 +402,7 @@ public class TasksUiExtensionReader { ITaskListExternalizer externalizer = (ITaskListExternalizer) externalizerObject; externalizers.add(externalizer); } else { - MylarStatusHandler.log("Could not load externalizer: " + StatusManager.log("Could not load externalizer: " + externalizerObject.getClass().getCanonicalName() + " must implement " + ITaskListExternalizer.class.getCanonicalName(), null); } @@ -419,7 +419,7 @@ public class TasksUiExtensionReader { // null); // } } catch (CoreException e) { - MylarStatusHandler.log(e, "Could not load task handler extension"); + StatusManager.log(e, "Could not load task handler extension"); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java index 0cf60662f..391307567 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractMylarFilteredTree.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; @@ -61,7 +61,7 @@ public abstract class AbstractMylarFilteredTree extends FilteredTree { refreshJob = (Job) refreshField.get(this); refreshPolicy = new AdaptiveRefreshPolicy(refreshJob, super.getFilterControl()); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not get refresh job", false); + StatusManager.fail(e, "Could not get refresh job", false); } setInitialText(""); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java index 6119663a4..3d0daea11 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/ResetRepositoryConfigurationAction.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.actions.AbstractTaskRepositoryAction; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -57,7 +57,7 @@ public class ResetRepositoryConfigurationAction extends AbstractTaskRepositoryAc try { connector.updateAttributes(repository, monitor); } catch (CoreException ce) { - MylarStatusHandler.displayStatus("Error updating attributes", ce.getStatus()); + StatusManager.displayStatus("Error updating attributes", ce.getStatus()); } monitor.done(); @@ -70,7 +70,7 @@ public class ResetRepositoryConfigurationAction extends AbstractTaskRepositoryAc } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java index ae3286c1d..0ae871641 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivationHistory.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.monitor.core.InteractionEvent; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -88,7 +88,7 @@ public class TaskActivationHistory { history.add(task); currentIndex = history.size() - 1; } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not add task to history", false); + StatusManager.fail(e, "could not add task to history", false); } } @@ -112,7 +112,7 @@ public class TaskActivationHistory { return null; } } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not get previous task from history", false); + StatusManager.fail(e, "could not get previous task from history", false); return null; } } @@ -130,7 +130,7 @@ public class TaskActivationHistory { return (currentIndex == 0 && !history.get(currentIndex).isActive()) || currentIndex > 0; } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could determine previous task", false); + StatusManager.fail(e, "could determine previous task", false); return false; } } @@ -140,7 +140,7 @@ public class TaskActivationHistory { history.clear(); currentIndex = -1; } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not clear history", false); + StatusManager.fail(e, "could not clear history", false); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java index a130b3917..509e83aff 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskDelegate; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; @@ -107,7 +107,7 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement if (elapsedTimeString.equals("")) elapsedTimeString = NO_MINUTES; } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not format elapsed time", true); + StatusManager.fail(e, "Could not format elapsed time", true); } return elapsedTimeString; case 4: diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java index 08055634f..f6c420bfe 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskInputDialog.java @@ -15,7 +15,7 @@ import java.util.Date; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob; import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.swt.SWT; @@ -241,7 +241,7 @@ public class TaskInputDialog extends Dialog { job.schedule(); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not open task web page", false); + StatusManager.fail(e, "could not open task web page", false); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java index b8ab46a3b..c2a907656 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java @@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.views; import java.util.Arrays; import org.eclipse.jface.viewers.ICellModifier; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -50,7 +50,7 @@ class TaskListCellModifier implements ICellModifier { } } } catch (Exception e) { - MylarStatusHandler.log(e, e.getMessage()); + StatusManager.log(e, e.getMessage()); } return ""; } @@ -89,7 +89,7 @@ class TaskListCellModifier implements ICellModifier { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } this.taskListView.getViewer().refresh(); } 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 9070c70e7..8901686a3 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 @@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerDropAdapter; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.RetrieveTitleFromUrlJob; @@ -208,7 +208,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { TasksUiUtil.refreshAndOpenTaskListElement(newTask); return true; } catch (CoreException e) { - MylarStatusHandler.fail(e, "could not create task", false); + StatusManager.fail(e, "could not create task", false); return false; } } @@ -294,7 +294,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { }; job.schedule(); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not open task web page", false); + StatusManager.fail(e, "could not open task web page", false); } } } 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 e83f61bb7..20d887b50 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 @@ -49,7 +49,7 @@ import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.viewers.TreeExpansionEvent; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.Window; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskArchive; import org.eclipse.mylyn.internal.tasks.core.UnfiledCategory; @@ -628,7 +628,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { categoryGradientStart = new Color(Display.getDefault(), red, green, blue); } catch (Exception e) { categoryGradientStart = getViewer().getTree().getParent().getBackground(); - MylarStatusHandler.fail(e, "Could not set color: " + red + ", " + green + ", " + blue, false); + StatusManager.fail(e, "Could not set color: " + red + ", " + green + ", " + blue, false); } red = Math.max(0, (int) (parentBackground.getRed() / GRADIENT_BOTTOM)); green = Math.max(0, (int) (parentBackground.getGreen() / GRADIENT_BOTTOM)); @@ -640,7 +640,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { categoryGradientEnd = new Color(Display.getDefault(), red, green, blue); } catch (Exception e) { categoryGradientStart = getViewer().getTree().getParent().getBackground(); - MylarStatusHandler.fail(e, "Could not set color: " + red + ", " + green + ", " + blue, false); + StatusManager.fail(e, "Could not set color: " + red + ", " + green + ", " + blue, false); } gradientListenerAdded = true; } else if (categoryGradientStart != null && categoryGradientStart.equals(categoryGradientEnd)) { @@ -664,7 +664,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { try { return (TaskListView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(ID); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not show Task List view", false); + StatusManager.fail(e, "Could not show Task List view", false); e.printStackTrace(); return null; } @@ -1650,7 +1650,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { getViewer().refresh(element, true); } } catch (SWTException e) { - MylarStatusHandler.log(e, "Failed to refresh Task List"); + StatusManager.log(e, "Failed to refresh Task List"); } } } 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 9f9ffb281..b5240c30c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewAttachmentWizard.java @@ -28,7 +28,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; @@ -199,7 +199,7 @@ public class NewAttachmentWizard extends Wizard { handleSubmitError((CoreException) e1.getCause()); } else { - MylarStatusHandler.fail(e1, "Attachment failure", true); + StatusManager.fail(e1, "Attachment failure", true); } return false; } catch (InterruptedException e1) { @@ -247,7 +247,7 @@ public class NewAttachmentWizard extends Wizard { // performFinish(); } } else { - MylarStatusHandler.displayStatus("Attachment failed", exception.getStatus()); + StatusManager.displayStatus("Attachment failed", exception.getStatus()); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java index a1a3f2360..7ba6ba3b4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java @@ -22,8 +22,8 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportJob; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -116,7 +116,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { final File destDirFile = new File(destDir); if (!destDirFile.exists() || !destDirFile.isDirectory()) { // This should never happen - MylarStatusHandler.fail(new Exception("File Export Exception"), + StatusManager.fail(new Exception("File Export Exception"), "Could not export data because specified location does not exist or is not a folder", true); return false; } @@ -181,9 +181,9 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { try { service.run(true, false, job); } catch (InvocationTargetException e) { - MylarStatusHandler.fail(e, "Could not export files", true); + StatusManager.fail(e, "Could not export files", true); } catch (InterruptedException e) { - MylarStatusHandler.fail(e, "Could not export files", true); + StatusManager.fail(e, "Could not export files", true); } exportPage.saveSettings(); 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 7292850d6..c89d90a4f 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 @@ -12,7 +12,7 @@ package org.eclipse.mylyn.internal.tasks.ui.wizards; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -108,7 +108,7 @@ public class TaskDataExportWizardPage extends WizardPage { setPageComplete(validate()); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not create export wizard page", true); + StatusManager.fail(e, "Could not create export wizard page", true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java index fa98e458b..3bbb67bc8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java @@ -26,8 +26,8 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; @@ -162,7 +162,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { } } catch (IOException e) { - MylarStatusHandler.fail(e, "Could not import files", true); + StatusManager.fail(e, "Could not import files", true); } FileCopyJob job = new FileCopyJob(sourceDirFile, sourceZipFile, sourceTaskListFile, sourceRepositoriesFile, @@ -173,9 +173,9 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { try { service.run(true, false, job); } catch (InvocationTargetException e) { - MylarStatusHandler.fail(e, "Could not import files", true); + StatusManager.fail(e, "Could not import files", true); } catch (InterruptedException e) { - MylarStatusHandler.fail(e, "Could not import files", true); + StatusManager.fail(e, "Could not import files", true); } importPage.saveSettings(); @@ -208,7 +208,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { //ZipFileUtil.unzipFiles(sourceZipFile, TasksUiPlugin.getDefault().getDataDirectory()); } catch (IOException ioe) { - MylarStatusHandler.fail(new Exception("Import Exception"), "Problem occured extracting from zip file.", + StatusManager.fail(new Exception("Import Exception"), "Problem occured extracting from zip file.", true); return; } 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 f55b2cd16..16bad1fab 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 @@ -20,7 +20,7 @@ import org.apache.commons.httpclient.util.DateUtil; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; @@ -120,7 +120,7 @@ public class TaskDataImportWizardPage extends WizardPage { setControl(container); setPageComplete(validate()); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "Could not create import wizard page", true); + StatusManager.fail(e, "Could not create import wizard page", true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java index 3f88d32a4..9ba534fe1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.internal.tasks.ui.wizards.CommonAddExistingTaskWizard; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -151,7 +151,7 @@ public abstract class AbstractRepositoryConnectorUi { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java index bae39d3b2..ef864f511 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ContextUiUtil.java @@ -16,7 +16,7 @@ import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -66,10 +66,10 @@ public class ContextUiUtil { } } catch (InvocationTargetException e) { if (e.getCause() instanceof CoreException) { - MylarStatusHandler.displayStatus(ITasksUiConstants.TITLE_DIALOG, ((CoreException) e.getCause()) + StatusManager.displayStatus(ITasksUiConstants.TITLE_DIALOG, ((CoreException) e.getCause()) .getStatus()); } else { - MylarStatusHandler.fail(e, "Unexpected error while attaching context", true); + StatusManager.fail(e, "Unexpected error while attaching context", true); } return false; } catch (InterruptedException ignored) { @@ -113,10 +113,10 @@ public class ContextUiUtil { } } catch (InvocationTargetException e) { if (e.getCause() instanceof CoreException) { - MylarStatusHandler.displayStatus(ITasksUiConstants.TITLE_DIALOG, ((CoreException) e.getCause()) + StatusManager.displayStatus(ITasksUiConstants.TITLE_DIALOG, ((CoreException) e.getCause()) .getStatus()); } else { - MylarStatusHandler.fail(e, "Unexpected error while attaching context", true); + StatusManager.fail(e, "Unexpected error while attaching context", true); } return false; } catch (InterruptedException ignored) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java index 0ea1d1d4d..9ab876437 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/OpenRepositoryTaskJob.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.ITaskDataHandler; @@ -98,7 +98,7 @@ public class OpenRepositoryTaskJob extends Job { } catch (final CoreException e) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - MylarStatusHandler.displayStatus("Unable to open task.", e.getStatus()); + StatusManager.displayStatus("Unable to open task.", e.getStatus()); } }); } finally { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java index 7422a49b6..4bab59f6f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/ProjectPreferencesLinkProvider.java @@ -13,7 +13,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; import org.osgi.service.prefs.BackingStoreException; @@ -70,7 +70,7 @@ public class ProjectPreferencesLinkProvider extends AbstractTaskRepositoryLinkPr projectNode.flush(); return true; } catch (BackingStoreException e) { - MylarStatusHandler.fail(e, "Failed to save task repository to project association preference", false); + StatusManager.fail(e, "Failed to save task repository to project association preference", false); } } return false; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java index 88b16090a..f55a4799b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -179,7 +179,7 @@ public class RepositorySynchronizationManager { RepositoryTaskSyncState status = repositoryTask.getSyncState(); if (newTaskData == null) { - MylarStatusHandler.log("Download of " + repositoryTask.getSummary() + " from " + StatusManager.log("Download of " + repositoryTask.getSummary() + " from " + repositoryTask.getRepositoryUrl() + " failed.", this); return false; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeChangedTasksJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeChangedTasksJob.java index 2faa09b21..ca846b9f5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeChangedTasksJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeChangedTasksJob.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.TaskList; @@ -78,7 +78,7 @@ public class SynchronizeChangedTasksJob extends Job { TasksUiPlugin.getSynchronizationManager().synchronize(connector, tasks, forced, null); } catch (final CoreException e) { - MylarStatusHandler.log(e.getStatus()); + StatusManager.log(e.getStatus()); } finally { monitor.done(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java index d4a2d69b4..5377d4da2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; @@ -107,7 +107,7 @@ class SynchronizeQueryJob extends Job { } } catch (CoreException e) { // there is no good way of informing the user at this point, just log the error - MylarStatusHandler.log(e.getStatus()); + StatusManager.log(e.getStatus()); } // synchronize queries @@ -178,7 +178,7 @@ class SynchronizeQueryJob extends Job { // do nothing } else if (resultingStatus.isOK()) { if (collector.getTaskHits().size() >= QueryHitCollector.MAX_HITS) { - MylarStatusHandler.log(QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this); + StatusManager.log(QueryHitCollector.MAX_HITS_REACHED + "\n" + repositoryQuery.getSummary(), this); } repositoryQuery.clear(); @@ -197,7 +197,7 @@ class SynchronizeQueryJob extends Job { if (isForced()) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - MylarStatusHandler.displayStatus("Query Synchronization Failed", resultingStatus); + StatusManager.displayStatus("Query Synchronization Failed", resultingStatus); } }); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java index 4216df616..98e944a36 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -91,7 +91,7 @@ class SynchronizeTaskJob extends Job { if (forced) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - MylarStatusHandler.displayStatus("Task Synchronization Failed", e.getStatus()); + StatusManager.displayStatus("Task Synchronization Failed", e.getStatus()); } }); } @@ -108,7 +108,7 @@ class SynchronizeTaskJob extends Job { // TasksUiPlugin.getDefault().getTaskDataManager().save(); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not download report", false); + StatusManager.fail(e, "Could not download report", false); } finally { monitor.done(); } 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 4e87e96e4..5df33cda4 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 @@ -36,8 +36,8 @@ import org.eclipse.mylyn.context.core.ContextCorePlugin; import org.eclipse.mylyn.context.core.IInteractionContext; import org.eclipse.mylyn.context.core.IInteractionContextListener; import org.eclipse.mylyn.context.core.IInteractionElement; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.InteractionContextManager; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; @@ -413,7 +413,7 @@ public class TaskListManager implements IPropertyChangeListener { } } } catch (Throwable t) { - MylarStatusHandler.fail(t, "Error parsing interaction event", false); + StatusManager.fail(t, "Error parsing interaction event", false); } } @@ -716,7 +716,7 @@ public class TaskListManager implements IPropertyChangeListener { } } } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not move context file: " + file.getName(), false); + StatusManager.fail(e, "Could not move context file: " + file.getName(), false); } } } @@ -779,7 +779,7 @@ public class TaskListManager implements IPropertyChangeListener { listener.taskListRead(); } } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not read task list, consider restoring via view menu", true); + StatusManager.fail(t, "Could not read task list, consider restoring via view menu", true); return false; } return true; @@ -803,10 +803,10 @@ public class TaskListManager implements IPropertyChangeListener { // TasksUiPlugin.getDefault().getPreferenceStore().setValue(TaskListPreferenceConstants.TASK_ID, // nextLocalTaskId); } else { - MylarStatusHandler.log("task list save attempted before initialization", this); + StatusManager.log("task list save attempted before initialization", this); } } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not save task list", true); + StatusManager.fail(e, "Could not save task list", true); } } @@ -833,11 +833,11 @@ public class TaskListManager implements IPropertyChangeListener { try { listener.taskActivated(task); } catch (Throwable t) { - MylarStatusHandler.fail(t, "task activity listener failed: " + listener, false); + StatusManager.fail(t, "task activity listener failed: " + listener, false); } } } catch (Throwable t) { - MylarStatusHandler.fail(t, "could not activate task", false); + StatusManager.fail(t, "could not activate task", false); } } @@ -861,7 +861,7 @@ public class TaskListManager implements IPropertyChangeListener { try { listener.taskDeactivated(task); } catch (Throwable t) { - MylarStatusHandler.fail(t, "notification failed for: " + listener, false); + StatusManager.fail(t, "notification failed for: " + listener, false); } } } 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 25b70daa3..5b16bd2cb 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 @@ -38,8 +38,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.context.core.ContextPreferenceContstants; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer; import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; @@ -428,7 +428,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } taskListManager.initActivityHistory(); } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not initialize task activity", false); + StatusManager.fail(t, "Could not initialize task activity", false); } try { @@ -438,7 +438,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { taskListNotificationManager.startNotification(NOTIFICATION_DELAY); getPreferenceStore().addPropertyChangeListener(taskListNotificationManager); } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not initialize notifications", false); + StatusManager.fail(t, "Could not initialize notifications", false); } try { @@ -448,7 +448,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { synchronizationScheduler = new TaskListSynchronizationScheduler(true); synchronizationScheduler.startSynchJob(); } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not initialize task list backup and synchronization", false); + StatusManager.fail(t, "Could not initialize task list backup and synchronization", false); } try { @@ -470,7 +470,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } checkForCredentials(); } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not finish Tasks UI initialization", false); + StatusManager.fail(t, "Could not finish Tasks UI initialization", false); } } }); @@ -481,7 +481,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } } catch (Exception e) { e.printStackTrace(); - MylarStatusHandler.fail(e, "Mylar Task List initialization failed", false); + StatusManager.fail(e, "Mylar Task List initialization failed", false); } } @@ -513,7 +513,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { taskRepositoryManager.addRepository(taskRepository, getRepositoriesFilePath()); } } catch (Throwable t) { - MylarStatusHandler.fail(t, "Could not load repository template", false); + StatusManager.fail(t, "Could not load repository template", false); } } } @@ -540,7 +540,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { } } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } } } @@ -575,7 +575,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { INSTANCE = null; } } catch (Exception e) { - MylarStatusHandler.log(e, "Mylar Task List stop terminated abnormally"); + StatusManager.log(e, "Mylar Task List stop terminated abnormally"); } finally { super.stop(context); } @@ -801,7 +801,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { public TaskDataManager getTaskDataManager() { if (taskDataManager == null) { - MylarStatusHandler.fail(null, "Offline reports file not created, try restarting.", true); + StatusManager.fail(null, "Offline reports file not created, try restarting.", true); } return taskDataManager; } 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 4a2fc149a..12b13c06b 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 @@ -37,7 +37,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.LocalTask; import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskDelegate; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; @@ -109,7 +109,7 @@ public class TasksUiUtil { IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); support.getExternalBrowser().openURL(new URL(url)); } catch (Exception e) { - MylarStatusHandler.fail(e, "could not open task url", true); + StatusManager.fail(e, "could not open task url", true); } } else { IWebBrowser browser = null; @@ -140,7 +140,7 @@ public class TasksUiUtil { try { opened = connectorUi.openRepositoryTask(repository.getUrl(), taskId); } catch (Exception e) { - MylarStatusHandler.log(e, "Internal error while opening repository task"); + StatusManager.log(e, "Internal error while opening repository task"); } } } @@ -211,7 +211,7 @@ public class TasksUiUtil { repositoryTask.getRepositoryUrl()); if (repository == null) { - MylarStatusHandler.fail(null, "No repository found for task. Please create repository in " + StatusManager.fail(null, "No repository found for task. Please create repository in " + TasksUiPlugin.LABEL_VIEW_REPOSITORIES + ".", true); return; } @@ -356,7 +356,7 @@ public class TasksUiUtil { TasksUiPlugin.getSynchronizationManager().setTaskRead((AbstractTask) task, true); } } else { - MylarStatusHandler.log("Unable to open editor for " + task.getSummary(), TasksUiUtil.class); + StatusManager.log("Unable to open editor for " + task.getSummary(), TasksUiUtil.class); } } } @@ -384,7 +384,7 @@ public class TasksUiUtil { try { return page.openEditor(input, editorId); } catch (PartInitException e) { - MylarStatusHandler.fail(e, "Open for editor failed: " + input + ", taskId: " + editorId, true); + StatusManager.fail(e, "Open for editor failed: " + input + ", taskId: " + editorId, true); } return null; } @@ -421,7 +421,7 @@ public class TasksUiUtil { TaskRepositoriesView.getFromActivePerspective().getViewer().refresh(); } } catch (Exception e) { - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); } return Dialog.OK; } 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 0669f24ab..fe220cebc 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 @@ -61,7 +61,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.CommentQuoter; import org.eclipse.mylyn.internal.tasks.ui.PersonProposalLabelProvider; import org.eclipse.mylyn.internal.tasks.ui.PersonProposalProvider; @@ -1165,7 +1165,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { try { page.openEditor(input, desc.getId()); } catch (PartInitException e) { - MylarStatusHandler.fail(e, "Unable to open editor for: " + attachment.getDescription(), false); + StatusManager.fail(e, "Unable to open editor for: " + attachment.getDescription(), false); } } }; @@ -1182,7 +1182,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { try { page.openEditor(input, "org.eclipse.ui.DefaultTextEditor"); } catch (PartInitException e) { - MylarStatusHandler.fail(e, "Unable to open editor for: " + attachment.getDescription(), false); + StatusManager.fail(e, "Unable to open editor for: " + attachment.getDescription(), false); } } }; @@ -2591,7 +2591,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { if (modifiedTask != null) { modifiedTask.setSubmitting(false); } - MylarStatusHandler.fail(e, e.getMessage(), true); + StatusManager.fail(e, e.getMessage(), true); PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { setGlobalBusy(false);// enableButtons(); @@ -2715,9 +2715,9 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { if (form != null && !form.isDisposed()) { if (exception.getStatus().getCode() == RepositoryStatus.ERROR_IO) { parentEditor.setMessage(ERROR_NOCONNECTIVITY, IMessageProvider.ERROR); - MylarStatusHandler.log(exception.getStatus()); + StatusManager.log(exception.getStatus()); } else if (exception.getStatus().getCode() == RepositoryStatus.REPOSITORY_COMMENT_REQUIRED) { - MylarStatusHandler.displayStatus("Comment required", exception.getStatus()); + StatusManager.displayStatus("Comment required", exception.getStatus()); if (!isDisposed && newCommentTextViewer != null && !newCommentTextViewer.getControl().isDisposed()) { newCommentTextViewer.getControl().setFocus(); @@ -2728,7 +2728,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { return; } } else { - MylarStatusHandler.displayStatus("Submit failed", exception.getStatus()); + StatusManager.displayStatus("Submit failed", exception.getStatus()); } setGlobalBusy(false); } 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 b3b1b92a3..198be9ea7 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 @@ -21,7 +21,7 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.mylyn.core.MylarStatusHandler; +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.TasksUiPreferenceConstants; @@ -141,9 +141,9 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi } return index; } catch (SWTError e) { - MylarStatusHandler.fail(e, "Could not create Browser page: " + e.getMessage(), true); + StatusManager.fail(e, "Could not create Browser page: " + e.getMessage(), true); } catch (RuntimeException e) { - MylarStatusHandler.fail(e, "could not create issue report page", false); + StatusManager.fail(e, "could not create issue report page", false); } } return 0; @@ -397,7 +397,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi contentOutlineProvider = editor; } } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not create editor via factory: " + factory, true); + StatusManager.fail(e, "Could not create editor via factory: " + factory, true); } } } @@ -424,7 +424,7 @@ public final class TaskEditor extends SharedHeaderFormEditor implements IBusyEdi } } catch (PartInitException e) { - MylarStatusHandler.fail(e, "failed to create task editor pages", false); + StatusManager.fail(e, "failed to create task editor pages", false); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java index 30f5d0fae..d13b817e8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/properties/ProjectTaskRepositoryPage.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction; import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoriesSorter; import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider; @@ -178,7 +178,7 @@ public class ProjectTaskRepositoryPage extends PropertyPage { plugin.setRepositoryForResource(project, selectedRepository); } } catch (CoreException e) { - MylarStatusHandler.fail(e, "Unable to associate project with task repository", true); + StatusManager.fail(e, "Unable to associate project with task repository", true); } } return true; 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 0c118aac2..9509edeea 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 @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -164,7 +164,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { public ISearchResult getSearchResult() { if (searchResult.getMatchCount() >= QueryHitCollector.MAX_HITS) { - MylarStatusHandler.displayStatus("Maximum hits reached", RepositoryStatus.createStatus(repository.getUrl(), + StatusManager.displayStatus("Maximum hits reached", RepositoryStatus.createStatus(repository.getUrl(), IStatus.WARNING, TasksUiPlugin.PLUGIN_ID, MAX_HITS_REACHED)); } return searchResult; @@ -186,7 +186,7 @@ public class SearchHitCollector implements ISearchQuery, ITaskCollector { if (connector != null) { IStatus status = connector.performQuery(repositoryQuery, repository, monitor, this); if (!status.isOK()) { - MylarStatusHandler.displayStatus("Search failed", status); + StatusManager.displayStatus("Search failed", status); } } else { return new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.OK, 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 22ecac0b7..86832004b 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 @@ -25,7 +25,7 @@ import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.IRepositoryConstants; import org.eclipse.mylyn.tasks.core.TaskRepository; @@ -387,7 +387,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { } } } catch (Throwable t) { - MylarStatusHandler.fail(t, "could not set field value for: " + repository, false); + StatusManager.fail(t, "could not set field value for: " + repository, false); } } } @@ -563,7 +563,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { repositoryUserNameEditor.setStringValue(repository.getUserName()); repositoryPasswordEditor.setStringValue(repository.getPassword()); } catch (Throwable t) { - MylarStatusHandler.fail(t, "could not set field value for: " + repository, false); + StatusManager.fail(t, "could not set field value for: " + repository, false); } } else { oldUsername = ""; @@ -953,7 +953,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { try { super.refreshValidState(); } catch (Exception e) { - MylarStatusHandler.log(e, "problem refreshing password field"); + StatusManager.log(e, "problem refreshing password field"); } } @@ -1170,7 +1170,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage { } }); } catch (InvocationTargetException e) { - MylarStatusHandler.fail(e.getCause(), "Internal error validating repository", true); + StatusManager.fail(e.getCause(), "Internal error validating repository", true); return; } catch (InterruptedException e) { // canceled 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 75724dfa8..129897dff 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 @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; @@ -63,7 +63,7 @@ public class NewTaskWizard extends Wizard implements INewWizard { final ITaskDataHandler taskDataHandler = (ITaskDataHandler) connector.getTaskDataHandler(); if (taskDataHandler == null) { - MylarStatusHandler.displayStatus("Error creating new task", new RepositoryStatus(IStatus.ERROR, + 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.")); return false; } @@ -90,9 +90,9 @@ public class NewTaskWizard extends Wizard implements INewWizard { getContainer().run(true, true, runnable); } catch (InvocationTargetException e) { if (e.getCause() instanceof CoreException) { - MylarStatusHandler.displayStatus("Error creating new task", ((CoreException) e.getCause()).getStatus()); + StatusManager.displayStatus("Error creating new task", ((CoreException) e.getCause()).getStatus()); } else { - MylarStatusHandler.fail(e.getCause(), "Error creating new task", true); + StatusManager.fail(e.getCause(), "Error creating new task", true); } return false; } catch (InterruptedException e) { diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java index d131ce4a2..6584b0d4b 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracWebClient.java @@ -40,7 +40,7 @@ import org.apache.commons.httpclient.cookie.CookiePolicy; import org.apache.commons.httpclient.methods.GetMethod; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.model.TracComponent; import org.eclipse.mylyn.internal.trac.core.model.TracMilestone; import org.eclipse.mylyn.internal.trac.core.model.TracPriority; @@ -271,7 +271,7 @@ public class TracWebClient extends AbstractTracClient { ticket.putBuiltinValue(fields[i], parseTicketValue(t.nextToken())); } } catch (NumberFormatException e) { - MylarStatusHandler.log(e, "Error parsing response: " + line); + StatusManager.log(e, "Error parsing response: " + line); } } } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java index f965ba872..2428ef71e 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracXmlRpcClient.java @@ -24,7 +24,7 @@ import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.model.TracAttachment; import org.eclipse.mylyn.internal.trac.core.model.TracComment; import org.eclipse.mylyn.internal.trac.core.model.TracComponent; @@ -520,10 +520,10 @@ public class TracXmlRpcClient extends AbstractTracClient { attribute.value = (value instanceof Integer) ? (Integer) value : Integer.parseInt((String) value); attributes.add(attribute); } catch (ClassCastException e) { - MylarStatusHandler.log(e, "Invalid response from Trac repository for attribute type: '" + attributeType + StatusManager.log(e, "Invalid response from Trac repository for attribute type: '" + attributeType + "'"); } catch (NumberFormatException e) { - MylarStatusHandler.log(e, "Invalid response from Trac repository for attribute type: '" + attributeType + StatusManager.log(e, "Invalid response from Trac repository for attribute type: '" + attributeType + "'"); } } @@ -567,7 +567,7 @@ public class TracXmlRpcClient extends AbstractTracClient { try { in.close(); } catch (IOException e) { - MylarStatusHandler.fail(e, "Error closing attachment stream", false); + StatusManager.fail(e, "Error closing attachment stream", false); } } } diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java index 9b7ee3715..0172f90f8 100644 --- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java +++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/model/TracSearch.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter.CompareOperator; @@ -146,7 +146,7 @@ public class TracSearch { sb.append(URLEncoder.encode(filter.getOperator().getQueryValue(), ITracClient.CHARSET)); sb.append(URLEncoder.encode(value, ITracClient.CHARSET)); } catch (UnsupportedEncodingException e) { - MylarStatusHandler.log(e, "Unexpected exception while decoding URL"); + StatusManager.log(e, "Unexpected exception while decoding URL"); } } } @@ -173,7 +173,7 @@ public class TracSearch { addFilter(key, value); } } catch (UnsupportedEncodingException e) { - MylarStatusHandler.log(e, "Unexpected exception while decoding URL"); + StatusManager.log(e, "Unexpected exception while decoding URL"); } } } diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF index 63e272452..007dca6c9 100644 --- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.mylyn.tasks.core, org.eclipse.search, org.eclipse.mylyn.trac.core, - org.eclipse.mylyn, + org.eclipse.mylyn.monitor.core, org.eclipse.ui.editors, org.eclipse.jface.text, org.eclipse.core.resources, diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java index 328280719..56623296c 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracHyperlinkUtil.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskHyperlink; @@ -204,7 +204,7 @@ public class TracHyperlinkUtil { url += "?new_path=" + URLEncoder.encode(new_path, "UTF-8"); url += "&old_path=" + URLEncoder.encode(old_path, "UTF-8"); } catch (UnsupportedEncodingException e) { - MylarStatusHandler.fail(e, "Unexpected exception", false); + StatusManager.fail(e, "Unexpected exception", false); continue; } if (new_rev != null) { diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java index 08a64bb91..249fa1c5d 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java @@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.trac.ui; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery; import org.eclipse.mylyn.internal.trac.core.TracTask; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; @@ -109,7 +109,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer { createQueryHitElement(hit, doc, node); } } catch (Exception e) { - MylarStatusHandler.log(e, e.getMessage()); + StatusManager.log(e, e.getMessage()); } } parent.appendChild(node); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java index 02ff72a0e..cc31971c2 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracUiPlugin.java @@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.trac.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -62,7 +62,7 @@ public class TracUiPlugin extends AbstractUIPlugin { public static void handleTracException(IStatus status) { if (status.getCode() == IStatus.ERROR) { - MylarStatusHandler.log(status); + StatusManager.log(status); ErrorDialog.openError(null, TITLE_MESSAGE_DIALOG, null, status); } else if (status.getCode() == IStatus.INFO) { ErrorDialog.openError(null, TITLE_MESSAGE_DIALOG, null, status); diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java index addac39b5..5e83c1c58 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java @@ -7,7 +7,7 @@ *******************************************************************************/ package org.eclipse.mylyn.internal.trac.ui.editor; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector; import org.eclipse.mylyn.internal.trac.core.TracTask; @@ -71,7 +71,7 @@ public class TracTaskEditorFactory implements ITaskEditorFactory { try { return new RepositoryTaskEditorInput(repository, tracTask.getHandleIdentifier(), tracTask.getTaskUrl(), tracTask.getTaskId()); } catch (Exception e) { - MylarStatusHandler.fail(e, "Could not create Trac editor input", true); + StatusManager.fail(e, "Could not create Trac editor input", true); } return null; } 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 9efac9f7c..3c5477eb5 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 @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.internal.trac.core.TracCorePlugin; import org.eclipse.mylyn.internal.trac.core.TracException; @@ -178,7 +178,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage { if (field != null) { field.setFilter(filter); } else { - MylarStatusHandler.log("Ignoring invalid search filter: " + filter, this); + StatusManager.log("Ignoring invalid search filter: " + filter, this); } } } diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java index 7d327795c..77c10c964 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Set; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.mylyn.core.MylarStatusHandler; +import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.trac.core.ITracClient; import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery; import org.eclipse.mylyn.internal.trac.core.model.TracSearch; @@ -113,7 +113,7 @@ public class TracQueryWizardPage extends WizardPage { if (field != null) { showSearchField(field, filter); } else { - MylarStatusHandler.log("Ignoring invalid search filter: " + filter, this); + StatusManager.log("Ignoring invalid search filter: " + filter, this); } } } |