NEW - bug 212209: provide a flexible bug reporting facility
https://bugs.eclipse.org/bugs/show_bug.cgi?id=212209
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
index 930e1b7..5d7ffdb 100644
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
+++ b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/collectors/FocusedUiUsageAnalysisCollector.java
@@ -19,8 +19,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.commons.core.DateUtil;
+import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin;
import org.eclipse.mylyn.internal.monitor.usage.ReportGenerator;
import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction;
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
index c7759a6..1debfe6 100644
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
+++ b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/EclipseUsageSummaryAction.java
@@ -19,9 +19,9 @@
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.jface.action.IAction;
-import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.monitor.core.collection.CommandUsageCollector;
import org.eclipse.mylyn.internal.monitor.core.collection.DelegatingUsageCollector;
import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
diff --git a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
index 74f6f38..6398269 100644
--- a/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
+++ b/org.eclipse.mylyn.monitor.reports/src/org/eclipse/mylyn/internal/monitor/reports/ui/actions/FocusedUiUserAnalysisAction.java
@@ -15,8 +15,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
-import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
import org.eclipse.mylyn.internal.monitor.reports.MonitorReportsPlugin;
import org.eclipse.mylyn.internal.monitor.reports.collectors.FocusedUiUsageAnalysisCollector;
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
index 0b71f23..41b4919 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
@@ -41,7 +41,7 @@
* @author Mik Kersten
* @author Ken Sueda (XML serialization)
*
- * TODO: use buffered output stream for better performance?
+ * TODO: use buffered output stream for better performance?
*/
public class InteractionEventLogger extends AbstractMonitorLog implements IInteractionEventListener {
@@ -240,7 +240,7 @@
res.append(ENDL);
return res.toString();
} catch (Throwable t) {
- StatusHandler.fail(t, "could not write event", false);
+ StatusHandler.log(new Status(IStatus.ERROR, UiUsageMonitorPlugin.PLUGIN_ID, "Could not write event", t));
return "";
}
}
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorFileRolloverJob.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorFileRolloverJob.java
index f28e92c..80bed6a 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorFileRolloverJob.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorFileRolloverJob.java
@@ -8,7 +8,6 @@
package org.eclipse.mylyn.internal.monitor.usage;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -187,10 +186,9 @@
}
zipFileStream.closeEntry();
zipFileStream.close();
- } catch (FileNotFoundException e) {
- StatusHandler.fail(e, "Mylyn monitor log rollover failed", true);
} catch (IOException e) {
- StatusHandler.fail(e, "Mylyn monitor log rollover failed", true);
+ StatusHandler.fail(new Status(IStatus.ERROR, UiUsageMonitorPlugin.PLUGIN_ID,
+ "Mylyn monitor log rollover failed", e));
}
}
@@ -224,8 +222,9 @@
page.openEditor(input, UsageSummaryReportEditorPart.ID);
}
- } catch (PartInitException e1) {
- StatusHandler.fail(e1, "Could not show usage summary", true);
+ } catch (PartInitException e) {
+ StatusHandler.fail(new Status(IStatus.ERROR, UiUsageMonitorPlugin.PLUGIN_ID,
+ "Could not show usage summary", e));
}
}
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/UiUsageMonitorPlugin.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/UiUsageMonitorPlugin.java
index e5ead78..9532254 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/UiUsageMonitorPlugin.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/UiUsageMonitorPlugin.java
@@ -733,7 +733,6 @@
// private MonitorUsageExtensionPointReader thisReader = new
// MonitorUsageExtensionPointReader();
- @SuppressWarnings("deprecation")
public void initExtensions() {
try {
if (!extensionsRead) {
@@ -752,13 +751,14 @@
readMonitors(element);
}
}
- customizingPlugin = extension.getNamespace();
+ customizingPlugin = extension.getContributor().getName();
}
extensionsRead = true;
}
}
} catch (Throwable t) {
- StatusHandler.fail(t, "could not read monitor extension", false);
+ StatusHandler.log(new Status(IStatus.ERROR, UiUsageMonitorPlugin.PLUGIN_ID,
+ "Could not read monitor extension", t));
}
}
diff --git a/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/actions/OpenWikiPageAction.java b/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/actions/OpenWikiPageAction.java
index 570247a..7f1b1e9 100644
--- a/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/actions/OpenWikiPageAction.java
+++ b/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/actions/OpenWikiPageAction.java
@@ -21,7 +21,7 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.commons.core.StatusHandler;
+import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
import org.eclipse.mylyn.internal.trac.core.AbstractWikiHandler;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
import org.eclipse.mylyn.internal.trac.core.model.TracWikiPage;
@@ -82,7 +82,7 @@
OpenWikiPageSelectionDialog.this.close();
}
});
- StatusHandler.displayStatus("Unable to download Wiki page names", e.getStatus());
+ TasksUiInternal.displayStatus("Unable to download Wiki page names", e.getStatus());
}
return Status.OK_STATUS;
}
@@ -278,11 +278,11 @@
}
});
} else {
- StatusHandler.displayStatus("Unable to open wiki page", new Status(IStatus.ERROR,
+ TasksUiInternal.displayStatus("Unable to open wiki page", new Status(IStatus.ERROR,
TracWikiPlugin.PLUGIN_ID, "Unable to retrieve wiki page " + pageName));
}
} catch (final CoreException e) {
- StatusHandler.displayStatus("Unable to open wiki page", e.getStatus());
+ TasksUiInternal.displayStatus("Unable to open wiki page", e.getStatus());
} finally {
monitor.done();
}
diff --git a/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/editor/TracWikiPageEditor.java b/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/editor/TracWikiPageEditor.java
index bb181d3..f93378e 100644
--- a/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/editor/TracWikiPageEditor.java
+++ b/org.eclipse.mylyn.trac.wiki/src/org/eclipse/mylyn/internal/trac/wiki/editor/TracWikiPageEditor.java
@@ -31,6 +31,7 @@
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTextViewerConfiguration;
+import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.model.TracWikiPage;
import org.eclipse.mylyn.internal.trac.ui.editor.TracRenderingEngine;
@@ -320,7 +321,7 @@
monitor);
jobStatus = Status.OK_STATUS;
} catch (CoreException e) {
- StatusHandler.displayStatus("Submit failed", e.getStatus());
+ TasksUiInternal.displayStatus("Submit failed", e.getStatus());
jobStatus = e.getStatus();
} finally {
monitor.done();
@@ -536,12 +537,12 @@
if (newPage != null) {
((TracWikiPageEditorInput) getEditorInput()).setPage(newPage);
} else {
- StatusHandler.displayStatus("Download failed", new Status(IStatus.ERROR,
+ TasksUiInternal.displayStatus("Download failed", new Status(IStatus.ERROR,
TracCorePlugin.PLUGIN_ID, "Unable to retrieve wiki page "
+ page.getPageInfo().getPageName()));
}
} catch (CoreException e) {
- StatusHandler.displayStatus("Download failed", e.getStatus());
+ TasksUiInternal.displayStatus("Download failed", e.getStatus());
} finally {
monitor.done();
}
