Moved monitor UI back.
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif b/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
new file mode 100644
index 0000000..51e703b
--- /dev/null
+++ b/org.eclipse.mylyn.monitor.reports/icons/eview16/folder.gif
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif b/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
new file mode 100644
index 0000000..3ea4ad7
--- /dev/null
+++ b/org.eclipse.mylyn.monitor.reports/icons/eview16/monitor.gif
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.reports/plugin.xml b/org.eclipse.mylyn.monitor.reports/plugin.xml
index 832f010..0542cda 100644
--- a/org.eclipse.mylyn.monitor.reports/plugin.xml
+++ b/org.eclipse.mylyn.monitor.reports/plugin.xml
@@ -2,7 +2,86 @@
<?eclipse version="3.0"?>
<?eclipse version="3.0"?>
<plugin>
-
+ <extension point = "org.eclipse.ui.popupMenus">
+ <viewerContribution
+ id="org.eclipse.mylar.monitor.commands"
+ targetID="org.eclipse.jdt.ui.PackageExplorer">
+ <action
+ label="Mylar Reports: Usage Summary"
+ tooltip="Mylar Reports: Usage Summary"
+ menubarPath="mylar.monitor"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
+ class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
+ icon="icons/eview16/monitor.gif"
+ enablesFor="*"/>
+ <action
+ label="Mylar Reports: User Analysis"
+ tooltip="Mylar Reports: User Analysis"
+ menubarPath="mylar.monitor"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
+ class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
+ icon="icons/eview16/monitor.gif"
+ enablesFor="*"/>
+ </viewerContribution>
+ <viewerContribution
+ id="org.eclipse.mylar.monitor.commands"
+ targetID="org.eclipse.ui.views.ResourceNavigator">
+ <action
+ label="Mylar Reports: Usage Summary"
+ tooltip="Mylar Reports: Usage Summary"
+ menubarPath="mylar.monitor"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
+ class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
+ icon="icons/eview16/monitor.gif"
+ enablesFor="*"/>
+ <action
+ label="Mylar Reports: User Analysis"
+ tooltip="Mylar Reports: User Analysis"
+ menubarPath="mylar.monitor"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
+ class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
+ icon="icons/eview16/monitor.gif"
+ enablesFor="*"/>
+ </viewerContribution>
+ </extension>
+
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ icon="icons/eview16/monitor.gif"
+ class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
+ name="Usage Summary"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.monitorSummaryReport"/>
+ <editor
+ icon="icons/eview16/monitor.gif"
+ class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
+ name="User Analysis"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.monitorUsersReport"/>
+ </extension>
+
+ <extension point="org.eclipse.ui.viewActions">
+ <viewContribution
+ id="org.eclipse.mylar.monitor.reports.ui.switchTaskFolder"
+ targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
+ <action
+ class="org.eclipse.mylar.monitor.reports.ui.actions.SwitchTaskDataFolderAction"
+ icon="icons/eview16/folder.gif"
+ id="org.eclipse.mylar.monitor.reports.ui.actions.switchTask"
+ label="Switch Task Data Folder..."
+ menubarPath="context"
+ style="push">
+ </action>
+ </viewContribution>
+ </extension>
+
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ name="Reports"
+ class="org.eclipse.mylar.monitor.reports.preferences.MylarReportsPreferencePage"
+ id="org.eclipse.mylar.monitor.reports"
+ category="org.eclipse.mylar.ui.preferences">
+ </page>
+ </extension>
</plugin>
<!--
diff --git a/org.eclipse.mylyn.sandbox.ui/plugin.xml b/org.eclipse.mylyn.sandbox.ui/plugin.xml
index 83f002a..645a6aa 100644
--- a/org.eclipse.mylyn.sandbox.ui/plugin.xml
+++ b/org.eclipse.mylyn.sandbox.ui/plugin.xml
@@ -50,88 +50,6 @@
</view>
</extension>
-
- <extension point = "org.eclipse.ui.popupMenus">
- <viewerContribution
- id="org.eclipse.mylar.monitor.commands"
- targetID="org.eclipse.jdt.ui.PackageExplorer">
- <action
- label="Mylar Reports: Usage Summary"
- tooltip="Mylar Reports: Usage Summary"
- menubarPath="mylar.monitor"
- id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
- class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
- icon="icons/eview16/monitor.gif"
- enablesFor="*"/>
- <action
- label="Mylar Reports: User Analysis"
- tooltip="Mylar Reports: User Analysis"
- menubarPath="mylar.monitor"
- id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
- class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
- icon="icons/eview16/monitor.gif"
- enablesFor="*"/>
- </viewerContribution>
- <viewerContribution
- id="org.eclipse.mylar.monitor.commands"
- targetID="org.eclipse.ui.views.ResourceNavigator">
- <action
- label="Mylar Reports: Usage Summary"
- tooltip="Mylar Reports: Usage Summary"
- menubarPath="mylar.monitor"
- id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
- class="org.eclipse.mylar.monitor.reports.ui.actions.UsageSummaryAction"
- icon="icons/eview16/monitor.gif"
- enablesFor="*"/>
- <action
- label="Mylar Reports: User Analysis"
- tooltip="Mylar Reports: User Analysis"
- menubarPath="mylar.monitor"
- id="org.eclipse.mylar.monitor.reports.ui.actions.ComputeSummaryAction"
- class="org.eclipse.mylar.monitor.reports.ui.actions.UserAnalysisAction"
- icon="icons/eview16/monitor.gif"
- enablesFor="*"/>
- </viewerContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.editors">
- <editor
- icon="icons/eview16/monitor.gif"
- class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
- name="Usage Summary"
- id="org.eclipse.mylar.monitor.reports.ui.actions.monitorSummaryReport"/>
- <editor
- icon="icons/eview16/monitor.gif"
- class="org.eclipse.mylar.monitor.reports.ui.views.UsageStatsEditorPart"
- name="User Analysis"
- id="org.eclipse.mylar.monitor.reports.ui.actions.monitorUsersReport"/>
- </extension>
-
- <extension point="org.eclipse.ui.viewActions">
- <viewContribution
- id="org.eclipse.mylar.monitor.reports.ui.switchTaskFolder"
- targetID="org.eclipse.mylar.tasks.ui.views.TaskListView">
- <action
- class="org.eclipse.mylar.monitor.reports.ui.actions.SwitchTaskDataFolderAction"
- icon="icons/eview16/folder.gif"
- id="org.eclipse.mylar.monitor.reports.ui.actions.switchTask"
- label="Switch Task Data Folder..."
- menubarPath="context"
- style="push">
- </action>
- </viewContribution>
- </extension>
-
- <extension point="org.eclipse.ui.preferencePages">
- <page
- name="Reports"
- class="org.eclipse.mylar.monitor.reports.preferences.MylarReportsPreferencePage"
- id="org.eclipse.mylar.monitor.reports"
- category="org.eclipse.mylar.ui.preferences">
- </page>
- </extension>
-
<!--
<provider
markupProviderClass="org.eclipse.mylar.sandbox.viz.MylarJavaMarkupProvider"
