This commit was manufactured by cvs2svn to create tag 'Root_e_3_4_m_3_x'.

Sprout from master 2009-05-14 00:32:58 UTC spingel 'NEW - bug 276012: move discovery plug-ins out of sandbox'
Delete:
    org.eclipse.mylyn.commons.core/.classpath
    org.eclipse.mylyn.commons.core/.cvsignore
    org.eclipse.mylyn.commons.core/.project
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.core/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.core/about.html
    org.eclipse.mylyn.commons.core/build.properties
    org.eclipse.mylyn.commons.core/plugin.properties
    org.eclipse.mylyn.commons.core/plugin.xml
    org.eclipse.mylyn.commons.core/schema/errorReporters.exsd
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/AbstractErrorReporter.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DateUtil.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/StatusHandler.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ErrorReporterManager.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ICommonsCoreConstants.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/XmlStringConverter.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ZipFileUtil.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/CommonMessages.java
    org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/messages.properties
    org.eclipse.mylyn.commons.net/.classpath
    org.eclipse.mylyn.commons.net/.cvsignore
    org.eclipse.mylyn.commons.net/.project
    org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.net/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.net/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.net/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.net/about.html
    org.eclipse.mylyn.commons.net/build.properties
    org.eclipse.mylyn.commons.net/plugin.properties
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AbstractWebLocation.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationCredentials.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationType.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlStreamTokenizer.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlTag.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/IProxyProvider.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/Policy.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/UnsupportedRequestException.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebLocation.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebRequest.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebUtil.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/AuthenticatedProxy.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CloneableHostConfiguration.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CommonsNetPlugin.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/InfiniteSubProgressMonitor.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/Messages.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingInputStream.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingOutputStream.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingProtocolSocketFactory.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingSslProtocolSocketFactory.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ProgressMonitorInputStream.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/SslProtocolSocketFactory.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutInputStream.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutOutputStream.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TrustAllTrustManager.java
    org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/messages.properties
    org.eclipse.mylyn.commons.soap/.classpath
    org.eclipse.mylyn.commons.soap/.cvsignore
    org.eclipse.mylyn.commons.soap/.project
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.soap/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.soap/about.html
    org.eclipse.mylyn.commons.soap/about_files/LICENSE
    org.eclipse.mylyn.commons.soap/about_files/NOTICE
    org.eclipse.mylyn.commons.soap/build.properties
    org.eclipse.mylyn.commons.soap/plugin.properties
    org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/commons/soap/SoapRequest.java
    org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AbstractSoapClient.java
    org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AxisHttpFault.java
    org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java
    org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/SoapHttpSender.java
    org.eclipse.mylyn.commons.tests/.classpath
    org.eclipse.mylyn.commons.tests/.project
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.tests/about.html
    org.eclipse.mylyn.commons.tests/build.properties
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/AllCommonsTests.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/NoticicationPopupMain.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/SampleNotificationPopup.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/StatusHandlerTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/SslProtocolSocketFactoryTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonsTestUtil.java
    org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java
    org.eclipse.mylyn.commons.ui/.classpath
    org.eclipse.mylyn.commons.ui/.project
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.commons.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.commons.ui/about.html
    org.eclipse.mylyn.commons.ui/build.properties
    org.eclipse.mylyn.commons.ui/icons/elcl16/blank.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/clearDot.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall-small.png
    org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall.png
    org.eclipse.mylyn.commons.ui/icons/elcl16/delete.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/expandall-small.png
    org.eclipse.mylyn.commons.ui/icons/elcl16/expandall.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/filter-complete.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/filter-priority.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/refresh-small.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/refresh.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/remove.gif
    org.eclipse.mylyn.commons.ui/icons/elcl16/warning.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/calendar.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/capture-fit.png
    org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen-bold.png
    org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen.png
    org.eclipse.mylyn.commons.ui/icons/etool16/clear.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/content-assist-separator.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/copy.png
    org.eclipse.mylyn.commons.ui/icons/etool16/cut.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/edit.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/find-clear-disabled.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/find-clear.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/find.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/go-into.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/go-up.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/grouping.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/link-editor.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/maximize.png
    org.eclipse.mylyn.commons.ui/icons/etool16/open-browser.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/overlay-repository.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/person-me-narrow.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/person-me.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/person-narrow.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/person.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/presentation.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/preview-web.png
    org.eclipse.mylyn.commons.ui/icons/etool16/schedule-day.png
    org.eclipse.mylyn.commons.ui/icons/etool16/schedule-week.png
    org.eclipse.mylyn.commons.ui/icons/etool16/sort-down-gray.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/sort-down.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/sort-up-gray.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/sort-up.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-down.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-right.gif
    org.eclipse.mylyn.commons.ui/icons/etool16/view-filter.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/focus-view.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/more.png
    org.eclipse.mylyn.commons.ui/icons/eview16/notification-close-active.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/notification-close.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-completed.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-conflict.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-context.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-due.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-multiple.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-new.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing-new.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-overdue.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming-new.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-outgoing.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/1.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/2.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/3.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/4.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/5.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/6.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/7.png
    org.eclipse.mylyn.commons.ui/icons/eview16/progress/8.png
    org.eclipse.mylyn.commons.ui/icons/eview16/status-conflict.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/status-normal.gif
    org.eclipse.mylyn.commons.ui/icons/eview16/status-server-context.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/browser-small.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/calendar-small.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/complete.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/file-image.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/priority-1.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/priority-2.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/priority-3.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/priority-4.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/priority-5.gif
    org.eclipse.mylyn.commons.ui/icons/obj16/question.gif
    org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-blank.gif
    org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-complete.gif
    org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-local-task.gif
    org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-warning.gif
    org.eclipse.mylyn.commons.ui/icons/ovr16/solid-white.gif
    org.eclipse.mylyn.commons.ui/icons/wizban/banner-export.gif
    org.eclipse.mylyn.commons.ui/icons/wizban/banner-import.gif
    org.eclipse.mylyn.commons.ui/icons/wizban/banner-screenshot.png
    org.eclipse.mylyn.commons.ui/icons/wizban/keylock.gif
    org.eclipse.mylyn.commons.ui/plugin.properties
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorCanvas.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorSelectionWindow.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CommonsUiPlugin.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeContainerImageDescriptor.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeElementImageDescriptor.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeSyncImageDescriptor.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/Messages.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/NotificationPopupColors.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SwtUtil.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskListImageDescriptor.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/messages.properties
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractFilteredTree.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotification.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotificationPopup.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AdaptiveRefreshPolicy.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonColors.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFonts.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFormUtil.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonImages.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonTextSupport.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonThemes.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonUiUtil.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonsUiUtil.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePicker.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePickerPanel.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DateSelectionDialog.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DelayedRefreshJob.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientCanvas.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ICoreRunnable.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/IFilteredTreeListener.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScalingHyperlink.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScreenshotCreationPage.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SelectionProviderAdapter.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SubstringPatternFilter.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchActionSupport.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchUtil.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/EditorBusyIndicator.java
    org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/IBusyEditor.java
    org.eclipse.mylyn.monitor.core/.classpath
    org.eclipse.mylyn.monitor.core/.cvsignore
    org.eclipse.mylyn.monitor.core/.project
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.monitor.core/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.monitor.core/META-INF/MANIFEST.MF
    org.eclipse.mylyn.monitor.core/about.html
    org.eclipse.mylyn.monitor.core/build.properties
    org.eclipse.mylyn.monitor.core/plugin.properties
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/IMonitorCoreConstants.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/CommandUsageCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DelegatingUsageCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageScanner.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionByTypeSummary.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventClassifier.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventComparator.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventSummary.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventUtil.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/Messages.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/PercentUsageComparator.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/SummaryCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/ViewUsageCollector.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/messages.properties
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/AbstractMonitorLog.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/IInteractionEventListener.java
    org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/InteractionEvent.java
    org.eclipse.mylyn.monitor.tests/.classpath
    org.eclipse.mylyn.monitor.tests/.cvsignore
    org.eclipse.mylyn.monitor.tests/.project
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.api.tools.prefs
    org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.monitor.tests/META-INF/MANIFEST.MF
    org.eclipse.mylyn.monitor.tests/about.html
    org.eclipse.mylyn.monitor.tests/build.properties
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/AllMonitorReportTests.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/ContextParsingTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/DataOverviewCollectorTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/FileTool.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/AllMonitorTests.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/CheckActivityJobTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionEventExternalizationTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionLoggerTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MockSelectionMonitor.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorPackagingTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTestsPlugin.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/StatisticsLoggingTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/AllMonitorUsageTests.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/DefaultPreferenceConfigTest.java
    org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/FileDisplayDialogTest.java
    org.eclipse.mylyn.monitor.tests/test-log.xml
    org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip
    org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip
    org.eclipse.mylyn.monitor.tests/testdata/monitor-log.xml
    org.eclipse.mylyn.monitor.tests/testdata/usage-parsing.zip
    org.eclipse.mylyn.monitor.ui/.classpath
    org.eclipse.mylyn.monitor.ui/.cvsignore
    org.eclipse.mylyn.monitor.ui/.project
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn.monitor.ui/META-INF/MANIFEST.MF
    org.eclipse.mylyn.monitor.ui/about.html
    org.eclipse.mylyn.monitor.ui/build-user.xml
    org.eclipse.mylyn.monitor.ui/build.properties
    org.eclipse.mylyn.monitor.ui/plugin.properties
    org.eclipse.mylyn.monitor.ui/plugin.xml
    org.eclipse.mylyn.monitor.ui/schema/user.exsd
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActionExecutionMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityChangeMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/BrowserMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IActivityManagerCallback.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IMonitoredWindow.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/KeybindingCommandMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MenuCommandMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/Messages.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PerspectiveChangeMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PreferenceChangeMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ShellLifecycleListener.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WindowChangeMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WorkbenchUserActivityMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/messages.properties
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractCommandMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractEditorTracker.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractPartTracker.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserActivityMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserInteractionMonitor.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActionExecutionListener.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActivityContextManager.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IMonitorLifecycleListener.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IUserAttentionListener.java
    org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/MonitorUi.java
    org.eclipse.mylyn/.classpath
    org.eclipse.mylyn/.cvsignore
    org.eclipse.mylyn/.project
    org.eclipse.mylyn/.settings/org.eclipse.core.resources.prefs
    org.eclipse.mylyn/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.mylyn/.settings/org.eclipse.jdt.ui.prefs
    org.eclipse.mylyn/.settings/org.eclipse.ltk.core.refactoring.prefs
    org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasklist.prefs
    org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasks.ui.prefs
    org.eclipse.mylyn/.settings/org.eclipse.pde.prefs
    org.eclipse.mylyn/META-INF/MANIFEST.MF
    org.eclipse.mylyn/about.html
    org.eclipse.mylyn/about.ini
    org.eclipse.mylyn/build.properties
    org.eclipse.mylyn/feature.gif
    org.eclipse.mylyn/plugin.properties
diff --git a/org.eclipse.mylyn.commons.core/.classpath b/org.eclipse.mylyn.commons.core/.classpath
deleted file mode 100644
index 41e559d..0000000
--- a/org.eclipse.mylyn.commons.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/runtime/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.commons.core/.cvsignore b/org.eclipse.mylyn.commons.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.commons.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.commons.core/.project b/org.eclipse.mylyn.commons.core/.project
deleted file mode 100644
index 75e5ef5..0000000
--- a/org.eclipse.mylyn.commons.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 11e50b7..0000000
--- a/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,69 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.commons.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.commons.core,
- org.eclipse.mylyn.internal.commons.core;x-internal:=true,
- org.eclipse.mylyn.internal.provisional.commons.core;
-  x-friends:="org.eclipse.mylyn,
-   org.eclipse.mylyn.bugzilla.core,
-   org.eclipse.mylyn.bugzilla.ide,
-   org.eclipse.mylyn.bugzilla.tests,
-   org.eclipse.mylyn.bugzilla.ui,
-   org.eclipse.mylyn.commons.core,
-   org.eclipse.mylyn.commons.net,
-   org.eclipse.mylyn.commons.tests,
-   org.eclipse.mylyn.commons.ui,
-   org.eclipse.mylyn.compatibility,
-   org.eclipse.mylyn.context.core,
-   org.eclipse.mylyn.context.tests,
-   org.eclipse.mylyn.context.ui,
-   org.eclipse.mylyn.help.ui,
-   org.eclipse.mylyn.ide.ant,
-   org.eclipse.mylyn.ide.tests,
-   org.eclipse.mylyn.ide.ui,
-   org.eclipse.mylyn.java.tasks,
-   org.eclipse.mylyn.java.tests,
-   org.eclipse.mylyn.java.ui,
-   org.eclipse.mylyn.jira.core,
-   org.eclipse.mylyn.jira.tests,
-   org.eclipse.mylyn.jira.ui,
-   org.eclipse.mylyn.monitor.core,
-   org.eclipse.mylyn.monitor.reports,
-   org.eclipse.mylyn.monitor.tests,
-   org.eclipse.mylyn.monitor.ui,
-   org.eclipse.mylyn.monitor.usage,
-   org.eclipse.mylyn.pde.ui,
-   org.eclipse.mylyn.resources.tests,
-   org.eclipse.mylyn.resources.ui,
-   org.eclipse.mylyn.sandbox.dev,
-   org.eclipse.mylyn.sandbox.tests,
-   org.eclipse.mylyn.sandbox.ui,
-   org.eclipse.mylyn.tasks.bugs,
-   org.eclipse.mylyn.tasks.core,
-   org.eclipse.mylyn.tasks.tests,
-   org.eclipse.mylyn.tasks.ui,
-   org.eclipse.mylyn.team.cvs,
-   org.eclipse.mylyn.team.tests,
-   org.eclipse.mylyn.team.ui,
-   org.eclipse.mylyn.tests,
-   org.eclipse.mylyn.trac.core,
-   org.eclipse.mylyn.trac.tests,
-   org.eclipse.mylyn.trac.ui,
-   org.eclipse.mylyn.trac.wiki,
-   org.eclipse.mylyn.web.tasks,
-   org.eclipse.mylyn.web.ui,
-   org.eclipse.mylyn.wikitext.tracwiki.core,
-   org.eclipse.mylyn.wikitext.tracwiki.ui,
-   org.eclipse.mylyn.wikitext.twiki.core,
-   org.eclipse.mylyn.wikitext.twiki.ui,
-   org.eclipse.mylyn.wikitext.ui,
-   org.eclipse.mylyn.xplanner.core,
-   org.eclipse.mylyn.xplanner.tests,
-   org.eclipse.mylyn.xplanner.ui"
-Require-Bundle: org.eclipse.core.runtime
-Bundle-ClassPath: .
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.commons.core/about.html b/org.eclipse.mylyn.commons.core/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons.core/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.core/build.properties b/org.eclipse.mylyn.commons.core/build.properties
deleted file mode 100644
index 4e2dae3..0000000
--- a/org.eclipse.mylyn.commons.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-bin.includes = about.html,\
-               META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.commons.core/plugin.properties b/org.eclipse.mylyn.commons.core/plugin.properties
deleted file mode 100644
index 836c143..0000000
--- a/org.eclipse.mylyn.commons.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.commons.core
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Commons Core
diff --git a/org.eclipse.mylyn.commons.core/plugin.xml b/org.eclipse.mylyn.commons.core/plugin.xml
deleted file mode 100644
index c1b32fb..0000000
--- a/org.eclipse.mylyn.commons.core/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="errorReporters" name="Error Reporters" schema="schema/errorReporters.exsd"/>
-</plugin>
diff --git a/org.eclipse.mylyn.commons.core/schema/errorReporters.exsd b/org.eclipse.mylyn.commons.core/schema/errorReporters.exsd
deleted file mode 100644
index e1c5860..0000000
--- a/org.eclipse.mylyn.commons.core/schema/errorReporters.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.commons.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.commons.core" id="errorReporters" name="Error Reporters"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="errorReporter"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="errorReporter">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.internal.bugzilla.ide.AbstractErrorReporter:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/AbstractErrorReporter.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/AbstractErrorReporter.java
deleted file mode 100644
index c9f7edf..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/AbstractErrorReporter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.core;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This class is intended to be sub-classes by clients.
- * 
- * @author Steffen Pingel
- * @since 3.0
- */
-public abstract class AbstractErrorReporter {
-
-	/**
-	 * @since 3.0
-	 */
-	public static int PRIORITY_NONE = -1;
-
-	/**
-	 * @since 3.0
-	 */
-	public static int PRIORITY_LOW = 10;
-
-	/**
-	 * @since 3.0
-	 */
-	public static int PRIORITY_DEFAULT = 100;
-
-	/**
-	 * @since 3.0
-	 */
-	public static int PRIORITY_HIGH = 1000;
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract int getPriority(IStatus status);
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract void handle(IStatus status);
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java
deleted file mode 100644
index c29de39..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/CoreUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.core;
-
-/**
- * @since 3.0
- * @author Steffen Pingel
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class CoreUtil {
-
-	/**
-	 * @since 3.0
-	 */
-	public static final boolean TEST_MODE;
-
-	static {
-		String application = System.getProperty("eclipse.application", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		if (application.length() > 0) {
-			TEST_MODE = application.endsWith("testapplication"); //$NON-NLS-1$
-		} else {
-			// eclipse 3.3 does not the eclipse.application property
-			String commands = System.getProperty("eclipse.commands", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			TEST_MODE = commands.contains("testapplication\n"); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DateUtil.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DateUtil.java
deleted file mode 100644
index b2849d7..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/DateUtil.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.core;
-
-import java.util.Calendar;
-
-/**
- * Used for formatting dates.
- * 
- * @author Mik Kersten
- * @since 3.0
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class DateUtil {
-
-	public static String getIsoFormattedDate(Calendar calendar) {
-		try {
-			int monthInt = (calendar.get(Calendar.MONTH) + 1);
-			String month = "" + monthInt; //$NON-NLS-1$
-			if (monthInt < 10) {
-				month = "0" + month; //$NON-NLS-1$
-			}
-			int dateInt = (calendar.get(Calendar.DATE));
-			String date = "" + dateInt; //$NON-NLS-1$
-			if (dateInt < 10) {
-				date = "0" + date; //$NON-NLS-1$
-			}
-			return calendar.get(Calendar.YEAR) + "-" + month + "-" + date; //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (Exception e) {
-			return "<unresolved date>"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return Time formatted according to: http://www.iso.org/iso/date_and_time_format
-	 */
-	public static String getIsoFormattedDateTime(Calendar calendar) {
-		return getIsoFormattedDate(calendar) + "T" + calendar.get(Calendar.HOUR) + "-" + calendar.get(Calendar.MINUTE) //$NON-NLS-1$ //$NON-NLS-2$
-				+ "-" + calendar.get(Calendar.SECOND); //$NON-NLS-1$
-	}
-
-	/** Returns the time in the format: HHH:MM */
-	public static String getFormattedDurationShort(long duration) {
-		if (duration <= 0) {
-			return "00:00"; //$NON-NLS-1$
-		}
-
-		long totalMinutes = duration / 1000 / 60;
-		long remainderMinutes = totalMinutes % 60;
-		long totalHours = totalMinutes / 60;
-
-		String hourString = "" + totalHours; //$NON-NLS-1$
-		String minuteString = "" + remainderMinutes; //$NON-NLS-1$
-
-		if (totalHours < 10) {
-			hourString = "0" + hourString; //$NON-NLS-1$
-		}
-
-		if (remainderMinutes < 10) {
-			minuteString = "0" + remainderMinutes; //$NON-NLS-1$
-		}
-
-		return hourString + ":" + minuteString; //$NON-NLS-1$
-	}
-
-	/**
-	 * @deprecated The result of this method is not properly localized.
-	 */
-	@Deprecated
-	public static String getFormattedDuration(long duration, boolean includeSeconds) {
-		long seconds = duration / 1000;
-		long minutes = 0;
-		long hours = 0;
-		// final long SECOND = 1000;
-		final long MIN = 60;
-		final long HOUR = MIN * 60;
-		String formatted = ""; //$NON-NLS-1$
-
-		String hour = ""; //$NON-NLS-1$
-		String min = ""; //$NON-NLS-1$
-		String sec = ""; //$NON-NLS-1$
-		if (seconds >= HOUR) {
-			hours = seconds / HOUR;
-			if (hours == 1) {
-				hour = hours + " hour "; //$NON-NLS-1$
-			} else if (hours > 1) {
-				hour = hours + " hours "; //$NON-NLS-1$
-			}
-			seconds -= hours * HOUR;
-
-			minutes = seconds / MIN;
-			if (minutes == 1) {
-				min = minutes + " minute "; //$NON-NLS-1$
-			} else if (minutes != 1) {
-				min = minutes + " minutes "; //$NON-NLS-1$
-			}
-			seconds -= minutes * MIN;
-			if (seconds == 1) {
-				sec = seconds + " second"; //$NON-NLS-1$
-			} else if (seconds > 1) {
-				sec = seconds + " seconds"; //$NON-NLS-1$
-			}
-			formatted += hour + min;
-			if (includeSeconds) {
-				formatted += sec;
-			}
-		} else if (seconds >= MIN) {
-			minutes = seconds / MIN;
-			if (minutes == 1) {
-				min = minutes + " minute "; //$NON-NLS-1$
-			} else if (minutes != 1) {
-				min = minutes + " minutes "; //$NON-NLS-1$
-			}
-			seconds -= minutes * MIN;
-			if (seconds == 1) {
-				sec = seconds + " second"; //$NON-NLS-1$
-			} else if (seconds > 1) {
-				sec = seconds + " seconds"; //$NON-NLS-1$
-			}
-			formatted += min;
-			if (includeSeconds) {
-				formatted += sec;
-			}
-		} else {
-			if (seconds == 1) {
-				sec = seconds + " second"; //$NON-NLS-1$
-			} else if (seconds > 1) {
-				sec = seconds + " seconds"; //$NON-NLS-1$
-			}
-			if (includeSeconds) {
-				formatted += sec;
-			}
-		}
-		return formatted;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/StatusHandler.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/StatusHandler.java
deleted file mode 100644
index 0cd37d4..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/StatusHandler.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.core;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Calendar;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.PlatformActivator;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.mylyn.internal.commons.core.ErrorReporterManager;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- * @author Steffen Pingel
- * @since 3.0
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class StatusHandler {
-
-	private static ErrorReporterManager errorReporterManager;
-
-	/**
-	 * Logs <code>status</code> to this bundle's log if a platform is running. Does nothing if no platform is running.
-	 * Plug-ins that require running in Eclipse are encouraged to use their plug-in log.
-	 * 
-	 * @param status
-	 *            status to log
-	 * @since 3.0
-	 */
-	public static void log(IStatus status) {
-		if (InternalPlatform.getDefault() != null && PlatformActivator.getContext() != null) {
-			ILog log = InternalPlatform.getDefault().getLog(PlatformActivator.getContext().getBundle());
-			if (log != null) {
-				log.log(status);
-			}
-		}
-		if (CoreUtil.TEST_MODE) {
-			dumpErrorToConsole(status);
-		}
-	}
-
-	/**
-	 * Logs <code>status</code> to this bundle's log if a platform is running. Forwards <code>status</code> to
-	 * registered status handlers.
-	 * <p>
-	 * Listeners should not block.
-	 * </p>
-	 * 
-	 * @see #log(IStatus)
-	 * @since 3.0
-	 */
-	public static void fail(IStatus status) {
-		log(status);
-		getErrorReporterManager().fail(status);
-	}
-
-	private static synchronized ErrorReporterManager getErrorReporterManager() {
-		if (errorReporterManager == null) {
-			errorReporterManager = new ErrorReporterManager();
-		}
-		return errorReporterManager;
-	}
-
-	private static void dumpErrorToConsole(IStatus status) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("["); //$NON-NLS-1$
-		Calendar now = Calendar.getInstance();
-		sb.append(DateUtil.getIsoFormattedDateTime(now));
-		sb.append("] "); //$NON-NLS-1$
-		sb.append(status.toString() + ", "); //$NON-NLS-1$
-		if (status.getException() != null) {
-			sb.append("Exception:\n"); //$NON-NLS-1$
-			sb.append(printStrackTrace(status.getException()));
-		}
-		System.err.println(sb.toString());
-	}
-
-	private static String printStrackTrace(Throwable t) {
-		StringWriter writer = new StringWriter();
-		t.printStackTrace(new PrintWriter(writer));
-		return writer.toString();
-	}
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ErrorReporterManager.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ErrorReporterManager.java
deleted file mode 100644
index ce2a958..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ErrorReporterManager.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.core;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.AbstractErrorReporter;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-
-/**
- * @author Steffen Pingel
- */
-public class ErrorReporterManager {
-
-	private static final String EXTENSION_ID_ERROR_REPORTERS = "org.eclipse.mylyn.commons.core.errorReporters"; //$NON-NLS-1$
-
-	private static final String ELEMENT_ERROR_REPORTER = "errorReporter"; //$NON-NLS-1$
-
-	private final List<AbstractErrorReporter> errorReporters = new CopyOnWriteArrayList<AbstractErrorReporter>();
-
-	private boolean readExtensions;
-
-	private static final String ELEMENT_CLASS = "class"; //$NON-NLS-1$
-
-	public ErrorReporterManager() {
-	}
-
-	public void addErrorReporter(AbstractErrorReporter errorReporter) {
-		errorReporters.add(errorReporter);
-	}
-
-	public void removeErrorReporter(AbstractErrorReporter errorReporter) {
-		errorReporters.remove(errorReporter);
-	}
-
-	public void fail(IStatus status) {
-		readExtensions();
-
-		int priority = AbstractErrorReporter.PRIORITY_NONE;
-		List<AbstractErrorReporter> interestedReporters = new ArrayList<AbstractErrorReporter>();
-		for (AbstractErrorReporter reporter : errorReporters) {
-			int newPriority = reporter.getPriority(status);
-			if (newPriority > AbstractErrorReporter.PRIORITY_NONE) {
-				if (newPriority > priority) {
-					interestedReporters.clear();
-					interestedReporters.add(reporter);
-					priority = newPriority;
-				} else if (newPriority == priority) {
-					interestedReporters.add(reporter);
-				}
-			}
-		}
-
-		AbstractErrorReporter reporter;
-		if (interestedReporters.isEmpty()) {
-			return;
-		} else if (interestedReporters.size() > 1) {
-			// TODO prompt user?
-			reporter = interestedReporters.get(0);
-		} else {
-			reporter = interestedReporters.get(0);
-		}
-
-		reporter.handle(status);
-	}
-
-	private synchronized void readExtensions() {
-		if (readExtensions) {
-			return;
-		}
-
-		readExtensions = true;
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(EXTENSION_ID_ERROR_REPORTERS);
-		IExtension[] extensions = extensionPoint.getExtensions();
-		for (IExtension extension : extensions) {
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				if (element.getName().equals(ELEMENT_ERROR_REPORTER)) {
-					readErrorReporter(element);
-				}
-			}
-		}
-	}
-
-	private void readErrorReporter(IConfigurationElement element) {
-		try {
-			Object object = element.createExecutableExtension(ELEMENT_CLASS);
-			if (object instanceof AbstractErrorReporter) {
-				errorReporters.add((AbstractErrorReporter) object);
-			} else {
-				StatusHandler.log(new Status(IStatus.WARNING, ICommonsCoreConstants.ID_PLUGIN,
-						"Could not load error reporter extenstion: \"" + object.getClass().getCanonicalName() + "\"" //$NON-NLS-1$ //$NON-NLS-2$
-								+ " does not implement \"" + AbstractErrorReporter.class.getCanonicalName() + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		} catch (CoreException e) {
-			StatusHandler.log(new Status(IStatus.WARNING, ICommonsCoreConstants.ID_PLUGIN,
-					"Could not load error reporter extension", e)); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ICommonsCoreConstants.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ICommonsCoreConstants.java
deleted file mode 100644
index 7d74b1d..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ICommonsCoreConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.core;
-
-/**
- * @author Steffen Pingel
- */
-public interface ICommonsCoreConstants {
-
-	public static String ID_PLUGIN = "org.eclipse.mylyn.commons.core"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/XmlStringConverter.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/XmlStringConverter.java
deleted file mode 100644
index be46bc6..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/XmlStringConverter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.core;
-
-/**
- * @author Ken Sueda
- */
-// XXX should use xerces or some other parser's facilities
-public class XmlStringConverter {
-
-	@Deprecated
-	public static String convertToXmlString(String s) {
-		if (s == null) {
-			return ""; //$NON-NLS-1$
-		}
-		StringBuffer res = new StringBuffer(s.length() + 20);
-		for (int i = 0; i < s.length(); ++i) {
-			appendEscapedChar(res, s.charAt(i));
-		}
-		return res.toString();
-	}
-
-	private static void appendEscapedChar(StringBuffer buffer, char c) {
-		String replacement = getReplacementForSymbol(c);
-		if (replacement != null) {
-			buffer.append('&');
-			buffer.append(replacement);
-			buffer.append(';');
-		} else {
-			buffer.append(c);
-		}
-	}
-
-	private static String getReplacementForSymbol(char c) {
-		switch (c) {
-		case '<':
-			return "lt"; //$NON-NLS-1$
-		case '>':
-			return "gt"; //$NON-NLS-1$
-		case '"':
-			return "quot"; //$NON-NLS-1$
-		case '\'':
-			return "apos"; //$NON-NLS-1$
-		case '&':
-			return "amp"; //$NON-NLS-1$
-		case '\r':
-			return "#x0D"; //$NON-NLS-1$
-		case '\n':
-			return "#x0A"; //$NON-NLS-1$
-		case '\u0009':
-			return "#x09"; //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	@Deprecated
-	public static String convertXmlToString(String string) {
-		StringBuilder result = new StringBuilder(string.length() + 10);
-		for (int i = 0; i < string.length(); ++i) {
-			char xChar = string.charAt(i);
-			if (xChar == '&') {
-				i++;
-				StringBuffer escapeChar = new StringBuffer(10);
-				boolean flag = true;
-				while (flag) {
-					xChar = string.charAt(i++);
-					if (xChar == ';') {
-						flag = false;
-						i--;
-					} else {
-						escapeChar.append(xChar);
-					}
-				}
-				result.append(getReplacementForXml(escapeChar.toString()));
-			} else {
-				result.append(xChar);
-			}
-		}
-		return result.toString();
-	}
-
-	private static char getReplacementForXml(String s) {
-		if (s.equals("lt")) { //$NON-NLS-1$
-			return '<';
-		} else if (s.equals("gt")) { //$NON-NLS-1$
-			return '>';
-		} else if (s.equals("quot")) { //$NON-NLS-1$
-			return '"';
-		} else if (s.equals("apos")) { //$NON-NLS-1$
-			return '\'';
-		} else if (s.equals("amp")) { //$NON-NLS-1$
-			return '&';
-		} else if (s.equals("#x0D")) { //$NON-NLS-1$
-			return '\r';
-		} else if (s.equals("#x0A")) { //$NON-NLS-1$
-			return '\n';
-		} else if (s.equals("#x09")) { //$NON-NLS-1$
-			return '\u0009';
-		}
-		return 0;
-	}
-
-	/**
-	 * @param text
-	 *            string to clean
-	 * @return string with all non valid characters removed, if text is null return null
-	 */
-	public static String cleanXmlString(String text) {
-		if (text == null) {
-			return null;
-		}
-		StringBuilder builder = new StringBuilder(text.length());
-		for (int x = 0; x < text.length(); x++) {
-			char ch = text.charAt(x);
-			if (isValid(ch)) {
-				builder.append(ch);
-			}
-		}
-		return builder.toString();
-	}
-
-	/**
-	 * Return true if character is a valid xml character
-	 * 
-	 * @see http://www.w3.org/TR/REC-xml/
-	 */
-	public static boolean isValid(char ch) {
-		return (0x0A == ch || 0x0D == ch || 0x09 == ch) || (ch >= 0x20 && ch <= 0xD7FF)
-				|| (ch >= 0xE000 && ch <= 0xFFFD) || (ch >= 0x10000 && ch <= 0x10FFFF);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ZipFileUtil.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ZipFileUtil.java
deleted file mode 100644
index b56ed67..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/commons/core/ZipFileUtil.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.core;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-
-/**
- * Contains utility methods for working with zip files
- * 
- * @author Wesley Coelho
- * @author Shawn Minto (Wrote methods that were moved here)
- */
-// FIXME add try/finally blocks that properly close streams
-public class ZipFileUtil {
-
-	/**
-	 * Only unzips files in zip file not directories
-	 * 
-	 * @param zipped
-	 *            file
-	 * @param destPath
-	 *            Destination path
-	 * @return Files that were unzipped
-	 */
-	public static List<File> unzipFiles(File zippedfile, String destPath, IProgressMonitor monitor)
-			throws FileNotFoundException, IOException {
-		ZipFile zipFile = new ZipFile(zippedfile);
-
-		Enumeration<? extends ZipEntry> entries = zipFile.entries();
-		List<File> outputFiles = new ArrayList<File>();
-		File destinationFile = new File(destPath);
-		if (!destinationFile.exists()) {
-			destinationFile.mkdirs();
-		}
-		while (entries.hasMoreElements()) {
-			ZipEntry entry = entries.nextElement();
-			File outputFile = new File(destinationFile, entry.getName());
-			if (entry.isDirectory() && !outputFile.exists()) {
-				outputFile.mkdirs();
-				continue;
-			}
-
-			if (!outputFile.getParentFile().exists()) {
-				outputFile.getParentFile().mkdirs();
-			}
-
-			InputStream inputStream = zipFile.getInputStream(entry);
-			FileOutputStream outStream = new FileOutputStream(outputFile);
-			copyByteStream(inputStream, outStream);
-
-			outputFiles.add(outputFile);
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-		return outputFiles;
-	}
-
-	public static List<File> extactEntries(File zippedFile, List<ZipEntry> entries, String destPath)
-			throws FileNotFoundException, IOException {
-		ZipFile zipFile = new ZipFile(zippedFile);
-		List<File> outputFiles = new ArrayList<File>();
-		for (ZipEntry entry : entries) {
-			if (entry.isDirectory()) {
-				// Assume directories are stored parents first then children.		          
-				(new File(entry.getName())).mkdir();
-				continue;
-			}
-			InputStream inputStream = zipFile.getInputStream(entry);
-			File outputFile = new File(destPath + File.separator + entry.getName());
-			FileOutputStream outStream = new FileOutputStream(outputFile);
-			copyByteStream(inputStream, outStream);
-			outputFiles.add(outputFile);
-		}
-		return outputFiles;
-	}
-
-	public static void copyByteStream(InputStream in, OutputStream out) throws IOException {
-		if (in != null && out != null) {
-			BufferedInputStream inBuffered = new BufferedInputStream(in);
-
-			int bufferSize = 1000;
-			byte[] buffer = new byte[bufferSize];
-
-			int readCount;
-
-			BufferedOutputStream fout = new BufferedOutputStream(out);
-
-			while ((readCount = inBuffered.read(buffer)) != -1) {
-				if (readCount < bufferSize) {
-					fout.write(buffer, 0, readCount);
-				} else {
-					fout.write(buffer);
-				}
-			}
-			fout.flush();
-			fout.close();
-			in.close();
-		}
-	}
-
-	/**
-	 * @param zipFile
-	 *            Destination zipped file
-	 * @param files
-	 *            List of files to add to the zip file
-	 */
-	public static void createZipFile(File zipFile, List<File> files) throws FileNotFoundException, IOException {
-		createZipFile(zipFile, files, null, null);
-	}
-
-	public static void createZipFile(File zipFile, List<File> files, IProgressMonitor monitor)
-			throws FileNotFoundException, IOException {
-		createZipFile(zipFile, files, null, monitor);
-	}
-
-	/**
-	 * @param zipFile
-	 *            Destination zipped file
-	 * @param files
-	 *            List of files to add to the zip file
-	 * @param progressMonitor
-	 *            will report worked(1) to the monitor for each file zipped
-	 * @author Shawn Minto
-	 * @author Wesley Coelho
-	 */
-	public static void createZipFile(File zipFile, List<File> files, String rootPath, IProgressMonitor monitor)
-			throws FileNotFoundException, IOException {
-		if (zipFile.exists()) {
-			zipFile.delete();
-		}
-		if (rootPath == null) {
-			rootPath = ""; //$NON-NLS-1$
-		} else if (!rootPath.endsWith("\\") || !rootPath.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$
-			rootPath += "/"; //$NON-NLS-1$
-		}
-
-		ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(zipFile));
-
-		try {
-
-			for (File file : files) {
-				try {
-					addZipEntry(zipOut, rootPath, file);
-					if (monitor != null) {
-						monitor.worked(1);
-					}
-				} catch (Exception e) {
-					StatusHandler.log(new Status(IStatus.ERROR, ICommonsCoreConstants.ID_PLUGIN, "Could not add " //$NON-NLS-1$
-							+ file.getName() + " to zip", e)); //$NON-NLS-1$
-				}
-			}
-
-		} finally {
-			zipOut.close();
-		}
-	}
-
-	/**
-	 * @author Shawn Minto
-	 */
-	private static void addZipEntry(ZipOutputStream zipOut, String rootPath, File file) throws FileNotFoundException,
-			IOException {
-		if (file.exists()) {
-			if (file.isDirectory()) {
-				for (File child : file.listFiles()) {
-					addZipEntry(zipOut, rootPath, child);
-				}
-			} else {
-				// Add ZIP entry to output stream.m
-				String path = ""; //$NON-NLS-1$
-				if (!rootPath.equals("")) { //$NON-NLS-1$
-					rootPath = rootPath.replaceAll("\\\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
-					path = file.getAbsolutePath().replaceAll("\\\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
-					path = path.substring(rootPath.length());
-				} else {
-					path = file.getName();
-				}
-
-				zipOut.putNextEntry(new ZipEntry(path));
-
-				// Create a buffer for reading the files
-				byte[] buf = new byte[1024];
-
-				// Transfer bytes from the file to the ZIP file
-				// and compress the files
-				FileInputStream in = new FileInputStream(file);
-				int len;
-				while ((len = in.read(buf)) > 0) {
-					zipOut.write(buf, 0, len);
-				}
-
-				// Complete the entry
-				zipOut.closeEntry();
-				in.close();
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/CommonMessages.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/CommonMessages.java
deleted file mode 100644
index 4652e9b..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/CommonMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CommonMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.provisional.commons.core.messages"; //$NON-NLS-1$
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, CommonMessages.class);
-	}
-
-	public static String Friday;
-
-	public static String Monday;
-
-	public static String Saturday;
-
-	public static String Sunday;
-
-	public static String Thursday;
-
-	public static String Tuesday;
-
-	public static String Wednesday;
-
-}
diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/messages.properties b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/messages.properties
deleted file mode 100644
index 70de146..0000000
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/internal/provisional/commons/core/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-Friday=Friday
-Monday=Monday
-Saturday=Saturday
-Sunday=Sunday
-Tuesday=Tuesday
-Thursday=Thursday
-Wednesday=Wednesday
diff --git a/org.eclipse.mylyn.commons.net/.classpath b/org.eclipse.mylyn.commons.net/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/org.eclipse.mylyn.commons.net/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.commons.net/.cvsignore b/org.eclipse.mylyn.commons.net/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.commons.net/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.commons.net/.project b/org.eclipse.mylyn.commons.net/.project
deleted file mode 100644
index c334d5c..0000000
--- a/org.eclipse.mylyn.commons.net/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.net</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.net/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.net/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.net/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.net/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
deleted file mode 100644
index 90042bb..0000000
--- a/org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.commons.net;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0";visibility:=reexport,
- org.apache.commons.httpclient;bundle-version="3.1.0";visibility:=reexport,
- org.apache.commons.lang;bundle-version="2.3.0";visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.0.4",
- org.eclipse.core.runtime,
- org.eclipse.core.net
-Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.commons.net,
- org.eclipse.mylyn.internal.commons.net;x-internal:=true
-Bundle-Activator: org.eclipse.mylyn.internal.commons.net.CommonsNetPlugin
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.commons.net/about.html b/org.eclipse.mylyn.commons.net/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons.net/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.net/build.properties b/org.eclipse.mylyn.commons.net/build.properties
deleted file mode 100644
index 96bc39e..0000000
--- a/org.eclipse.mylyn.commons.net/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/org.eclipse.mylyn.commons.net/plugin.properties b/org.eclipse.mylyn.commons.net/plugin.properties
deleted file mode 100644
index aff4a27..0000000
--- a/org.eclipse.mylyn.commons.net/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.commons.net
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Commons Net
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AbstractWebLocation.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AbstractWebLocation.java
deleted file mode 100644
index adec1fd..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AbstractWebLocation.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.net.Proxy;
-
-import javax.net.ssl.X509TrustManager;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @since 2.2
- * @author Steffen Pingel
- */
-public abstract class AbstractWebLocation {
-
-	private final String url;
-
-	/**
-	 * @since 2.2
-	 */
-	public AbstractWebLocation(String url) {
-		this.url = url;
-	}
-
-	/**
-	 * @since 2.2
-	 */
-	public abstract AuthenticationCredentials getCredentials(AuthenticationType type);
-
-	/**
-	 * @since 2.2
-	 */
-	public abstract Proxy getProxyForHost(String host, String proxyType);
-
-	/**
-	 * @since 2.2
-	 */
-	public X509TrustManager getTrustManager() {
-		return null;
-	}
-
-	/**
-	 * @since 2.2
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public void requestCredentials(AuthenticationType type, String message, IProgressMonitor monitor)
-			throws UnsupportedRequestException {
-		throw new UnsupportedRequestException();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationCredentials.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationCredentials.java
deleted file mode 100644
index 4c09ff5..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationCredentials.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-/**
- * Provides a user name and password.
- * 
- * @author Steffen Pingel
- * @since 2.2
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class AuthenticationCredentials {
-
-	private final String userName;
-
-	private final String password;
-
-	/**
-	 * @param userName
-	 *            the user name, must not be null
-	 * @param password
-	 *            the password, must not be null
-	 */
-	public AuthenticationCredentials(String userName, String password) {
-		if (userName == null) {
-			throw new IllegalArgumentException();
-		}
-		if (password == null) {
-			throw new IllegalArgumentException();
-		}
-
-		this.userName = userName;
-		this.password = password;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((password == null) ? 0 : password.hashCode());
-		result = prime * result + ((userName == null) ? 0 : userName.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		final AuthenticationCredentials other = (AuthenticationCredentials) obj;
-		if (password == null) {
-			if (other.password != null) {
-				return false;
-			}
-		} else if (!password.equals(other.password)) {
-			return false;
-		}
-		if (userName == null) {
-			if (other.userName != null) {
-				return false;
-			}
-		} else if (!userName.equals(other.userName)) {
-			return false;
-		}
-		return true;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationType.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationType.java
deleted file mode 100644
index fb9ea2d..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/AuthenticationType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-/**
- * An enum of the supported authentication types.
- * 
- * @since 2.2
- * @author Steffen Pingel
- */
-public enum AuthenticationType {
-	/**
-	 * HTTP authentication, this is typically basic authentication but other methods such as digest or NTLM are used as
-	 * well.
-	 */
-	HTTP,
-	/** Proxy authentication. */
-	PROXY,
-	/** Task repository authentication. */
-	REPOSITORY
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlStreamTokenizer.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlStreamTokenizer.java
deleted file mode 100644
index f3194c4..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlStreamTokenizer.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Locale;
-
-import org.apache.commons.lang.StringEscapeUtils;
-
-/**
- * Parses HTML into tokens.
- * 
- * @author Shawn Minto
- * @since 2.0
- */
-public class HtmlStreamTokenizer {
-
-	/** parser state */
-	private State state;
-
-	/** reader from which to parse the text */
-	private final BufferedReader in;
-
-	/** base URL for resolving relative URLs */
-	private final URL base;
-
-	/** buffer holding the text of the current token */
-	private final StringBuffer textBuffer;
-
-	/** buffer holding whitespace preceding the current token */
-	private final StringBuffer whitespaceBuffer;
-
-	/**
-	 * holds a token that was read and then put back in the queue to be returned again on <code>nextToken</code> call
-	 */
-	private Token pushbackToken;
-
-	/**
-	 * holds a character that was read and then determined not to be part of the current token
-	 */
-	private int pushbackChar;
-
-	/** current quote delimiter (single or double) */
-	private int quoteChar;
-
-	/** Allow class client to choose if tag attributes are escaped or not */
-	private boolean escapeTagValues;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param in
-	 *            reader for the HTML document to tokenize
-	 * @param base
-	 *            URL for resolving relative URLs
-	 */
-	public HtmlStreamTokenizer(Reader in, URL base) {
-		textBuffer = new StringBuffer();
-		whitespaceBuffer = new StringBuffer();
-		pushbackChar = 0;
-		state = State.TEXT;
-		this.in = new BufferedReader(in);
-		this.base = base;
-		escapeTagValues = true;
-	}
-
-	public void escapeTagAttributes(boolean value) {
-		escapeTagValues = value;
-	}
-
-	/**
-	 * Returns the next token from the stream.
-	 */
-	public Token nextToken() throws IOException, ParseException {
-		if (pushbackToken != null) {
-			Token token = pushbackToken;
-			pushbackToken = null;
-			return token;
-		}
-
-		int closingComment = 0;
-
-		textBuffer.setLength(0);
-		whitespaceBuffer.setLength(0);
-		do {
-			int ch;
-			if (pushbackChar != 0) {
-				ch = pushbackChar;
-				pushbackChar = 0;
-			} else {
-				ch = in.read();
-			}
-			if (ch < 0) {
-				State oldState = state;
-				state = State.EOF;
-				if (textBuffer.length() > 0 && oldState == State.TEXT) {
-					return new Token(textBuffer, whitespaceBuffer, false);
-				} else {
-					return new Token();
-				}
-			}
-			if (state == State.TEXT) {
-				if (ch == '<') {
-					state = State.TAG;
-					if (textBuffer.length() > 0) {
-						return new Token(textBuffer, whitespaceBuffer, false);
-					}
-				} else if (Character.isWhitespace((char) ch)) {
-					pushbackChar = ch;
-					state = State.WS;
-					if (textBuffer.length() > 0) {
-						return new Token(textBuffer, whitespaceBuffer, false);
-					}
-				} else {
-					textBuffer.append((char) ch);
-				}
-			} else if (state == State.WS) {
-				if (!Character.isWhitespace((char) ch)) {
-					pushbackChar = ch;
-					state = State.TEXT;
-				} else {
-					whitespaceBuffer.append((char) ch);
-				}
-			} else if (state == State.TAG) {
-				if (ch == '>') {
-					state = State.TEXT;
-					HtmlTag tag = new HtmlTag(base);
-					parseTag(textBuffer.toString(), tag, escapeTagValues);
-					return new Token(tag, whitespaceBuffer);
-				}
-				if (ch == '<' && textBuffer.length() == 0) {
-					textBuffer.append("<<"); //$NON-NLS-1$
-					state = State.TEXT;
-				} else if (ch == '-' && textBuffer.length() == 2 && textBuffer.charAt(1) == '-'
-						&& textBuffer.charAt(0) == '!') {
-					textBuffer.setLength(0);
-					state = State.COMMENT;
-				} else if (ch == '\'' || ch == '"') {
-					quoteChar = ch;
-					textBuffer.append((char) ch);
-					state = State.TAG_QUOTE;
-				} else {
-					textBuffer.append((char) ch);
-				}
-			} else if (state == State.TAG_QUOTE) {
-				if (ch == '>') {
-					pushbackChar = ch;
-					state = State.TAG;
-				} else {
-					textBuffer.append((char) ch);
-					if (ch == quoteChar) {
-						state = State.TAG;
-					}
-				}
-			} else if (state == State.COMMENT) {
-				if (ch == '>' && closingComment >= 2) {
-					textBuffer.setLength(textBuffer.length() - 2);
-					closingComment = 0;
-					state = State.TEXT;
-					return new Token(textBuffer, whitespaceBuffer, true);
-				}
-				if (ch == '-') {
-					closingComment++;
-				} else {
-					closingComment = 0;
-				}
-				textBuffer.append((char) ch);
-			}
-		} while (true);
-	}
-
-	/**
-	 * Pushes the token back into the queue, to be returned by the subsequent call to <code>nextToken</code>
-	 */
-	public void pushback(Token token) {
-		pushbackToken = token;
-	}
-
-	/**
-	 * Parses an HTML tag out of a string of characters.
-	 */
-	private static void parseTag(String s, HtmlTag tag, boolean escapeValues) throws ParseException {
-
-		int i = 0;
-		for (; i < s.length() && Character.isWhitespace(s.charAt(i)); i++) {
-			// just move forward
-		}
-		if (i == s.length()) {
-			throw new ParseException("parse empty tag", 0); //$NON-NLS-1$
-		}
-
-		int start = i;
-		for (; i < s.length() && !Character.isWhitespace(s.charAt(i)); i++) {
-			// just move forward
-		}
-		tag.setTagName(s.substring(start, i));
-
-		for (; i < s.length() && Character.isWhitespace(s.charAt(i)); i++) {
-			// just move forward
-		}
-		if (i == s.length()) {
-			return;
-		} else {
-			parseAttributes(tag, s, i, escapeValues);
-			return;
-		}
-	}
-
-	/**
-	 * parses HTML tag attributes from a buffer and sets them in an HtmlTag
-	 */
-	private static void parseAttributes(HtmlTag tag, String s, int i, boolean escapeValues) throws ParseException {
-		while (i < s.length()) {
-			// skip whitespace
-			while (i < s.length() && Character.isWhitespace(s.charAt(i))) {
-				i++;
-			}
-
-			if (i == s.length()) {
-				return;
-			}
-
-			// read the attribute name -- the rule might be looser than the RFC
-			// specifies:
-			// everything up to a space or an equal sign is included
-			int start = i;
-			for (; i < s.length() && !Character.isWhitespace(s.charAt(i)) && s.charAt(i) != '='; i++) {
-				// just move forward
-			}
-			String attributeName = s.substring(start, i).toLowerCase(Locale.ENGLISH);
-
-			if (attributeName.equals("/")) { //$NON-NLS-1$
-				tag.setSelfTerminating(true);
-				continue;
-			}
-
-			for (; i < s.length() && Character.isWhitespace(s.charAt(i)); i++) {
-				// just move forward
-			}
-			if (i == s.length() || s.charAt(i) != '=') {
-				// no attribute value
-				tag.setAttribute(attributeName, ""); //$NON-NLS-1$
-				continue;
-			}
-
-			// skip whitespace to the start of attribute value
-			for (i = i + 1; i < s.length() && Character.isWhitespace(s.charAt(i)); i++) {
-				// just move forward
-			}
-			if (i == s.length()) {
-				return;
-			}
-
-			// read the attribute value -- the rule for unquoted attribute value
-			// is
-			// looser than the one in Conolly's W3C 1996 lexical analyzer draft:
-			// everything
-			// is included up to the next space
-			String attributeValue;
-			if (s.charAt(i) == '"') {
-				start = ++i;
-				for (; i < s.length() && s.charAt(i) != '"'; i++) {
-					// just move forward
-				}
-				if (i == s.length()) {
-					return; // shouldn't happen if input returned by nextToken
-				}
-				if (escapeValues) {
-					attributeValue = unescape(s.substring(start, i));
-				} else {
-					attributeValue = s.substring(start, i);
-				}
-				i++;
-			} else if (s.charAt(i) == '\'') {
-				start = ++i;
-				for (; i < s.length() && s.charAt(i) != '\''; i++) {
-					// just move forward
-				}
-				if (i == s.length()) {
-					return; // shouldn't happen if input returned by nextToken
-				}
-				attributeValue = unescape(s.substring(start, i));
-				i++;
-			} else {
-				start = i;
-				for (; i < s.length() && !Character.isWhitespace(s.charAt(i)); i++) {
-					// just move forward
-				}
-				attributeValue = s.substring(start, i);
-			}
-			tag.setAttribute(attributeName, attributeValue);
-		}
-	}
-
-	/**
-	 * Returns a string with HTML escapes changed into their corresponding characters.
-	 * 
-	 * @deprecated use {@link StringEscapeUtils#unescapeHtml(String)} instead
-	 */
-	@Deprecated
-	public static String unescape(String s) {
-		if (s.indexOf('&') == -1) {
-			return s;
-		} else {
-			StringBuffer sb = new StringBuffer(s);
-			unescape(sb);
-			return sb.toString();
-		}
-	}
-
-	/**
-	 * Replaces (in-place) HTML escapes in a StringBuffer with their corresponding characters.
-	 * 
-	 * @deprecated use {@link StringEscapeUtils#unescapeHtml(String)} instead
-	 */
-	@Deprecated
-	public static StringBuffer unescape(StringBuffer sb) {
-		int i = 0; // index into the unprocessed section of the buffer
-		int j = 0; // index into the processed section of the buffer
-
-		while (i < sb.length()) {
-			char ch = sb.charAt(i);
-			if (ch == '&') {
-				int start = i;
-				String escape = null;
-				for (i = i + 1; i < sb.length(); i++) {
-					ch = sb.charAt(i);
-					if (!Character.isLetterOrDigit(ch) && !(ch == '#' && i == (start + 1))) {
-						escape = sb.substring(start + 1, i);
-						break;
-					}
-				}
-				if (i == sb.length() && i != (start + 1)) {
-					escape = sb.substring(start + 1);
-				}
-				if (escape != null) {
-					Character character = parseReference(escape);
-					if (character != null
-							&& !((0x0A == character || 0x0D == character || 0x09 == ch)
-									|| (character >= 0x20 && character <= 0xD7FF)
-									|| (character >= 0xE000 && character <= 0xFFFD) || (character >= 0x10000 && character <= 0x10FFFF))) {
-						// Character is an invalid xml character
-						// http://www.w3.org/TR/REC-xml/#charsets
-						character = null;
-					}
-					if (character != null) {
-						ch = character.charValue();
-					} else {
-						// not an HTML escape; rewind
-						i = start;
-						ch = '&';
-					}
-				}
-			}
-			sb.setCharAt(j, ch);
-			i++;
-			j++;
-		}
-
-		sb.setLength(j);
-		return sb;
-	}
-
-	/**
-	 * Parses HTML character and entity references and returns the corresponding character.
-	 */
-	private static Character parseReference(String s) {
-		if (s.length() == 0) {
-			return null;
-		}
-
-		if (s.charAt(0) == '#') {
-			// character reference
-			if (s.length() == 1) {
-				return null;
-			}
-
-			try {
-				int value;
-				if (s.charAt(1) == 'x') {
-					// Hex reference
-					value = Integer.parseInt(s.substring(2), 16);
-				} else {
-					// Decimal reference
-					value = Integer.parseInt(s.substring(1));
-				}
-				return new Character((char) value);
-			} catch (NumberFormatException e) {
-				return null;
-			}
-		} else {
-			return entities.get(s);
-		}
-	}
-
-	/**
-	 * Class for current token.
-	 */
-	public static class Token {
-		public static final Type EOF = new Type();
-
-		public static final Type TEXT = new Type();
-
-		public static final Type TAG = new Type();
-
-		public static final Type COMMENT = new Type();
-
-		/** token's type */
-		private Type type;
-
-		/** token's value */
-		private final Object value;
-
-		/** whitespace preceding the token */
-		private final StringBuffer whitespace;
-
-		/**
-		 * Constructor for the EOF token.
-		 */
-		protected Token() {
-			type = EOF;
-			value = null;
-			whitespace = null;
-		}
-
-		/**
-		 * Constructor for the HTML tag tokens.
-		 */
-		protected Token(HtmlTag tag, StringBuffer whitespace) {
-			type = TAG;
-			value = tag;
-			this.whitespace = whitespace;
-		}
-
-		/**
-		 * Constructor for regular text and comments.
-		 */
-		protected Token(StringBuffer text, StringBuffer whitespace, boolean comment) {
-			if (comment) {
-				type = COMMENT;
-			} else {
-				type = TEXT;
-			}
-			this.value = text;
-			this.whitespace = whitespace;
-		}
-
-		/**
-		 * Returns the token's type.
-		 */
-		public Type getType() {
-			return type;
-		}
-
-		/**
-		 * Returns the whitespace preceding the token.
-		 */
-		public StringBuffer getWhitespace() {
-			return whitespace;
-		}
-
-		/**
-		 * Returns the token's value. This is an HtmlTag for tokens of type <code>TAG</code> and a StringBuffer for
-		 * tokens of type <code>TEXT</code> and <code>COMMENT</code>. For tokens of type <code>EOF</code>, the value is
-		 * <code>null</code>.
-		 */
-		public Object getValue() {
-			return value;
-		}
-
-		/**
-		 * Returns the string representation of the token, including the preceding whitespace.
-		 */
-		@Override
-		public String toString() {
-			StringBuffer sb = new StringBuffer();
-			if (whitespace != null) {
-				sb.append(whitespace);
-			}
-			if (value != null) {
-				if (type == TAG) {
-					// sb.append('<');
-				} else if (type == COMMENT) {
-					sb.append("<!--"); //$NON-NLS-1$
-				}
-				sb.append(value);
-				if (type == TAG) {
-					// if(value instanceof HtmlTag) {
-					// HtmlTag htmlTag = (HtmlTag)value;
-					// if(htmlTag.getTagName().startsWith("?xml")) {
-					// sb.append("?>");
-					// }
-					// } else {
-					// sb.append('>');
-
-				} else if (type == COMMENT) {
-					sb.append("-->"); //$NON-NLS-1$
-				}
-
-			}
-			return sb.toString();
-		}
-
-		/**
-		 * Private enum class for token type.
-		 */
-		private static class Type {
-			private Type() {
-				// don't need to do anything
-			}
-		}
-	}
-
-	/**
-	 * Enum class for parser state.
-	 */
-	private static class State {
-		static final State EOF = new State();
-
-		static final State COMMENT = new State();
-
-		static final State TEXT = new State();
-
-		static final State TAG = new State();
-
-		static final State WS = new State();
-
-		static final State TAG_QUOTE = new State();
-
-		private State() {
-			// don't need to do anything
-		}
-	}
-
-	/** names and values of HTML entity references */
-	private static HashMap<String, Character> entities;
-
-	/*
-	 * Based on ISO 8879.
-	 * 
-	 * Portions (c) International Organization for Standardization 1986
-	 * Permission to copy in any form is granted for use with conforming SGML
-	 * systems and applications as defined in ISO 8879, provided this notice is
-	 * included in all copies.
-	 * 
-	 */
-	static {
-		entities = new HashMap<String, Character>();
-		entities.put("nbsp", Character.valueOf('\240')); // no-break //$NON-NLS-1$
-		// space =
-		// non-breaking
-		// space
-		entities.put("iexcl", Character.valueOf('\241')); // inverted //$NON-NLS-1$
-		// exclamation
-		// mark
-		entities.put("cent", Character.valueOf('\242')); // cent sign //$NON-NLS-1$
-		entities.put("pound", Character.valueOf('\243')); // pound //$NON-NLS-1$
-		// sign
-		entities.put("curren", Character.valueOf('\244')); // currency //$NON-NLS-1$
-		// sign
-		entities.put("yen", Character.valueOf('\245')); // yen sign = //$NON-NLS-1$
-		// yuan sign
-		entities.put("brvbar", Character.valueOf('\246')); // broken //$NON-NLS-1$
-		// bar =
-		// broken
-		// vertical
-		// bar
-		entities.put("sect", Character.valueOf('\247')); // section //$NON-NLS-1$
-		// sign
-		entities.put("uml", Character.valueOf('\250')); // diaeresis = //$NON-NLS-1$
-		// spacing
-		// diaeresis
-		entities.put("copy", Character.valueOf('\251')); // copyright //$NON-NLS-1$
-		// sign
-		entities.put("ordf", Character.valueOf('\252')); // feminine //$NON-NLS-1$
-		// ordinal
-		// indicator
-		entities.put("laquo", Character.valueOf('\253')); // left-pointing //$NON-NLS-1$
-		// double
-		// angle
-		// quotation
-		// mark =
-		// left
-		// pointing
-		// guillemet
-		entities.put("not", Character.valueOf('\254')); // not sign //$NON-NLS-1$
-		entities.put("shy", Character.valueOf('\255')); // soft hyphen = //$NON-NLS-1$
-		// discretionary
-		// hyphen
-		entities.put("reg", Character.valueOf('\256')); // registered //$NON-NLS-1$
-		// sign =
-		// registered
-		// trade mark
-		// sign
-		entities.put("macr", Character.valueOf('\257')); // macron = //$NON-NLS-1$
-		// spacing
-		// macron =
-		// overline
-		// = APL
-		// overbar
-		entities.put("deg", Character.valueOf('\260')); // degree sign //$NON-NLS-1$
-		entities.put("plusmn", Character.valueOf('\261')); // plus-minus //$NON-NLS-1$
-		// sign =
-		// plus-or-minus
-		// sign
-		entities.put("sup2", Character.valueOf('\262')); // superscript //$NON-NLS-1$
-		// two =
-		// superscript
-		// digit two
-		// = squared
-		entities.put("sup3", Character.valueOf('\263')); // superscript //$NON-NLS-1$
-		// three =
-		// superscript
-		// digit
-		// three =
-		// cubed
-		entities.put("acute", Character.valueOf('\264')); // acute //$NON-NLS-1$
-		// accent =
-		// spacing
-		// acute
-		entities.put("micro", Character.valueOf('\265')); // micro //$NON-NLS-1$
-		// sign
-		entities.put("para", Character.valueOf('\266')); // pilcrow //$NON-NLS-1$
-		// sign =
-		// paragraph
-		// sign
-		entities.put("middot", Character.valueOf('\267')); // middle //$NON-NLS-1$
-		// dot =
-		// Georgian
-		// comma =
-		// Greek
-		// middle
-		// dot
-		entities.put("cedil", Character.valueOf('\270')); // cedilla = //$NON-NLS-1$
-		// spacing
-		// cedilla
-		entities.put("sup1", Character.valueOf('\271')); // superscript //$NON-NLS-1$
-		// one =
-		// superscript
-		// digit one
-		entities.put("ordm", Character.valueOf('\272')); // masculine //$NON-NLS-1$
-		// ordinal
-		// indicator
-		entities.put("raquo", Character.valueOf('\273')); // right-pointing //$NON-NLS-1$
-		// double
-		// angle
-		// quotation
-		// mark =
-		// right
-		// pointing
-		// guillemet
-		entities.put("frac14", Character.valueOf('\274')); // vulgar //$NON-NLS-1$
-		// fraction
-		// one
-		// quarter =
-		// fraction
-		// one
-		// quarter
-		entities.put("frac12", Character.valueOf('\275')); // vulgar //$NON-NLS-1$
-		// fraction
-		// one half
-		// =
-		// fraction
-		// one half
-		entities.put("frac34", Character.valueOf('\276')); // vulgar //$NON-NLS-1$
-		// fraction
-		// three
-		// quarters
-		// =
-		// fraction
-		// three
-		// quarters
-		entities.put("iquest", Character.valueOf('\277')); // inverted //$NON-NLS-1$
-		// question
-		// mark =
-		// turned
-		// question
-		// mark
-		entities.put("Agrave", Character.valueOf('\300')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with
-		// grave =
-		// latin
-		// capital
-		// letter A
-		// grave
-		entities.put("Aacute", Character.valueOf('\301')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with
-		// acute
-		entities.put("Acirc", Character.valueOf('\302')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with
-		// circumflex
-		entities.put("Atilde", Character.valueOf('\303')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with
-		// tilde
-		entities.put("Auml", Character.valueOf('\304')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with
-		// diaeresis
-		entities.put("Aring", Character.valueOf('\305')); // latin //$NON-NLS-1$
-		// capital
-		// letter A
-		// with ring
-		// above =
-		// latin
-		// capital
-		// letter A
-		// ring
-		entities.put("AElig", Character.valueOf('\306')); // latin //$NON-NLS-1$
-		// capital
-		// letter AE
-		// = latin
-		// capital
-		// ligature
-		// AE
-		entities.put("Ccedil", Character.valueOf('\307')); // latin //$NON-NLS-1$
-		// capital
-		// letter C
-		// with
-		// cedilla
-		entities.put("Egrave", Character.valueOf('\310')); // latin //$NON-NLS-1$
-		// capital
-		// letter E
-		// with
-		// grave
-		entities.put("Eacute", Character.valueOf('\311')); // latin //$NON-NLS-1$
-		// capital
-		// letter E
-		// with
-		// acute
-		entities.put("Ecirc", Character.valueOf('\312')); // latin //$NON-NLS-1$
-		// capital
-		// letter E
-		// with
-		// circumflex
-		entities.put("Euml", Character.valueOf('\313')); // latin //$NON-NLS-1$
-		// capital
-		// letter E
-		// with
-		// diaeresis
-		entities.put("Igrave", Character.valueOf('\314')); // latin //$NON-NLS-1$
-		// capital
-		// letter I
-		// with
-		// grave
-		entities.put("Iacute", Character.valueOf('\315')); // latin //$NON-NLS-1$
-		// capital
-		// letter I
-		// with
-		// acute
-		entities.put("Icirc", Character.valueOf('\316')); // latin //$NON-NLS-1$
-		// capital
-		// letter I
-		// with
-		// circumflex
-		entities.put("Iuml", Character.valueOf('\317')); // latin //$NON-NLS-1$
-		// capital
-		// letter I
-		// with
-		// diaeresis
-		entities.put("ETH", Character.valueOf('\320')); // latin capital //$NON-NLS-1$
-		// letter ETH
-		entities.put("Ntilde", Character.valueOf('\321')); // latin //$NON-NLS-1$
-		// capital
-		// letter N
-		// with
-		// tilde
-		entities.put("Ograve", Character.valueOf('\322')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// grave
-		entities.put("Oacute", Character.valueOf('\323')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// acute
-		entities.put("Ocirc", Character.valueOf('\324')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// circumflex
-		entities.put("Otilde", Character.valueOf('\325')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// tilde
-		entities.put("Ouml", Character.valueOf('\326')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// diaeresis
-		entities.put("times", Character.valueOf('\327')); // multiplication //$NON-NLS-1$
-		// sign
-		entities.put("Oslash", Character.valueOf('\330')); // latin //$NON-NLS-1$
-		// capital
-		// letter O
-		// with
-		// stroke =
-		// latin
-		// capital
-		// letter O
-		// slash
-		entities.put("Ugrave", Character.valueOf('\331')); // latin //$NON-NLS-1$
-		// capital
-		// letter U
-		// with
-		// grave
-		entities.put("Uacute", Character.valueOf('\332')); // latin //$NON-NLS-1$
-		// capital
-		// letter U
-		// with
-		// acute
-		entities.put("Ucirc", Character.valueOf('\333')); // latin //$NON-NLS-1$
-		// capital
-		// letter U
-		// with
-		// circumflex
-		entities.put("Uuml", Character.valueOf('\334')); // latin //$NON-NLS-1$
-		// capital
-		// letter U
-		// with
-		// diaeresis
-		entities.put("Yacute", Character.valueOf('\335')); // latin //$NON-NLS-1$
-		// capital
-		// letter Y
-		// with
-		// acute
-		entities.put("THORN", Character.valueOf('\336')); // latin //$NON-NLS-1$
-		// capital
-		// letter
-		// THORN
-		entities.put("szlig", Character.valueOf('\337')); // latin //$NON-NLS-1$
-		// small
-		// letter
-		// sharp s =
-		// ess-zed
-		entities.put("agrave", Character.valueOf('\340')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with
-		// grave =
-		// latin
-		// small
-		// letter a
-		// grave
-		entities.put("aacute", Character.valueOf('\341')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with
-		// acute
-		entities.put("acirc", Character.valueOf('\342')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with
-		// circumflex
-		entities.put("atilde", Character.valueOf('\343')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with
-		// tilde
-		entities.put("auml", Character.valueOf('\344')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with
-		// diaeresis
-		entities.put("aring", Character.valueOf('\345')); // latin //$NON-NLS-1$
-		// small
-		// letter a
-		// with ring
-		// above =
-		// latin
-		// small
-		// letter a
-		// ring
-		entities.put("aelig", Character.valueOf('\346')); // latin //$NON-NLS-1$
-		// small
-		// letter ae
-		// = latin
-		// small
-		// ligature
-		// ae
-		entities.put("ccedil", Character.valueOf('\347')); // latin //$NON-NLS-1$
-		// small
-		// letter c
-		// with
-		// cedilla
-		entities.put("egrave", Character.valueOf('\350')); // latin //$NON-NLS-1$
-		// small
-		// letter e
-		// with
-		// grave
-		entities.put("eacute", Character.valueOf('\351')); // latin //$NON-NLS-1$
-		// small
-		// letter e
-		// with
-		// acute
-		entities.put("ecirc", Character.valueOf('\352')); // latin //$NON-NLS-1$
-		// small
-		// letter e
-		// with
-		// circumflex
-		entities.put("euml", Character.valueOf('\353')); // latin //$NON-NLS-1$
-		// small
-		// letter e
-		// with
-		// diaeresis
-		entities.put("igrave", Character.valueOf('\354')); // latin //$NON-NLS-1$
-		// small
-		// letter i
-		// with
-		// grave
-		entities.put("iacute", Character.valueOf('\355')); // latin //$NON-NLS-1$
-		// small
-		// letter i
-		// with
-		// acute
-		entities.put("icirc", Character.valueOf('\356')); // latin //$NON-NLS-1$
-		// small
-		// letter i
-		// with
-		// circumflex
-		entities.put("iuml", Character.valueOf('\357')); // latin //$NON-NLS-1$
-		// small
-		// letter i
-		// with
-		// diaeresis
-		entities.put("eth", Character.valueOf('\360')); // latin small //$NON-NLS-1$
-		// letter eth
-		entities.put("ntilde", Character.valueOf('\361')); // latin //$NON-NLS-1$
-		// small
-		// letter n
-		// with
-		// tilde
-		entities.put("ograve", Character.valueOf('\362')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// grave
-		entities.put("oacute", Character.valueOf('\363')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// acute
-		entities.put("ocirc", Character.valueOf('\364')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// circumflex
-		entities.put("otilde", Character.valueOf('\365')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// tilde
-		entities.put("ouml", Character.valueOf('\366')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// diaeresis
-		entities.put("divide", Character.valueOf('\367')); // division //$NON-NLS-1$
-		// sign
-		entities.put("oslash", Character.valueOf('\370')); // latin //$NON-NLS-1$
-		// small
-		// letter o
-		// with
-		// stroke =
-		// latin
-		// small
-		// letter o
-		// slash
-		entities.put("ugrave", Character.valueOf('\371')); // latin //$NON-NLS-1$
-		// small
-		// letter u
-		// with
-		// grave
-		entities.put("uacute", Character.valueOf('\372')); // latin //$NON-NLS-1$
-		// small
-		// letter u
-		// with
-		// acute
-		entities.put("ucirc", Character.valueOf('\373')); // latin //$NON-NLS-1$
-		// small
-		// letter u
-		// with
-		// circumflex
-		entities.put("uuml", Character.valueOf('\374')); // latin //$NON-NLS-1$
-		// small
-		// letter u
-		// with
-		// diaeresis
-		entities.put("yacute", Character.valueOf('\375')); // latin //$NON-NLS-1$
-		// small
-		// letter y
-		// with
-		// acute
-		entities.put("thorn", Character.valueOf('\376')); // latin //$NON-NLS-1$
-		// small
-		// letter
-		// thorn
-		entities.put("yuml", Character.valueOf('\377')); // latin //$NON-NLS-1$
-		// small
-		// letter y
-		// with
-		// diaeresis
-
-		// Special characters
-		entities.put("quot", Character.valueOf('\42')); // quotation //$NON-NLS-1$
-		// mark = APL
-		// quote
-		entities.put("amp", Character.valueOf('\46')); // ampersand //$NON-NLS-1$
-		entities.put("lt", Character.valueOf('\74')); // less-than //$NON-NLS-1$
-		// sign
-		entities.put("gt", Character.valueOf('\76')); // greater-than //$NON-NLS-1$
-		// sign
-		// Latin Extended-A
-		entities.put("OElig", Character.valueOf('\u0152')); // latin //$NON-NLS-1$
-		// capital
-		// ligature
-		// OE
-		entities.put("oelig", Character.valueOf('\u0153')); // latin //$NON-NLS-1$
-		// small
-		// ligature
-		// oe,
-		// ligature
-		// is a
-		// misnomer,
-		// this is a
-		// separate
-		// character
-		// in some
-		// languages
-		entities.put("Scaron", Character.valueOf('\u0160')); // latin //$NON-NLS-1$
-		// capital
-		// letter
-		// S
-		// with
-		// caron
-		entities.put("scaron", Character.valueOf('\u0161')); // latin //$NON-NLS-1$
-		// small
-		// letter
-		// s
-		// with
-		// caron
-		entities.put("Yuml", Character.valueOf('\u0178')); // latin //$NON-NLS-1$
-		// capital
-		// letter Y
-		// with
-		// diaeresis
-		// Spacing Modifier Letters
-		entities.put("circ", Character.valueOf('\u02c6')); // modifier //$NON-NLS-1$
-		// letter
-		// circumflex
-		// accent
-		entities.put("tilde", Character.valueOf('\u02dc')); // small //$NON-NLS-1$
-		// tilde
-		// General punctuation
-		entities.put("ensp", Character.valueOf('\u2002')); // en space //$NON-NLS-1$
-		entities.put("emsp", Character.valueOf('\u2003')); // em space //$NON-NLS-1$
-		entities.put("thinsp", Character.valueOf('\u2009')); // thin //$NON-NLS-1$
-		// space
-		entities.put("zwnj", Character.valueOf('\u200c')); // zero //$NON-NLS-1$
-		// width
-		// non-joiner
-		entities.put("zwj", Character.valueOf('\u200d')); // zero //$NON-NLS-1$
-		// width
-		// joiner
-		entities.put("lrm", Character.valueOf('\u200e')); // left-to-right //$NON-NLS-1$
-		// mark
-		entities.put("rlm", Character.valueOf('\u200f')); // right-to-left //$NON-NLS-1$
-		// mark
-		entities.put("ndash", Character.valueOf('\u2013')); // en dash //$NON-NLS-1$
-		entities.put("mdash", Character.valueOf('\u2014')); // em dash //$NON-NLS-1$
-		entities.put("lsquo", Character.valueOf('\u2018')); // left //$NON-NLS-1$
-		// single
-		// quotation
-		// mark
-		entities.put("rsquo", Character.valueOf('\u2019')); // right //$NON-NLS-1$
-		// single
-		// quotation
-		// mark
-		entities.put("sbquo", Character.valueOf('\u201a')); // single //$NON-NLS-1$
-		// low-9
-		// quotation
-		// mark
-		entities.put("ldquo", Character.valueOf('\u201c')); // left //$NON-NLS-1$
-		// double
-		// quotation
-		// mark
-		entities.put("rdquo", Character.valueOf('\u201d')); // right //$NON-NLS-1$
-		// double
-		// quotation
-		// mark
-		entities.put("bdquo", Character.valueOf('\u201e')); // double //$NON-NLS-1$
-		// low-9
-		// quotation
-		// mark
-		entities.put("dagger", Character.valueOf('\u2020')); // dagger //$NON-NLS-1$
-		entities.put("Dagger", Character.valueOf('\u2021')); // double //$NON-NLS-1$
-		// dagger
-		entities.put("permil", Character.valueOf('\u2030')); // per //$NON-NLS-1$
-		// mille
-		// sign
-		entities.put("lsaquo", Character.valueOf('\u2039')); // single //$NON-NLS-1$
-		// left-pointing
-		// angle
-		// quotation
-		// mark,
-		// not
-		// yet
-		// standardized
-		entities.put("rsaquo", Character.valueOf('\u203a')); // single //$NON-NLS-1$
-		// right-pointing
-		// angle
-		// quotation
-		// mark,
-		// not
-		// yet
-		// standardized
-		entities.put("euro", Character.valueOf('\u20ac')); // euro sign //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlTag.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlTag.java
deleted file mode 100644
index 874ea7d..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/HtmlTag.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.net.URL;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-
-import javax.swing.text.html.HTML.Tag;
-
-/**
- * Class representing an HTML (3.2) tag and its attributes.
- * 
- * @author Shawn Minto
- * @since 2.0
- */
-public class HtmlTag {
-	/** tag's name */
-	private String tagName;
-
-	/** tag type enum */
-	private Tag tagType;
-
-	/** true if the tag is a closing tag */
-	private boolean isEndTag;
-
-	/** tag's attributes (keys are lowercase attribute names) */
-	private HashMap<String, String> attributes;
-
-	/** tag's base url */
-	private final URL baseUrl;
-
-	/** tag is self terminated */
-	private boolean selfTerminating;
-
-	/**
-	 * Basic constructor. The tag is uninitialized.
-	 */
-	public HtmlTag() {
-		tagName = null;
-		tagType = Type.UNKNOWN;
-		isEndTag = false;
-		attributes = new HashMap<String, String>();
-		baseUrl = null;
-	}
-
-	/**
-	 * Copy constructor.
-	 */
-	@SuppressWarnings("unchecked")
-	public HtmlTag(HtmlTag htmltag) {
-		tagName = null;
-		tagType = Type.UNKNOWN;
-		isEndTag = false;
-		attributes = new HashMap<String, String>();
-		tagName = htmltag.tagName;
-		baseUrl = htmltag.baseUrl;
-		tagType = htmltag.tagType;
-		isEndTag = htmltag.isEndTag;
-		attributes = (HashMap) htmltag.attributes.clone();
-	}
-
-	/**
-	 * Constructor.
-	 */
-	public HtmlTag(String s) throws ParseException {
-		attributes = new HashMap<String, String>();
-		setTagName(s);
-		baseUrl = null;
-	}
-
-	/**
-	 * Constructor creating an otherwise empty tag, but with a given base url.
-	 */
-	public HtmlTag(URL url) {
-		tagName = null;
-		tagType = Type.UNKNOWN;
-		isEndTag = false;
-		attributes = new HashMap<String, String>();
-		baseUrl = url;
-	}
-
-	/**
-	 * Returns the tag's type (linked to the tag's name).
-	 */
-	public Tag getTagType() {
-		return tagType;
-	}
-
-	/**
-	 * Returns the tag's name (e.g., "HEAD", "P", etc.).
-	 */
-	public String getTagName() {
-		return tagName;
-	}
-
-	/**
-	 * Sets the tag's name and type, if known.
-	 * 
-	 * @throws IllegalArgumentException
-	 *             if the argument is <code>null</code> or empty string
-	 */
-	public void setTagName(String s) throws IllegalArgumentException {
-		if (s == null || s.length() == 0) {
-			throw new IllegalArgumentException("Empty tag name"); //$NON-NLS-1$
-		}
-		if (s.charAt(0) == '/') {
-			isEndTag = true;
-			s = s.substring(1);
-		}
-		if (s.length() == 0) {
-			throw new IllegalArgumentException("Empty tag name"); //$NON-NLS-1$
-		}
-		tagName = s;
-		tagType = tags.get(s.toUpperCase(Locale.ENGLISH));
-		if (tagType == null) {
-			tagType = Type.UNKNOWN;
-		}
-	}
-
-	/**
-	 * Returns <code>true</code> if the tag is a closing tag.
-	 */
-	public boolean isEndTag() {
-		return isEndTag;
-	}
-
-	/**
-	 * Returns the value of a tag's attribute as an integer.
-	 */
-	public int getIntAttribute(String s) throws NumberFormatException {
-		return Integer.parseInt(getAttribute(s));
-	}
-
-	/**
-	 * Returns the value of a tag's attribute, or NULL if it doesn't exist.
-	 */
-	public String getAttribute(String s) {
-		return attributes.get(s);
-	}
-
-	/**
-	 * Returns <code>true</code> if the tag contains attribute with the given name.
-	 */
-	public boolean hasAttribute(String s) {
-		return getAttribute(s) != null;
-	}
-
-	/**
-	 * Sets the value of a tag's attribute.
-	 */
-	public void setAttribute(String name, String value) {
-		attributes.put(name.toLowerCase(Locale.ENGLISH), value);
-	}
-
-	public StringBuffer getURLs() {
-		StringBuffer sb = new StringBuffer();
-
-		Iterator<String> attributeNames = attributes.keySet().iterator();
-		Iterator<String> attributeValues = attributes.values().iterator();
-		while (attributeNames.hasNext()) {
-			String attributeName = attributeNames.next();
-			if (attributeName.compareTo("href") == 0 || attributeName.compareTo("src") == 0) { //$NON-NLS-1$ //$NON-NLS-2$
-				String target = attributeValues.next();
-				if (!target.endsWith(".jpg") && !target.endsWith(".gif") && !target.endsWith(".css") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						&& !target.endsWith(".js") && !target.startsWith("mailto") && target.lastIndexOf("#") == -1 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						&& target.length() > 0) {
-
-					for (int i = 0; i < target.length(); i++) {
-						char ch = target.charAt(i);
-						if (!Character.isWhitespace(ch)) {
-							if (i > 0) {
-								target = target.substring(i + 1);
-							}
-							break;
-						}
-					}
-					target = target.replace('\\', '/');
-
-					if (target.startsWith("news:") || (target.indexOf("://") != -1 && target.length() >= 7)) { //$NON-NLS-1$ //$NON-NLS-2$
-						// Absolute URL
-						if (target.substring(0, 7).compareToIgnoreCase("http://") == 0) { //$NON-NLS-1$
-							sb.append(target);
-						}
-					} else {
-						// Relative URL
-
-						String baseDir = baseUrl.getPath();
-						int lastSep = -1;
-						for (int i = 0; i < baseDir.length(); i++) {
-							char ch = baseDir.charAt(i);
-							if (ch == '/') {
-								lastSep = i;
-							} else if (ch == '?') {
-								break;
-							}
-						}
-						if (lastSep >= 0) {
-							baseDir = baseDir.substring(0, lastSep);
-						}
-						while (baseDir.length() > 1 && baseDir.endsWith("/.")) { //$NON-NLS-1$
-							baseDir = baseDir.substring(0, baseDir.length() - 2);
-						}
-
-						if (target.startsWith("//")) { //$NON-NLS-1$
-							sb.append(baseUrl.getProtocol() + ":" + target); //$NON-NLS-1$
-						} else if (target.startsWith("/")) { //$NON-NLS-1$
-							sb.append(baseUrl.getProtocol() + "://" + baseUrl.getHost() + target); //$NON-NLS-1$
-						} else {
-							while (target.startsWith("../")) { //$NON-NLS-1$
-								if (baseDir.length() > 0) {
-									// can't go above root
-									baseDir = baseDir.substring(0, baseDir.lastIndexOf("/")); //$NON-NLS-1$
-								}
-								target = target.substring(3);
-							}
-							sb.append(baseUrl.getProtocol() + "://" + baseUrl.getHost() + baseDir + "/" + target); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					}
-				}
-			} else {
-				attributeValues.next();
-			}
-		}
-
-		return sb;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append('<');
-		if (isEndTag) {
-			sb.append('/');
-		}
-		sb.append(tagName);
-		Iterator<String> keys = attributes.keySet().iterator();
-		Iterator<String> values = attributes.values().iterator();
-		while (keys.hasNext()) {
-			String name = keys.next();
-			sb.append(' ');
-			sb.append(name);
-			String value = values.next();
-			sb.append("=\""); //$NON-NLS-1$
-			if (value.length() > 0) {
-				sb.append(value);
-			}
-			sb.append('"');
-		}
-		if (selfTerminating) {
-			sb.append('/');
-		}
-		sb.append('>');
-
-		return sb.toString();
-	}
-
-	/**
-	 * Enum class for tag types.
-	 */
-	public static class Type extends Tag {
-		public static final Tag UNKNOWN = new Tag();
-
-		public static final Tag THEAD = new Type("THEAD"); //$NON-NLS-1$
-
-		public static final Tag DOCTYPE = new Type("!DOCTYPE"); //$NON-NLS-1$
-
-		public static final Tag LABEL = new Type("LABEL"); //$NON-NLS-1$
-
-		private Type(String name) {
-			super(name);
-		}
-	}
-
-	private static HashMap<String, Tag> tags;
-	static {
-		tags = new HashMap<String, Tag>();
-		tags.put("A", Tag.A); //$NON-NLS-1$
-		tags.put("ADDRESS", Tag.ADDRESS); //$NON-NLS-1$
-		tags.put("APPLET", Tag.APPLET); //$NON-NLS-1$
-		tags.put("AREA", Tag.AREA); //$NON-NLS-1$
-		tags.put("B", Tag.B); //$NON-NLS-1$
-		tags.put("BASE", Tag.BASE); //$NON-NLS-1$
-		tags.put("BASEFONT", Tag.BASEFONT); //$NON-NLS-1$
-		tags.put("BIG", Tag.BIG); //$NON-NLS-1$
-		tags.put("BLOCKQUOTE", Tag.BLOCKQUOTE); //$NON-NLS-1$
-		tags.put("BODY", Tag.BODY); //$NON-NLS-1$
-		tags.put("BR", Tag.BR); //$NON-NLS-1$
-		tags.put("CAPTION", Tag.CAPTION); //$NON-NLS-1$
-		tags.put("CENTER", Tag.CENTER); //$NON-NLS-1$
-		tags.put("CITE", Tag.CITE); //$NON-NLS-1$
-		tags.put("CODE", Tag.CODE); //$NON-NLS-1$
-		tags.put("DD", Tag.DD); //$NON-NLS-1$
-		tags.put("DFN", Tag.DFN); //$NON-NLS-1$
-		tags.put("DIR", Tag.DIR); //$NON-NLS-1$
-		tags.put("DIV", Tag.DIV); //$NON-NLS-1$
-		tags.put("DL", Tag.DL); //$NON-NLS-1$
-		tags.put("!DOCTYPE", Type.DOCTYPE); //$NON-NLS-1$
-		tags.put("DT", Tag.DT); //$NON-NLS-1$
-		tags.put("EM", Tag.EM); //$NON-NLS-1$
-		tags.put("FONT", Tag.FONT); //$NON-NLS-1$
-		tags.put("FORM", Tag.FORM); //$NON-NLS-1$
-		tags.put("FRAME", Tag.FRAME); //$NON-NLS-1$
-		tags.put("FRAMESET", Tag.FRAMESET); //$NON-NLS-1$
-		tags.put("H1", Tag.H1); //$NON-NLS-1$
-		tags.put("H2", Tag.H2); //$NON-NLS-1$
-		tags.put("H3", Tag.H3); //$NON-NLS-1$
-		tags.put("H4", Tag.H4); //$NON-NLS-1$
-		tags.put("H5", Tag.H5); //$NON-NLS-1$
-		tags.put("H6", Tag.H6); //$NON-NLS-1$
-		tags.put("HEAD", Tag.HEAD); //$NON-NLS-1$
-		tags.put("HTML", Tag.HTML); //$NON-NLS-1$
-		tags.put("HR", Tag.HR); //$NON-NLS-1$
-		tags.put("I", Tag.I); //$NON-NLS-1$
-		tags.put("IMG", Tag.IMG); //$NON-NLS-1$
-		tags.put("INPUT", Tag.INPUT); //$NON-NLS-1$
-		tags.put("ISINDEX", Tag.ISINDEX); //$NON-NLS-1$
-		tags.put("KBD", Tag.KBD); //$NON-NLS-1$
-		tags.put("LI", Tag.LI); //$NON-NLS-1$
-		tags.put("LABEL", Type.LABEL); //$NON-NLS-1$
-		tags.put("LINK", Tag.LINK); //$NON-NLS-1$
-		tags.put("MAP", Tag.MAP); //$NON-NLS-1$
-		tags.put("MENU", Tag.MENU); //$NON-NLS-1$
-		tags.put("META", Tag.META); //$NON-NLS-1$
-		tags.put("NOFRAMES", Tag.NOFRAMES); //$NON-NLS-1$
-		tags.put("OBJECT", Tag.OBJECT); //$NON-NLS-1$
-		tags.put("OL", Tag.OL); //$NON-NLS-1$
-		tags.put("OPTION", Tag.OPTION); //$NON-NLS-1$
-		tags.put("P", Tag.P); //$NON-NLS-1$
-		tags.put("PARAM", Tag.PARAM); //$NON-NLS-1$
-		tags.put("PRE", Tag.PRE); //$NON-NLS-1$
-		tags.put("S", Tag.S); //$NON-NLS-1$
-		tags.put("SAMP", Tag.SAMP); //$NON-NLS-1$
-		tags.put("SCRIPT", Tag.SCRIPT); //$NON-NLS-1$
-		tags.put("SELECT", Tag.SELECT); //$NON-NLS-1$
-		tags.put("SMALL", Tag.SMALL); //$NON-NLS-1$
-		tags.put("SPAN", Tag.SPAN); //$NON-NLS-1$
-		tags.put("STRONG", Tag.STRONG); //$NON-NLS-1$
-		tags.put("STYLE", Tag.STYLE); //$NON-NLS-1$
-		tags.put("SUB", Tag.SUB); //$NON-NLS-1$
-		tags.put("SUP", Tag.SUP); //$NON-NLS-1$
-		tags.put("TABLE", Tag.TABLE); //$NON-NLS-1$
-		tags.put("TD", Tag.TD); //$NON-NLS-1$
-		tags.put("TEXTAREA", Tag.TEXTAREA); //$NON-NLS-1$
-		tags.put("TH", Tag.TH); //$NON-NLS-1$
-		tags.put("THEAD", Type.THEAD); //$NON-NLS-1$
-		tags.put("TITLE", Tag.TITLE); //$NON-NLS-1$
-		tags.put("TR", Tag.TR); //$NON-NLS-1$
-		tags.put("TT", Tag.TT); //$NON-NLS-1$
-		tags.put("U", Tag.U); //$NON-NLS-1$
-		tags.put("UL", Tag.UL); //$NON-NLS-1$
-		tags.put("VAR", Tag.VAR); //$NON-NLS-1$
-	}
-
-	public void setSelfTerminating(boolean terminating) {
-		this.selfTerminating = terminating;
-
-	}
-
-	public boolean isSelfTerminating() {
-		return selfTerminating;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/IProxyProvider.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/IProxyProvider.java
deleted file mode 100644
index 2ec81c2..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/IProxyProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.net.Proxy;
-
-/**
- * @since 2.2
- * @author Steffen Pingel
- */
-public interface IProxyProvider {
-
-	/**
-	 * @since 2.2
-	 */
-	public Proxy getProxyForHost(String host, String proxyType);
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/Policy.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/Policy.java
deleted file mode 100644
index 123a408..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/Policy.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.ProgressMonitorWrapper;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.mylyn.internal.commons.net.CommonsNetPlugin;
-import org.eclipse.mylyn.internal.commons.net.InfiniteSubProgressMonitor;
-
-/**
- * @since 2.3
- */
-public class Policy {
-
-	/**
-	 * @since 2.3
-	 */
-	public static boolean DEBUG_STREAMS = false;
-
-	static {
-		if (CommonsNetPlugin.getDefault() != null && CommonsNetPlugin.getDefault().isDebugging()) {
-			DEBUG_STREAMS = "true".equalsIgnoreCase(Platform.getDebugOption(CommonsNetPlugin.ID_PLUGIN + "/streams"));//$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static void advance(IProgressMonitor monitor, int worked) {
-		if (monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-		monitor.worked(worked);
-	}
-
-	public static void checkCanceled(IProgressMonitor monitor) {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static boolean isBackgroundMonitor(IProgressMonitor monitor) {
-		return monitor instanceof BackgroundProgressMonitor;
-
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static IProgressMonitor backgroundMonitorFor(IProgressMonitor monitor) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		return new BackgroundProgressMonitor(monitor);
-	}
-
-	/**
-	 * @since 2.3
-	 */
-	public static IProgressMonitor monitorFor(IProgressMonitor monitor) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		return monitor;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static IProgressMonitor monitorFor(IProgressMonitor monitor, boolean backgroundOperation) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		if (backgroundOperation) {
-			return backgroundMonitorFor(monitor);
-		}
-		return monitor;
-	}
-
-	/**
-	 * @since 2.3
-	 */
-	public static IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		if (monitor instanceof NullProgressMonitor) {
-			return monitor;
-		}
-		if (monitor instanceof BackgroundProgressMonitor) {
-			return new BackgroundProgressMonitor(new SubProgressMonitor(monitor, ticks));
-		}
-		return new SubProgressMonitor(monitor, ticks);
-	}
-
-	/**
-	 * @since 2.3
-	 */
-	public static IProgressMonitor infiniteSubMonitorFor(IProgressMonitor monitor, int ticks) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		if (monitor instanceof NullProgressMonitor) {
-			return monitor;
-		}
-		if (monitor instanceof BackgroundProgressMonitor) {
-			return new BackgroundProgressMonitor(new InfiniteSubProgressMonitor(monitor, ticks));
-		}
-		return new InfiniteSubProgressMonitor(monitor, ticks);
-	}
-
-	/**
-	 * Wrapped progress monitor for background operations.
-	 */
-	private static class BackgroundProgressMonitor extends ProgressMonitorWrapper {
-
-		protected BackgroundProgressMonitor(IProgressMonitor monitor) {
-			super(monitor);
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/UnsupportedRequestException.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/UnsupportedRequestException.java
deleted file mode 100644
index 6d7f1a8..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/UnsupportedRequestException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-/**
- * Indicates that the request is not supported.
- * 
- * @author Steffen Pingel
- * @since 3.0
- */
-public class UnsupportedRequestException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-	public UnsupportedRequestException() {
-	}
-
-	public UnsupportedRequestException(String message) {
-		super(message);
-	}
-
-	public UnsupportedRequestException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public UnsupportedRequestException(Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebLocation.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebLocation.java
deleted file mode 100644
index 19a4604..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebLocation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.net.Proxy;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @since 2.2
- * @author Steffen Pingel
- */
-public class WebLocation extends AbstractWebLocation {
-
-	private static class PlatformProxyProvider implements IProxyProvider {
-
-		public Proxy getProxyForHost(String host, String proxyType) {
-			return WebUtil.getProxy(host, proxyType);
-		}
-
-	}
-
-	private final Map<AuthenticationType, AuthenticationCredentials> credentialsByType;
-
-	private final IProxyProvider proxyProvider;
-
-	public WebLocation(String url, String username, String password, IProxyProvider proxyProvider) {
-		super(url);
-
-		this.credentialsByType = new HashMap<AuthenticationType, AuthenticationCredentials>();
-		this.proxyProvider = proxyProvider;
-
-		if (username != null && password != null) {
-			setCredentials(AuthenticationType.REPOSITORY, username, password);
-		}
-	}
-
-	public WebLocation(String url, String username, String password) {
-		this(url, username, password, new PlatformProxyProvider());
-	}
-
-	public WebLocation(String url) {
-		this(url, null, null, new PlatformProxyProvider());
-	}
-
-	@Override
-	public AuthenticationCredentials getCredentials(AuthenticationType authType) {
-		return credentialsByType.get(authType);
-	}
-
-	@Override
-	public Proxy getProxyForHost(String host, String proxyType) {
-		if (proxyProvider != null) {
-			return proxyProvider.getProxyForHost(host, proxyType);
-		}
-		return null;
-	}
-
-	public void setCredentials(AuthenticationType authType, String username, String password) {
-		credentialsByType.put(authType, new AuthenticationCredentials(username, password));
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebRequest.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebRequest.java
deleted file mode 100644
index 7956815..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebRequest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.util.concurrent.Callable;
-
-/**
- * @author Steffen Pingel
- * @since 3.0
- */
-public abstract class WebRequest<T> implements Callable<T> {
-
-	/**
-	 * @since 3.0
-	 */
-	public abstract void abort();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebUtil.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebUtil.java
deleted file mode 100644
index 913b973..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/commons/net/WebUtil.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.net;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.Socket;
-import java.net.Proxy.Type;
-import java.text.ParseException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.swing.text.html.HTML.Tag;
-
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.NTCredentials;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.params.DefaultHttpParams;
-import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.commons.httpclient.util.IdleConnectionTimeoutThread;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.eclipse.core.net.proxy.IProxyData;
-import org.eclipse.core.net.proxy.IProxyService;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.mylyn.commons.net.HtmlStreamTokenizer.Token;
-import org.eclipse.mylyn.internal.commons.net.AuthenticatedProxy;
-import org.eclipse.mylyn.internal.commons.net.CloneableHostConfiguration;
-import org.eclipse.mylyn.internal.commons.net.CommonsNetPlugin;
-import org.eclipse.mylyn.internal.commons.net.PollingInputStream;
-import org.eclipse.mylyn.internal.commons.net.PollingProtocolSocketFactory;
-import org.eclipse.mylyn.internal.commons.net.PollingSslProtocolSocketFactory;
-import org.eclipse.mylyn.internal.commons.net.TimeoutInputStream;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- * @author Rob Elves
- * @since 3.0
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class WebUtil {
-
-	/**
-	 * like Mylyn/2.1.0 (Rally Connector 1.0) Eclipse/3.3.0 (JBuilder 2007) HttpClient/3.0.1 Java/1.5.0_11 (Sun)
-	 * Linux/2.6.20-16-lowlatency (i386; en)
-	 */
-	private static final String USER_AGENT;
-
-	private static final int CONNNECT_TIMEOUT = 60 * 1000;
-
-	private static final int SOCKET_TIMEOUT = 3 * 60 * 1000;
-
-	private static final int HTTP_PORT = 80;
-
-	private static final int HTTPS_PORT = 443;
-
-	private static final int POLL_INTERVAL = 1000;
-
-	private static final int POLL_ATTEMPTS = SOCKET_TIMEOUT / POLL_INTERVAL;
-
-	private static final String USER_AGENT_PREFIX;
-
-	private static final String USER_AGENT_POSTFIX;
-
-	private static final int BUFFER_SIZE = 4096;
-
-	/**
-	 * Do not block.
-	 */
-	private static final long CLOSE_TIMEOUT = -1;
-
-	/**
-	 * @see IdleConnectionTimeoutThread#setTimeoutInterval(long)
-	 */
-	private static final long CONNECTION_TIMEOUT_INTERVAL = 30 * 1000;
-
-	static {
-		initCommonsLoggingSettings();
-
-		StringBuilder sb = new StringBuilder();
-		sb.append("Mylyn"); //$NON-NLS-1$
-		sb.append(getBundleVersion(CommonsNetPlugin.getDefault()));
-
-		USER_AGENT_PREFIX = sb.toString();
-		sb.setLength(0);
-
-		if (System.getProperty("org.osgi.framework.vendor") != null) { //$NON-NLS-1$
-			sb.append(" "); //$NON-NLS-1$
-			sb.append(System.getProperty("org.osgi.framework.vendor")); //$NON-NLS-1$
-			sb.append(stripQualifier(System.getProperty("osgi.framework.version"))); //$NON-NLS-1$
-
-			if (System.getProperty("eclipse.product") != null) { //$NON-NLS-1$
-				sb.append(" ("); //$NON-NLS-1$
-				sb.append(System.getProperty("eclipse.product")); //$NON-NLS-1$
-				sb.append(")"); //$NON-NLS-1$
-			}
-		}
-
-		sb.append(" "); //$NON-NLS-1$
-		sb.append(DefaultHttpParams.getDefaultParams().getParameter(HttpMethodParams.USER_AGENT).toString().split("-")[1]); //$NON-NLS-1$
-
-		sb.append(" Java/"); //$NON-NLS-1$
-		sb.append(System.getProperty("java.version")); //$NON-NLS-1$
-		sb.append(" ("); //$NON-NLS-1$
-		sb.append(System.getProperty("java.vendor").split(" ")[0]); //$NON-NLS-1$ //$NON-NLS-2$
-		sb.append(") "); //$NON-NLS-1$
-
-		sb.append(System.getProperty("os.name")); //$NON-NLS-1$
-		sb.append("/"); //$NON-NLS-1$
-		sb.append(System.getProperty("os.version")); //$NON-NLS-1$
-		sb.append(" ("); //$NON-NLS-1$
-		sb.append(System.getProperty("os.arch")); //$NON-NLS-1$
-		if (System.getProperty("osgi.nl") != null) { //$NON-NLS-1$
-			sb.append("; "); //$NON-NLS-1$
-			sb.append(System.getProperty("osgi.nl")); //$NON-NLS-1$
-		}
-		sb.append(")"); //$NON-NLS-1$
-
-		USER_AGENT_POSTFIX = sb.toString();
-
-		USER_AGENT = USER_AGENT_PREFIX + USER_AGENT_POSTFIX;
-	}
-
-	private static IdleConnectionTimeoutThread idleConnectionTimeoutThread;
-
-	private static MultiThreadedHttpConnectionManager connectionManager;
-
-	/**
-	 * @since 3.0
-	 */
-	public static void configureHttpClient(HttpClient client, String userAgent) {
-		client.getParams().setBooleanParameter(HttpClientParams.ALLOW_CIRCULAR_REDIRECTS, true);
-		client.getParams().setParameter(HttpMethodParams.USER_AGENT, getUserAgent(userAgent));
-		// TODO consider setting this as the default
-		//client.getParams().setCookiePolicy(CookiePolicy.RFC_2109);
-		configureHttpClientConnectionManager(client);
-	}
-
-	private static void configureHttpClientConnectionManager(HttpClient client) {
-		client.getHttpConnectionManager().getParams().setSoTimeout(WebUtil.SOCKET_TIMEOUT);
-		client.getHttpConnectionManager().getParams().setConnectionTimeout(WebUtil.CONNNECT_TIMEOUT);
-	}
-
-	private static void configureHttpClientProxy(HttpClient client, HostConfiguration hostConfiguration,
-			AbstractWebLocation location) {
-		String host = WebUtil.getHost(location.getUrl());
-
-		Proxy proxy;
-		if (WebUtil.isRepositoryHttps(location.getUrl())) {
-			proxy = location.getProxyForHost(host, IProxyData.HTTPS_PROXY_TYPE);
-		} else {
-			proxy = location.getProxyForHost(host, IProxyData.HTTP_PROXY_TYPE);
-		}
-
-		if (proxy != null && !Proxy.NO_PROXY.equals(proxy)) {
-			InetSocketAddress address = (InetSocketAddress) proxy.address();
-			hostConfiguration.setProxy(address.getHostName(), address.getPort());
-			if (proxy instanceof AuthenticatedProxy) {
-				AuthenticatedProxy authProxy = (AuthenticatedProxy) proxy;
-				Credentials credentials = getCredentials(authProxy.getUserName(), authProxy.getPassword(),
-						address.getAddress());
-				AuthScope proxyAuthScope = new AuthScope(address.getHostName(), address.getPort(), AuthScope.ANY_REALM);
-				client.getState().setProxyCredentials(proxyAuthScope, credentials);
-			}
-		} else {
-			hostConfiguration.setProxyHost(null);
-		}
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static void connect(final Socket socket, final InetSocketAddress address, final int timeout,
-			IProgressMonitor monitor) throws IOException {
-		if (socket == null) {
-			throw new IllegalArgumentException();
-		}
-
-		WebRequest<?> executor = new WebRequest<Object>() {
-			@Override
-			public void abort() {
-				try {
-					socket.close();
-				} catch (IOException e) {
-					// ignore
-				}
-			}
-
-			public Object call() throws Exception {
-				socket.connect(address, timeout);
-				return null;
-			}
-
-		};
-
-		executeInternal(monitor, executor);
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static HostConfiguration createHostConfiguration(HttpClient client, AbstractWebLocation location,
-			IProgressMonitor monitor) {
-		Assert.isNotNull(client);
-		Assert.isNotNull(location);
-
-		String url = location.getUrl();
-		String host = WebUtil.getHost(url);
-		int port = WebUtil.getPort(url);
-
-		configureHttpClientConnectionManager(client);
-
-		HostConfiguration hostConfiguration = new CloneableHostConfiguration();
-		configureHttpClientProxy(client, hostConfiguration, location);
-
-		AuthenticationCredentials credentials = location.getCredentials(AuthenticationType.HTTP);
-		if (credentials != null) {
-			AuthScope authScope = new AuthScope(host, port, AuthScope.ANY_REALM);
-			client.getState().setCredentials(authScope, getHttpClientCredentials(credentials, host));
-		}
-
-		if (WebUtil.isRepositoryHttps(url)) {
-			ProtocolSocketFactory socketFactory = new PollingSslProtocolSocketFactory(monitor);
-			Protocol protocol = new Protocol("https", socketFactory, port); //$NON-NLS-1$
-			hostConfiguration.setHost(host, port, protocol);
-		} else {
-			ProtocolSocketFactory socketFactory = new PollingProtocolSocketFactory(monitor);
-			Protocol protocol = new Protocol("http", socketFactory, port); //$NON-NLS-1$
-			hostConfiguration.setHost(host, port, protocol);
-		}
-
-		return hostConfiguration;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static int execute(final HttpClient client, final HostConfiguration hostConfiguration,
-			final HttpMethod method, IProgressMonitor monitor) throws IOException {
-		return execute(client, hostConfiguration, method, null, monitor);
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public static int execute(final HttpClient client, final HostConfiguration hostConfiguration,
-			final HttpMethod method, final HttpState state, IProgressMonitor monitor) throws IOException {
-		Assert.isNotNull(client);
-		Assert.isNotNull(method);
-
-		monitor = Policy.monitorFor(monitor);
-
-		WebRequest<Integer> executor = new WebRequest<Integer>() {
-			@Override
-			public void abort() {
-				method.abort();
-			}
-
-			public Integer call() throws Exception {
-				return client.executeMethod(hostConfiguration, method, state);
-			}
-		};
-
-		return executeInternal(monitor, executor);
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static <T> T execute(IProgressMonitor monitor, WebRequest<T> request) throws Throwable {
-		monitor = Policy.monitorFor(monitor);
-
-		Future<T> future = CommonsNetPlugin.getExecutorService().submit(request);
-		while (true) {
-			if (monitor.isCanceled()) {
-				if (!future.cancel(false)) {
-					request.abort();
-				}
-				// wait for executor to finish
-				try {
-					if (!future.isCancelled()) {
-						future.get();
-					}
-				} catch (InterruptedException e) {
-					// ignore
-				} catch (ExecutionException e) {
-					// ignore
-				}
-				throw new OperationCanceledException();
-			}
-
-			try {
-				return future.get(POLL_INTERVAL, TimeUnit.MILLISECONDS);
-			} catch (ExecutionException e) {
-				throw e.getCause();
-			} catch (TimeoutException ignored) {
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <T> T executeInternal(IProgressMonitor monitor, WebRequest<?> request) throws IOException {
-		try {
-			return (T) execute(monitor, request);
-		} catch (IOException e) {
-			throw e;
-		} catch (RuntimeException e) {
-			throw e;
-		} catch (Error e) {
-			throw e;
-		} catch (Throwable e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private static String getBundleVersion(Plugin plugin) {
-		if (null == plugin) {
-			return ""; //$NON-NLS-1$
-		}
-		Object bundleVersion = plugin.getBundle().getHeaders().get("Bundle-Version"); //$NON-NLS-1$
-		if (null == bundleVersion) {
-			return ""; //$NON-NLS-1$
-		}
-		return stripQualifier((String) bundleVersion);
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static int getConnectionTimeout() {
-		return CONNNECT_TIMEOUT;
-	}
-
-	static Credentials getCredentials(final String username, final String password, final InetAddress address) {
-		int i = username.indexOf("\\"); //$NON-NLS-1$
-		if (i > 0 && i < username.length() - 1 && address != null) {
-			return new NTCredentials(username.substring(i + 1), password, address.getHostName(), username.substring(0,
-					i));
-		} else {
-			return new UsernamePasswordCredentials(username, password);
-		}
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static String getHost(String repositoryUrl) {
-		String result = repositoryUrl;
-		int colonSlashSlash = repositoryUrl.indexOf("://"); //$NON-NLS-1$
-
-		if (colonSlashSlash >= 0) {
-			result = repositoryUrl.substring(colonSlashSlash + 3);
-		}
-
-		int colonPort = result.indexOf(':');
-		int requestPath = result.indexOf('/');
-
-		int substringEnd;
-
-		// minimum positive, or string length
-		if (colonPort > 0 && requestPath > 0) {
-			substringEnd = Math.min(colonPort, requestPath);
-		} else if (colonPort > 0) {
-			substringEnd = colonPort;
-		} else if (requestPath > 0) {
-			substringEnd = requestPath;
-		} else {
-			substringEnd = result.length();
-		}
-
-		return result.substring(0, substringEnd);
-	}
-
-	/**
-	 * @since 2.2
-	 */
-	public static Credentials getHttpClientCredentials(AuthenticationCredentials credentials, String host) {
-		String username = credentials.getUserName();
-		String password = credentials.getPassword();
-		int i = username.indexOf("\\"); //$NON-NLS-1$
-		if (i > 0 && i < username.length() - 1 && host != null) {
-			return new NTCredentials(username.substring(i + 1), password, host, username.substring(0, i));
-		} else {
-			return new UsernamePasswordCredentials(username, password);
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public static int getPort(String repositoryUrl) {
-		int colonSlashSlash = repositoryUrl.indexOf("://"); //$NON-NLS-1$
-		int firstSlash = repositoryUrl.indexOf("/", colonSlashSlash + 3); //$NON-NLS-1$
-		int colonPort = repositoryUrl.indexOf(':', colonSlashSlash + 1);
-		if (firstSlash == -1) {
-			firstSlash = repositoryUrl.length();
-		}
-		if (colonPort < 0 || colonPort > firstSlash) {
-			return isRepositoryHttps(repositoryUrl) ? HTTPS_PORT : HTTP_PORT;
-		}
-
-		int requestPath = repositoryUrl.indexOf('/', colonPort + 1);
-		int end = requestPath < 0 ? repositoryUrl.length() : requestPath;
-		String port = repositoryUrl.substring(colonPort + 1, end);
-		if (port.length() == 0) {
-			return isRepositoryHttps(repositoryUrl) ? HTTPS_PORT : HTTP_PORT;
-		}
-
-		return Integer.parseInt(port);
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public static String getRequestPath(String repositoryUrl) {
-		int colonSlashSlash = repositoryUrl.indexOf("://"); //$NON-NLS-1$
-		int requestPath = repositoryUrl.indexOf('/', colonSlashSlash + 3);
-
-		if (requestPath < 0) {
-			return ""; //$NON-NLS-1$
-		} else {
-			return repositoryUrl.substring(requestPath);
-		}
-	}
-
-	public static InputStream getResponseBodyAsStream(HttpMethodBase method, IProgressMonitor monitor)
-			throws IOException {
-		monitor = Policy.monitorFor(monitor);
-		return new PollingInputStream(new TimeoutInputStream(method.getResponseBodyAsStream(), BUFFER_SIZE,
-				POLL_INTERVAL, CLOSE_TIMEOUT), POLL_ATTEMPTS, monitor);
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public static int getSocketTimeout() {
-		return SOCKET_TIMEOUT;
-	}
-
-	/**
-	 * Returns the title of a web page.
-	 * 
-	 * @throws IOException
-	 *             if a network occurs
-	 * @return the title; null, if the title could not be determined;
-	 * 
-	 * @since 3.0
-	 */
-	public static String getTitleFromUrl(AbstractWebLocation location, IProgressMonitor monitor) throws IOException {
-		monitor = Policy.monitorFor(monitor);
-		try {
-			monitor.beginTask("Retrieving " + location.getUrl(), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-
-			HttpClient client = new HttpClient();
-			WebUtil.configureHttpClient(client, ""); //$NON-NLS-1$
-
-			GetMethod method = new GetMethod(location.getUrl());
-			try {
-				HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, monitor);
-				int result = WebUtil.execute(client, hostConfiguration, method, monitor);
-				if (result == HttpStatus.SC_OK) {
-					InputStream in = WebUtil.getResponseBodyAsStream(method, monitor);
-					try {
-						BufferedReader reader = new BufferedReader(new InputStreamReader(in,
-								method.getResponseCharSet()));
-						HtmlStreamTokenizer tokenizer = new HtmlStreamTokenizer(reader, null);
-						try {
-							for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) {
-								if (token.getType() == Token.TAG) {
-									HtmlTag tag = (HtmlTag) token.getValue();
-									if (tag.getTagType() == Tag.TITLE) {
-										String text = getText(tokenizer);
-										text = text.replaceAll("\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
-										text = text.replaceAll("\\s+", " "); //$NON-NLS-1$ //$NON-NLS-2$
-										return text.trim();
-									}
-								}
-							}
-						} catch (ParseException e) {
-							throw new IOException("Error reading url"); //$NON-NLS-1$
-						}
-					} finally {
-						in.close();
-					}
-				}
-			} finally {
-				method.releaseConnection();
-			}
-		} finally {
-			monitor.done();
-		}
-		return null;
-	}
-
-	private static String getText(HtmlStreamTokenizer tokenizer) throws IOException, ParseException {
-		StringBuilder sb = new StringBuilder();
-		for (Token token = tokenizer.nextToken(); token.getType() != Token.EOF; token = tokenizer.nextToken()) {
-			if (token.getType() == Token.TEXT) {
-				sb.append(token.toString());
-			} else if (token.getType() == Token.COMMENT) {
-				// ignore
-			} else {
-				break;
-			}
-		}
-		return StringEscapeUtils.unescapeHtml(sb.toString());
-	}
-
-	/**
-	 * Returns a user agent string that contains information about the platform and operating system. The
-	 * <code>product</code> parameter allows to additional specify custom text that is inserted into the returned
-	 * string. The exact return value depends on the environment.
-	 * 
-	 * <p>
-	 * Examples:
-	 * <ul>
-	 * <li>Headless: <code>Mylyn MyProduct HttpClient/3.1 Java/1.5.0_13 (Sun) Linux/2.6.22-14-generic (i386)</code>
-	 * <li>Eclipse:
-	 * <code>Mylyn/2.2.0 Eclipse/3.4.0 (org.eclipse.sdk.ide) HttpClient/3.1 Java/1.5.0_13 (Sun) Linux/2.6.22-14-generic (i386; en_CA)</code>
-	 * 
-	 * @param product
-	 *            an identifier that is inserted into the returned user agent string
-	 * @return a user agent string
-	 * @since 2.3
-	 */
-	public static String getUserAgent(String product) {
-		if (product != null && product.length() > 0) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(USER_AGENT_PREFIX);
-			sb.append(" "); //$NON-NLS-1$
-			sb.append(product);
-			sb.append(USER_AGENT_POSTFIX);
-			return sb.toString();
-		} else {
-			return USER_AGENT;
-		}
-	}
-
-	public static void init() {
-		// initialization is done in the static initializer		
-	}
-
-	/**
-	 * Disables logging by default. Set these system properties on launch enables verbose logging of HTTP communication:
-	 * 
-	 * <pre>
-	 * -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
-	 * -Dorg.apache.commons.logging.simplelog.showlogname=true 
-	 * -Dorg.apache.commons.logging.simplelog.defaultlog=off
-	 * -Dorg.apache.commons.logging.simplelog.log.httpclient.wire=debug
-	 * -Dorg.apache.commons.logging.simplelog.log.org.apache.commons.httpclient=off
-	 * -Dorg.apache.commons.logging.simplelog.log.org.apache.axis.message=debug
-	 * </pre>
-	 */
-	private static void initCommonsLoggingSettings() {
-		defaultSystemProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.NoOpLog"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Only sets system property if they are not already set to a value.
-	 */
-	private static void defaultSystemProperty(String key, String defaultValue) {
-		if (System.getProperty(key) == null) {
-			System.setProperty(key, defaultValue);
-		}
-	}
-
-	private static boolean isRepositoryHttps(String repositoryUrl) {
-		return repositoryUrl.matches("https.*"); //$NON-NLS-1$
-	}
-
-	private static String stripQualifier(String longVersion) {
-		if (longVersion == null) {
-			return ""; //$NON-NLS-1$
-		}
-
-		String parts[] = longVersion.split("\\."); //$NON-NLS-1$
-		StringBuilder version = new StringBuilder();
-		if (parts.length > 0) {
-			version.append("/"); //$NON-NLS-1$
-			version.append(parts[0]);
-			if (parts.length > 1) {
-				version.append("."); //$NON-NLS-1$
-				version.append(parts[1]);
-				if (parts.length > 2) {
-					version.append("."); //$NON-NLS-1$
-					version.append(parts[2]);
-				}
-			}
-		}
-		return version.toString();
-
-	}
-
-	/**
-	 * For standalone applications that want to provide a global proxy service.
-	 * 
-	 * @param proxyService
-	 *            the proxy service
-	 * @since 3.0
-	 */
-	public static void setProxyService(IProxyService proxyService) {
-		CommonsNetPlugin.setProxyService(proxyService);
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public static IProxyService getProxyService() {
-		return CommonsNetPlugin.getProxyService();
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public synchronized static void addConnectionManager(HttpConnectionManager connectionManager) {
-		if (idleConnectionTimeoutThread == null) {
-			idleConnectionTimeoutThread = new IdleConnectionTimeoutThread();
-			idleConnectionTimeoutThread.setTimeoutInterval(CONNECTION_TIMEOUT_INTERVAL);
-			idleConnectionTimeoutThread.setConnectionTimeout(CONNNECT_TIMEOUT);
-			idleConnectionTimeoutThread.start();
-		}
-		idleConnectionTimeoutThread.addConnectionManager(connectionManager);
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public synchronized static HttpConnectionManager getConnectionManager() {
-		if (connectionManager == null) {
-			connectionManager = new MultiThreadedHttpConnectionManager();
-			addConnectionManager(connectionManager);
-		}
-		return connectionManager;
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public synchronized static void removeConnectionManager(HttpConnectionManager connectionManager) {
-		if (idleConnectionTimeoutThread == null) {
-			return;
-		}
-		idleConnectionTimeoutThread.removeConnectionManager(connectionManager);
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	@SuppressWarnings("deprecation")
-	public static Proxy getProxy(String host, String proxyType) {
-		Assert.isNotNull(host);
-		Assert.isNotNull(proxyType);
-		IProxyService service = CommonsNetPlugin.getProxyService();
-		if (service != null && service.isProxiesEnabled()) {
-			// TODO e3.5 move to new proxy API
-			IProxyData data = service.getProxyDataForHost(host, proxyType);
-			if (data != null && data.getHost() != null) {
-				String proxyHost = data.getHost();
-				int proxyPort = data.getPort();
-				// change the IProxyData default port to the Java default port
-				if (proxyPort == -1) {
-					proxyPort = 0;
-				}
-
-				AuthenticationCredentials credentials = null;
-				if (data.isRequiresAuthentication()) {
-					credentials = new AuthenticationCredentials(data.getUserId(), data.getPassword());
-				}
-				return createProxy(proxyHost, proxyPort, credentials);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public static Proxy getProxy(String host, Proxy.Type proxyType) {
-		Assert.isNotNull(host);
-		Assert.isNotNull(proxyType);
-		return getProxy(host, getPlatformProxyType(proxyType));
-	}
-
-//	private static Type getJavaProxyType(String type) {
-//		return (IProxyData.SOCKS_PROXY_TYPE.equals(type)) ? Proxy.Type.SOCKS : Proxy.Type.HTTP;
-//	}
-
-	private static String getPlatformProxyType(Type type) {
-		return type == Type.SOCKS ? IProxyData.SOCKS_PROXY_TYPE : IProxyData.HTTP_PROXY_TYPE;
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public static Proxy createProxy(String proxyHost, int proxyPort, AuthenticationCredentials credentials) {
-		String proxyUsername = ""; //$NON-NLS-1$
-		String proxyPassword = ""; //$NON-NLS-1$
-		if (credentials != null) {
-			proxyUsername = credentials.getUserName();
-			proxyPassword = credentials.getPassword();
-		}
-		if (proxyHost != null && proxyHost.length() > 0) {
-			InetSocketAddress sockAddr = new InetSocketAddress(proxyHost, proxyPort);
-			boolean authenticated = (proxyUsername != null && proxyPassword != null && proxyUsername.length() > 0 && proxyPassword.length() > 0);
-			if (authenticated) {
-				return new AuthenticatedProxy(Type.HTTP, sockAddr, proxyUsername, proxyPassword);
-			} else {
-				return new Proxy(Type.HTTP, sockAddr);
-			}
-		}
-		return Proxy.NO_PROXY;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/AuthenticatedProxy.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/AuthenticatedProxy.java
deleted file mode 100644
index a3b7d4a..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/AuthenticatedProxy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.net.Proxy;
-import java.net.SocketAddress;
-
-/**
- * Abstraction for a proxy that supports user authentication.
- * 
- * @author Rob Elves
- * @since 2.0
- */
-public class AuthenticatedProxy extends Proxy {
-
-	private String userName = ""; //$NON-NLS-1$
-
-	private String password = ""; //$NON-NLS-1$
-
-	public AuthenticatedProxy(Type type, SocketAddress sa, String userName, String password) {
-		super(type, sa);
-		this.userName = userName;
-		this.password = password;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CloneableHostConfiguration.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CloneableHostConfiguration.java
deleted file mode 100644
index 6f09d75..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CloneableHostConfiguration.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     John Kristian - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpHost;
-import org.apache.commons.httpclient.protocol.Protocol;
-
-/**
- * Based on org.apache.commons.httpclient.contrib.ssl.HostConfigurationWithStickyProtocol.
- * 
- * @author John Kristian
- * @author Steffen Pingel
- */
-public class CloneableHostConfiguration extends HostConfiguration {
-
-	public CloneableHostConfiguration() {
-	}
-
-	public CloneableHostConfiguration(CloneableHostConfiguration hostConfiguration) {
-		super(hostConfiguration);
-	}
-
-	@Override
-	public Object clone() {
-		return new CloneableHostConfiguration(this);
-	}
-
-	@Override
-	public synchronized void setHost(String host, int port, String scheme) {
-		setHost(new HttpHost(host, port, getProtocol(host, port, scheme)));
-	}
-
-	/**
-	 * Keeps the previous {@link Protocol} if the <code>scheme</code> matches the previous protocol scheme.
-	 */
-	private Protocol getProtocol(String host, int port, String scheme) {
-		final Protocol oldProtocol = getProtocol();
-		if (oldProtocol != null) {
-			final String oldScheme = oldProtocol.getScheme();
-			if (oldScheme == scheme || (oldScheme != null && oldScheme.equalsIgnoreCase(scheme))) {
-				return oldProtocol;
-			}
-		}
-		return Protocol.getProtocol(scheme);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CommonsNetPlugin.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CommonsNetPlugin.java
deleted file mode 100644
index 40affb4..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/CommonsNetPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Michael Valenta - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.core.net.proxy.IProxyService;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Provides an entry point for the proxy service and potentially other web facilities
- * 
- * @author Mik Kersten
- * @author Steffen Pingel
- * @since 2.0
- */
-public class CommonsNetPlugin extends Plugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.commons.net"; //$NON-NLS-1$
-
-	private static CommonsNetPlugin INSTANCE;
-
-	private static final int MAX_CONCURRENT_REQUESTS = 100;
-
-	private static IProxyService proxyService;
-
-	private static ExecutorService service;
-
-	public static CommonsNetPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	public static synchronized ExecutorService getExecutorService() {
-		if (service == null) {
-			service = new ThreadPoolExecutor(1, MAX_CONCURRENT_REQUESTS, 10L, TimeUnit.SECONDS,
-					new SynchronousQueue<Runnable>());
-		}
-		return service;
-	}
-
-	/**
-	 * Return the {@link IProxyService} or <code>null</code> if the service is not available.
-	 * 
-	 * @return the {@link IProxyService} or <code>null</code>
-	 */
-	public synchronized static IProxyService getProxyService() {
-		if (proxyService == null) {
-			if (INSTANCE != null && INSTANCE.tracker != null) {
-				return (IProxyService) INSTANCE.tracker.getService();
-			}
-		}
-		return proxyService;
-	}
-
-	public static void log(int error, String message, Throwable e) {
-		if (getDefault() != null) {
-			getDefault().getLog().log(new Status(IStatus.ERROR, ID_PLUGIN, error, message, e));
-		}
-	}
-
-	public synchronized static void setProxyService(IProxyService proxyService) {
-		CommonsNetPlugin.proxyService = proxyService;
-	}
-
-	private ServiceTracker tracker;
-
-	public CommonsNetPlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		tracker = new ServiceTracker(getBundle().getBundleContext(), IProxyService.class.getName(), null);
-		tracker.open();
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		tracker.close();
-		tracker = null;
-		if (service != null) {
-			service.shutdown();
-			service = null;
-		}
-		super.stop(context);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/InfiniteSubProgressMonitor.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/InfiniteSubProgressMonitor.java
deleted file mode 100644
index e9b90ad..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/InfiniteSubProgressMonitor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * Provides an infinite progress monitor by subdividing by half repeatedly.
- * 
- * The ticks parameter represents the number of ticks shown in the progress dialog (or propogated up to a parent
- * IProgressMonitor). The totalWork parameter provided in actually a hint used to determine how work is translated into
- * ticks. The number of totalWork that can actually be worked is n*totalWork/2 where 2^n = totalWork. What this means is
- * that if you provide a totalWork of 32 (2^5) than the maximum number of ticks is 5*32/2 = 80.
- * 
- */
-public class InfiniteSubProgressMonitor extends SubProgressMonitor {
-
-	int totalWork;
-
-	int halfWay;
-
-	int currentIncrement;
-
-	int nextProgress;
-
-	int worked;
-
-	/**
-	 * Constructor for InfiniteSubProgressMonitor.
-	 * 
-	 * @param monitor
-	 * @param ticks
-	 */
-	public InfiniteSubProgressMonitor(IProgressMonitor monitor, int ticks) {
-		this(monitor, ticks, 0);
-	}
-
-	/**
-	 * Constructor for InfiniteSubProgressMonitor.
-	 * 
-	 * @param monitor
-	 * @param ticks
-	 * @param style
-	 */
-	public InfiniteSubProgressMonitor(IProgressMonitor monitor, int ticks, int style) {
-		super(monitor, ticks, style);
-	}
-
-	@Override
-	public void beginTask(String name, int totalWork) {
-		super.beginTask(name, totalWork);
-		this.totalWork = totalWork;
-		this.halfWay = totalWork / 2;
-		this.currentIncrement = 1;
-		this.nextProgress = currentIncrement;
-		this.worked = 0;
-	}
-
-	@Override
-	public void worked(int work) {
-		if (worked >= totalWork) {
-			return;
-		}
-		if (--nextProgress <= 0) {
-			super.worked(1);
-			worked++;
-			if (worked >= halfWay) {
-				// we have passed the current halfway point, so double the
-				// increment and reset the halfway point.
-				currentIncrement *= 2;
-				halfWay += (totalWork - halfWay) / 2;
-			}
-			// reset the progress counter to another full increment
-			nextProgress = currentIncrement;
-		}
-	}
-
-	/**
-	 * Don't allow clearing of the subtask. This will stop the flickering of the subtask in the progress dialogs.
-	 * 
-	 * @see IProgressMonitor#subTask(String)
-	 */
-	@Override
-	public void subTask(String name) {
-		if (name != null && !name.equals("")) { //$NON-NLS-1$
-			super.subTask(name);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/Messages.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/Messages.java
deleted file mode 100644
index fb07664..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.commons.net.messages";//$NON-NLS-1$
-
-	public static String PollingInputStream_readTimeout;
-
-	public static String PollingInputStream_closeTimeout;
-
-	public static String PollingOutputStream_writeTimeout;
-
-	public static String PollingOutputStream_closeTimeout;
-
-	public static String TimeoutOutputStream_cannotWriteToStream;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingInputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingInputStream.java
deleted file mode 100644
index d1608de..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingInputStream.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.mylyn.commons.net.Policy;
-
-/**
- * Polls a progress monitor periodically and handles timeouts over extended durations. For this class to be effective, a
- * high numAttempts should be specified, and the underlying stream should time out frequently on reads (every second or
- * so).
- * 
- * Supports resuming partially completed operations after an InterruptedIOException if the underlying stream does. Check
- * the bytesTransferred field to determine how much of the operation completed; conversely, at what point to resume.
- */
-public class PollingInputStream extends FilterInputStream {
-	private static final boolean DEBUG = Policy.DEBUG_STREAMS;
-
-	private final int numAttempts;
-
-	private final IProgressMonitor monitor;
-
-	private boolean cancellable;
-
-	/**
-	 * Creates a new polling input stream.
-	 * 
-	 * @param in
-	 *            the underlying input stream
-	 * @param numAttempts
-	 *            the number of attempts before issuing an InterruptedIOException, if 0, retries indefinitely until
-	 *            canceled
-	 * @param monitor
-	 *            the progress monitor to be polled for cancellation
-	 */
-	public PollingInputStream(InputStream in, int numAttempts, IProgressMonitor monitor) {
-		super(in);
-		this.numAttempts = numAttempts;
-		this.monitor = monitor;
-		this.cancellable = true;
-	}
-
-	/**
-	 * Wraps the underlying stream's method. It may be important to wait for an input stream to be closed because it
-	 * holds an implicit lock on a system resource (such as a file) while it is open. Closing a stream may take time if
-	 * the underlying stream is still servicing a previous request.
-	 * 
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times
-	 */
-	@Override
-	public void close() throws InterruptedIOException {
-		int attempts = 0;
-		try {
-			readPendingInput();
-		} catch (IOException e) {
-			// We shouldn't get an exception when we're getting the available input.
-			// If we do, just log it so we can close.
-			CommonsNetPlugin.log(IStatus.ERROR, e.getMessage(), e);
-		} finally {
-			boolean stop = false;
-			while (!stop) {
-				try {
-					if (in != null) {
-						in.close();
-					}
-					stop = true;
-				} catch (InterruptedIOException e) {
-					if (checkCancellation()) {
-						throw new OperationCanceledException();
-					}
-					if (++attempts == numAttempts) {
-						throw new InterruptedIOException(Messages.PollingInputStream_closeTimeout);
-					}
-					if (DEBUG) {
-						System.out.println("close retry=" + attempts); //$NON-NLS-1$
-					}
-				} catch (IOException e) {
-					// ignore it - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=203423#c10
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @return the next byte of data, or -1 if the end of the stream is reached.
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times and no data was received, bytesTransferred
-	 *             will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public int read() throws IOException {
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				return in.read();
-			} catch (InterruptedIOException e) {
-				if (++attempts == numAttempts) {
-					throw new InterruptedIOException(Messages.PollingInputStream_readTimeout);
-				}
-				if (DEBUG) {
-					System.out.println("read retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @param buffer
-	 *            - the buffer into which the data is read.
-	 * @param off
-	 *            - the start offset of the data.
-	 * @param len
-	 *            - the maximum number of bytes read.
-	 * @return the total number of bytes read into the buffer, or -1 if there is no more data because the end of the
-	 *         stream has been reached.
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times and no data was received, bytesTransferred
-	 *             will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public int read(byte[] buffer, int off, int len) throws IOException {
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				return in.read(buffer, off, len);
-			} catch (InterruptedIOException e) {
-				if (e.bytesTransferred != 0) {
-					return e.bytesTransferred; // keep partial transfer
-				}
-				if (++attempts == numAttempts) {
-					throw new InterruptedIOException(Messages.PollingInputStream_readTimeout);
-				}
-				if (DEBUG) {
-					System.out.println("read retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @param count
-	 *            - the number of bytes to be skipped.
-	 * @return the actual number of bytes skipped.
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times and no data was received, bytesTransferred
-	 *             will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public long skip(long count) throws IOException {
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				return in.skip(count);
-			} catch (InterruptedIOException e) {
-				if (e.bytesTransferred != 0) {
-					return e.bytesTransferred; // keep partial transfer
-				}
-				if (++attempts == numAttempts) {
-					throw new InterruptedIOException(Messages.PollingInputStream_readTimeout);
-				}
-				if (DEBUG) {
-					System.out.println("read retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Reads any pending input from the input stream so that the stream can savely be closed.
-	 */
-	protected void readPendingInput() throws IOException {
-		byte[] buffer = new byte[2048];
-		while (true) {
-			int available = in.available();
-			if (available < 1) {
-				break;
-			}
-			if (available > buffer.length) {
-				available = buffer.length;
-			}
-			if (in.read(buffer, 0, available) < 1) {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Called to set whether cancellation will be checked by this stream. Turning cancellation checking off can be very
-	 * useful for protecting critical portions of a protocol that shouldn't be interrupted. For example, it is often
-	 * necessary to protect login sequences.
-	 * 
-	 * @param cancellable
-	 *            a flag controlling whether this stream will check for cancellation.
-	 */
-	public void setIsCancellable(boolean cancellable) {
-		this.cancellable = cancellable;
-	}
-
-	/**
-	 * Checked whether the monitor for this stream has been cancelled. If the cancellable flag is <code>false</code>
-	 * then the monitor is never cancelled.
-	 * 
-	 * @return <code>true</code> if the monitor has been cancelled and <code>false</code> otherwise.
-	 */
-	private boolean checkCancellation() {
-		if (cancellable) {
-			return monitor.isCanceled();
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingOutputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingOutputStream.java
deleted file mode 100644
index d152175..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingOutputStream.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.mylyn.commons.net.Policy;
-
-/**
- * Polls a progress monitor periodically and handles timeouts over extended durations. For this class to be effective, a
- * high numAttempts should be specified, and the underlying stream should time out frequently on writes (every second or
- * so).
- * 
- * Supports resuming partially completed operations after an InterruptedIOException if the underlying stream does. Check
- * the bytesTransferred field to determine how much of the operation completed; conversely, at what point to resume.
- */
-public class PollingOutputStream extends FilterOutputStream {
-	private static final boolean DEBUG = Policy.DEBUG_STREAMS;
-
-	private final int numAttempts;
-
-	private final IProgressMonitor monitor;
-
-	private boolean cancellable;
-
-	/**
-	 * Creates a new polling output stream.
-	 * 
-	 * @param out
-	 *            the underlying output stream
-	 * @param numAttempts
-	 *            the number of attempts before issuing an InterruptedIOException, if 0, retries indefinitely until
-	 *            canceled
-	 * @param monitor
-	 *            the progress monitor to be polled for cancellation
-	 */
-	public PollingOutputStream(OutputStream out, int numAttempts, IProgressMonitor monitor) {
-		super(out);
-		this.numAttempts = numAttempts;
-		this.monitor = monitor;
-		this.cancellable = true;
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times and no data was sent, bytesTransferred will
-	 *             be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void write(int b) throws IOException {
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				out.write(b);
-				return;
-			} catch (InterruptedIOException e) {
-				if (++attempts == numAttempts) {
-					throw new InterruptedIOException(Messages.PollingOutputStream_writeTimeout);
-				}
-				if (DEBUG) {
-					System.out.println("write retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times, bytesTransferred will reflect the number of
-	 *             bytes sent
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void write(byte[] buffer, int off, int len) throws IOException {
-		int count = 0;
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				out.write(buffer, off, len);
-				return;
-			} catch (InterruptedIOException e) {
-				int amount = e.bytesTransferred;
-				if (amount != 0) { // keep partial transfer
-					len -= amount;
-					if (len <= 0) {
-						return;
-					}
-					off += amount;
-					count += amount;
-					attempts = 0; // made some progress, don't time out quite yet
-				}
-				if (++attempts == numAttempts) {
-					e = new InterruptedIOException(Messages.PollingOutputStream_writeTimeout);
-					e.bytesTransferred = count;
-					throw e;
-				}
-				if (DEBUG) {
-					System.out.println("write retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method.
-	 * 
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times, bytesTransferred will reflect the number of
-	 *             bytes sent
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void flush() throws IOException {
-		int count = 0;
-		int attempts = 0;
-		for (;;) {
-			if (checkCancellation()) {
-				throw new OperationCanceledException();
-			}
-			try {
-				out.flush();
-				return;
-			} catch (InterruptedIOException e) {
-				int amount = e.bytesTransferred;
-				if (amount != 0) { // keep partial transfer
-					count += amount;
-					attempts = 0; // made some progress, don't time out quite yet
-				}
-				if (++attempts == numAttempts) {
-					e = new InterruptedIOException(Messages.PollingOutputStream_writeTimeout);
-					e.bytesTransferred = count;
-					throw e;
-				}
-				if (DEBUG) {
-					System.out.println("write retry=" + attempts); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	/**
-	 * Calls flush() then close() on the underlying stream.
-	 * 
-	 * @throws OperationCanceledException
-	 *             if the progress monitor is canceled
-	 * @throws InterruptedIOException
-	 *             if the underlying operation times out numAttempts times, bytesTransferred will reflect the number of
-	 *             bytes sent during the flush()
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void close() throws IOException {
-		int attempts = numAttempts - 1; // fail fast if flush() does times out
-		try {
-			out.flush();
-			attempts = 0;
-		} finally {
-			boolean stop = false;
-			while (!stop) {
-				try {
-					out.close();
-					stop = true;
-				} catch (InterruptedIOException e) {
-					if (checkCancellation()) {
-						throw new OperationCanceledException();
-					}
-					if (++attempts == numAttempts) {
-						throw new InterruptedIOException(Messages.PollingOutputStream_closeTimeout);
-					}
-					if (DEBUG) {
-						System.out.println("close retry=" + attempts); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Called to set whether cancellation will be checked by this stream. Turning cancellation checking off can be very
-	 * useful for protecting critical portions of a protocol that shouldn't be interrupted. For example, it is often
-	 * necessary to protect login sequences.
-	 * 
-	 * @param cancellable
-	 *            a flag controlling whether this stream will check for cancellation.
-	 */
-	public void setIsCancellable(boolean cancellable) {
-		this.cancellable = cancellable;
-	}
-
-	/**
-	 * Checked whether the monitor for this stream has been cancelled. If the cancellable flag is <code>false</code>
-	 * then the monitor is never cancelled.
-	 * 
-	 * @return <code>true</code> if the monitor has been cancelled and <code>false</code> otherwise.
-	 */
-	private boolean checkCancellation() {
-		if (cancellable) {
-			return monitor.isCanceled();
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingProtocolSocketFactory.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingProtocolSocketFactory.java
deleted file mode 100644
index 666aeb2..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingProtocolSocketFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import javax.net.SocketFactory;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.commons.net.WebUtil;
-
-/**
- * @author Steffen Pingel
- */
-public class PollingProtocolSocketFactory implements ProtocolSocketFactory {
-
-	private final static SocketFactory factory = SocketFactory.getDefault();
-
-	private final IProgressMonitor monitor;
-
-	public PollingProtocolSocketFactory(IProgressMonitor monitor) {
-		this.monitor = monitor;
-	}
-
-	public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-		return factory.createSocket(host, port);
-	}
-
-	public Socket createSocket(String host, int port, InetAddress localAddress, int localPort) throws IOException,
-			UnknownHostException {
-		return factory.createSocket(host, port, localAddress, localPort);
-	}
-
-	public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
-			HttpConnectionParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
-		if (params == null) {
-			throw new IllegalArgumentException("Parameters may not be null"); //$NON-NLS-1$
-		}
-
-		int timeout = params.getConnectionTimeout();
-		Socket socket = factory.createSocket();
-		socket.bind(new InetSocketAddress(localAddress, localPort));
-		// FIME convert OperationCanceledException?
-		WebUtil.connect(socket, new InetSocketAddress(host, port), timeout, monitor);
-		return socket;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingSslProtocolSocketFactory.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingSslProtocolSocketFactory.java
deleted file mode 100644
index cc63287..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/PollingSslProtocolSocketFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.commons.net.WebUtil;
-
-/**
- * @author Steffen Pingel
- */
-public class PollingSslProtocolSocketFactory implements SecureProtocolSocketFactory {
-
-	private final IProgressMonitor monitor;
-
-	private final SslProtocolSocketFactory factory;
-
-	public PollingSslProtocolSocketFactory(IProgressMonitor monitor) {
-		this.monitor = monitor;
-		this.factory = SslProtocolSocketFactory.getInstance();
-	}
-
-	public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException,
-			UnknownHostException {
-		return factory.createSocket(socket, host, port, autoClose);
-	}
-
-	public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-		return factory.createSocket(host, port);
-	}
-
-	public Socket createSocket(String host, int port, InetAddress localAddress, int localPort) throws IOException,
-			UnknownHostException {
-		return factory.createSocket(host, port, localAddress, localPort);
-	}
-
-	public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
-			HttpConnectionParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
-		if (params == null) {
-			throw new IllegalArgumentException("Parameters may not be null"); //$NON-NLS-1$
-		}
-
-		int timeout = params.getConnectionTimeout();
-		Socket socket = factory.getSocketFactory().createSocket();
-		socket.bind(new InetSocketAddress(localAddress, localPort));
-		WebUtil.connect(socket, new InetSocketAddress(host, port), timeout, monitor);
-		return socket;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ProgressMonitorInputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ProgressMonitorInputStream.java
deleted file mode 100644
index b672e64..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/ProgressMonitorInputStream.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Updates a progress monitor as bytes are read from the input stream. Also starts a background thread to provide
- * responsive cancellation on read().
- * 
- * Supports resuming partially completed operations after an InterruptedIOException if the underlying stream does. Check
- * the bytesTransferred field to determine how much of the operation completed; conversely, at what point to resume.
- */
-public abstract class ProgressMonitorInputStream extends FilterInputStream {
-	private final IProgressMonitor monitor;
-
-	private final int updateIncrement;
-
-	private final long bytesTotal;
-
-	private long bytesRead = 0;
-
-	private long lastUpdate = -1;
-
-	private long nextUpdate = 0;
-
-	/**
-	 * Creates a progress monitoring input stream.
-	 * 
-	 * @param in
-	 *            the underlying input stream
-	 * @param bytesTotal
-	 *            the number of bytes to read in total (passed to updateMonitor())
-	 * @param updateIncrement
-	 *            the number of bytes read between updates
-	 * @param monitor
-	 *            the progress monitor
-	 */
-	public ProgressMonitorInputStream(InputStream in, long bytesTotal, int updateIncrement, IProgressMonitor monitor) {
-		super(in);
-		this.bytesTotal = bytesTotal;
-		this.updateIncrement = updateIncrement;
-		this.monitor = monitor;
-		update(true);
-	}
-
-	protected abstract void updateMonitor(long bytesRead, long size, IProgressMonitor monitor);
-
-	/**
-	 * Wraps the underlying stream's method. Updates the progress monitor to the final number of bytes read.
-	 * 
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void close() throws IOException {
-		try {
-			in.close();
-		} finally {
-			update(true);
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method. Updates the progress monitor if the next update increment has been reached.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the operation was interrupted before all of the bytes specified have been skipped,
-	 *             bytesTransferred will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public int read() throws IOException {
-		int b = in.read();
-		if (b != -1) {
-			bytesRead += 1;
-			update(false);
-		}
-		return b;
-	}
-
-	/**
-	 * Wraps the underlying stream's method. Updates the progress monitor if the next update increment has been reached.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the operation was interrupted before all of the bytes specified have been skipped,
-	 *             bytesTransferred may be non-zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public int read(byte[] buffer, int offset, int length) throws IOException {
-		try {
-			int count = in.read(buffer, offset, length);
-			if (count != -1) {
-				bytesRead += count;
-				update(false);
-			}
-			return count;
-		} catch (InterruptedIOException e) {
-			bytesRead += e.bytesTransferred;
-			update(false);
-			throw e;
-		}
-	}
-
-	/**
-	 * Wraps the underlying stream's method. Updates the progress monitor if the next update increment has been reached.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the operation was interrupted before all of the bytes specified have been skipped,
-	 *             bytesTransferred may be non-zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public long skip(long amount) throws IOException {
-		try {
-			long count = in.skip(amount);
-			bytesRead += count;
-			update(false);
-			return count;
-		} catch (InterruptedIOException e) {
-			bytesRead += e.bytesTransferred;
-			update(false);
-			throw e;
-		}
-	}
-
-	/**
-	 * Mark is not supported by the wrapper even if the underlying stream does, returns false.
-	 */
-	@Override
-	public boolean markSupported() {
-		return false;
-	}
-
-	private void update(boolean now) {
-		if (bytesRead >= nextUpdate || now) {
-			nextUpdate = bytesRead - (bytesRead % updateIncrement);
-			if (nextUpdate != lastUpdate) {
-				updateMonitor(nextUpdate, bytesTotal, monitor);
-			}
-			lastUpdate = nextUpdate;
-			nextUpdate += updateIncrement;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/SslProtocolSocketFactory.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/SslProtocolSocketFactory.java
deleted file mode 100644
index 8052e3e..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/SslProtocolSocketFactory.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-
-/**
- * Provides support for managing SSL connections.
- * 
- * @author Nathan Hapke
- * @author Rob Elves
- * @author Steffen Pingel
- * @since 2.0
- */
-// TODO merge with PollingSslProtocolSocketFactory
-public class SslProtocolSocketFactory implements SecureProtocolSocketFactory {
-
-	private static final String KEY_STORE = "javax.net.ssl.keyStore"; //$NON-NLS-1$
-
-	private static final String KEY_STORE_TYPE = "javax.net.ssl.keyStoreType"; //$NON-NLS-1$
-
-	private static final String KEY_STORE_PASSWORD = "javax.net.ssl.keyStorePassword"; //$NON-NLS-1$
-
-	static SslProtocolSocketFactory factory = new SslProtocolSocketFactory();
-
-	public static SslProtocolSocketFactory getInstance() {
-		return factory;
-	}
-
-	private SSLSocketFactory socketFactory;
-
-	private final boolean hasKeyManager;
-
-	private SslProtocolSocketFactory() {
-		KeyManager[] keymanagers = null;
-		if (System.getProperty(KEY_STORE) != null && System.getProperty(KEY_STORE_PASSWORD) != null) {
-			try {
-				String type = System.getProperty(KEY_STORE_TYPE, KeyStore.getDefaultType());
-				KeyStore keyStore = KeyStore.getInstance(type);
-				char[] password = System.getProperty(KEY_STORE_PASSWORD).toCharArray();
-				keyStore.load(new FileInputStream(System.getProperty(KEY_STORE)), password);
-				KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-				keyManagerFactory.init(keyStore, password);
-				keymanagers = keyManagerFactory.getKeyManagers();
-			} catch (Exception e) {
-				CommonsNetPlugin.log(0, "Could not initialize keystore", e); //$NON-NLS-1$
-			}
-		}
-
-		hasKeyManager = keymanagers != null;
-
-		try {
-			SSLContext sslContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$
-			sslContext.init(keymanagers, new TrustManager[] { new TrustAllTrustManager() }, null);
-			this.socketFactory = sslContext.getSocketFactory();
-		} catch (Exception e) {
-			CommonsNetPlugin.log(0, "Could not initialize SSL context", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @since 2.3
-	 */
-	public SSLSocketFactory getSocketFactory() throws IOException {
-		if (socketFactory == null) {
-			throw new IOException("Could not initialize SSL context"); //$NON-NLS-1$
-		}
-		return socketFactory;
-	}
-
-	public Socket createSocket(String remoteHost, int remotePort) throws IOException, UnknownHostException {
-		return getSocketFactory().createSocket(remoteHost, remotePort);
-	}
-
-	public Socket createSocket(String remoteHost, int remotePort, InetAddress clientHost, int clientPort)
-			throws IOException, UnknownHostException {
-		return getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
-	}
-
-	public Socket createSocket(String remoteHost, int remotePort, InetAddress clientHost, int clientPort,
-			HttpConnectionParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
-		if (params == null) {
-			throw new IllegalArgumentException("Parameters may not be null"); //$NON-NLS-1$
-		}
-
-		int timeout = params.getConnectionTimeout();
-		if (timeout == 0) {
-			return getSocketFactory().createSocket(remoteHost, remotePort, clientHost, clientPort);
-		} else {
-			Socket socket = getSocketFactory().createSocket();
-			socket.bind(new InetSocketAddress(clientHost, clientPort));
-			socket.connect(new InetSocketAddress(remoteHost, remotePort), timeout);
-			return socket;
-		}
-	}
-
-	public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException,
-			UnknownHostException {
-		return getSocketFactory().createSocket(socket, host, port, autoClose);
-	}
-
-	public boolean hasKeyManager() {
-		return hasKeyManager;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutInputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutInputStream.java
deleted file mode 100644
index 6e89275..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutInputStream.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.mylyn.commons.net.Policy;
-
-/**
- * Wraps an input stream that blocks indefinitely to simulate timeouts on read(), skip(), and close(). The resulting
- * input stream is buffered and supports retrying operations that failed due to an InterruptedIOException.
- * 
- * Supports resuming partially completed operations after an InterruptedIOException REGARDLESS of whether the underlying
- * stream does unless the underlying stream itself generates InterruptedIOExceptions in which case it must also support
- * resuming. Check the bytesTransferred field to determine how much of the operation completed; conversely, at what
- * point to resume.
- */
-public class TimeoutInputStream extends FilterInputStream {
-	// unsynchronized variables
-	private final long readTimeout; // read() timeout in millis
-
-	private final long closeTimeout; // close() timeout in millis, or -1
-
-	// requests for the thread (synchronized)
-	private boolean closeRequested = false; // if true, close requested
-
-	// responses from the thread (synchronized)
-	private final Future<?> future;
-
-	private byte[] iobuffer; // circular buffer
-
-	private int head = 0; // points to first unread byte
-
-	private int length = 0; // number of remaining unread bytes
-
-	private IOException ioe = null; // if non-null, contains a pending exception
-
-	private boolean waitingForClose = false; // if true, thread is waiting for close()
-
-	private boolean growWhenFull = false; // if true, buffer will grow when it is full
-
-	private final CountDownLatch closeLatch = new CountDownLatch(1); // if 0, runThread() has finished
-
-	/**
-	 * Creates a timeout wrapper for an input stream.
-	 * 
-	 * @param in
-	 *            the underlying input stream
-	 * @param bufferSize
-	 *            the buffer size in bytes; should be large enough to mitigate Thread synchronization and context
-	 *            switching overhead
-	 * @param readTimeout
-	 *            the number of milliseconds to block for a read() or skip() before throwing an InterruptedIOException;
-	 *            0 blocks indefinitely
-	 * @param closeTimeout
-	 *            the number of milliseconds to block for a close() before throwing an InterruptedIOException; 0 blocks
-	 *            indefinitely, -1 closes the stream in the background
-	 */
-	public TimeoutInputStream(InputStream in, int bufferSize, long readTimeout, long closeTimeout) {
-		super(in);
-		this.readTimeout = readTimeout;
-		this.closeTimeout = closeTimeout;
-		this.iobuffer = new byte[bufferSize];
-		this.future = CommonsNetPlugin.getExecutorService().submit(new Runnable() {
-			public void run() {
-				runThread();
-			}
-		});
-	}
-
-	public TimeoutInputStream(InputStream in, int bufferSize, long readTimeout, long closeTimeout, boolean growWhenFull) {
-		this(in, bufferSize, readTimeout, closeTimeout);
-		this.growWhenFull = growWhenFull;
-	}
-
-	/**
-	 * Wraps the underlying stream's method. It may be important to wait for a stream to actually be closed because it
-	 * holds an implicit lock on a system resoure (such as a file) while it is open. Closing a stream may take time if
-	 * the underlying stream is still servicing a previous request.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void close() throws IOException {
-		if (closeLatch.getCount() == 0) {
-			return;
-		}
-		synchronized (this) {
-			closeRequested = true;
-			future.cancel(true);
-			checkError();
-		}
-		if (closeTimeout == -1) {
-			return;
-		}
-		boolean closed = false;
-		try {
-			closed = closeLatch.await(closeTimeout, TimeUnit.MILLISECONDS);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt(); // we weren't expecting to be interrupted
-		}
-		synchronized (this) {
-			checkError();
-			if (!closed) {
-				throw new InterruptedIOException();
-			}
-		}
-	}
-
-	/**
-	 * Returns the number of unread bytes in the buffer.
-	 * 
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized int available() throws IOException {
-		if (length == 0) {
-			checkError();
-		}
-		return length > 0 ? length : 0;
-	}
-
-	/**
-	 * Reads a byte from the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired and no data was received, bytesTransferred will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized int read() throws IOException {
-		if (!syncFill()) {
-			return -1; // EOF reached
-		}
-		int b = iobuffer[head++] & 255;
-		if (head == iobuffer.length) {
-			head = 0;
-		}
-		length--;
-		notify();
-		return b;
-	}
-
-	/**
-	 * Reads multiple bytes from the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired and no data was received, bytesTransferred will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized int read(byte[] buffer, int off, int len) throws IOException {
-		if (!syncFill()) {
-			return -1; // EOF reached
-		}
-		int pos = off;
-		if (len > length) {
-			len = length;
-		}
-		while (len-- > 0) {
-			buffer[pos++] = iobuffer[head++];
-			if (head == iobuffer.length) {
-				head = 0;
-			}
-			length--;
-		}
-		notify();
-		return pos - off;
-	}
-
-	/**
-	 * Skips multiple bytes in the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired before all of the bytes specified have been skipped, bytesTransferred may be
-	 *             non-zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized long skip(long count) throws IOException {
-		long amount = 0;
-		try {
-			do {
-				if (!syncFill()) {
-					break; // EOF reached
-				}
-				int skip = (int) Math.min(count - amount, length);
-				head = (head + skip) % iobuffer.length;
-				length -= skip;
-				amount += skip;
-			} while (amount < count);
-		} catch (InterruptedIOException e) {
-			e.bytesTransferred = (int) amount; // assumes amount < Integer.MAX_INT
-			throw e;
-		}
-		notify();
-		return amount;
-	}
-
-	/**
-	 * Mark is not supported by the wrapper even if the underlying stream does, returns false.
-	 */
-	@Override
-	public boolean markSupported() {
-		return false;
-	}
-
-	/**
-	 * Waits for the buffer to fill if it is empty and the stream has not reached EOF.
-	 * 
-	 * @return true if bytes are available, false if EOF has been reached
-	 * @throws InterruptedIOException
-	 *             if EOF not reached but no bytes are available
-	 */
-	private boolean syncFill() throws IOException {
-		if (length != 0) {
-			return true;
-		}
-		checkError(); // check errors only after we have read all remaining bytes
-		if (waitingForClose) {
-			return false;
-		}
-		notify();
-		try {
-			wait(readTimeout);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt(); // we weren't expecting to be interrupted
-		}
-		if (length != 0) {
-			return true;
-		}
-		checkError(); // check errors only after we have read all remaining bytes
-		if (waitingForClose) {
-			return false;
-		}
-		throw new InterruptedIOException();
-	}
-
-	/**
-	 * If an exception is pending, throws it.
-	 */
-	private void checkError() throws IOException {
-		if (ioe != null) {
-			IOException e = ioe;
-			ioe = null;
-			throw e;
-		}
-	}
-
-	/**
-	 * Runs the thread in the background.
-	 */
-	private void runThread() {
-		try {
-			readUntilDone();
-		} catch (IOException e) {
-			synchronized (this) {
-				ioe = e;
-			}
-		} finally {
-			waitUntilClosed();
-			try {
-				in.close();
-			} catch (IOException e) {
-				synchronized (this) {
-					ioe = e;
-				}
-			} finally {
-				closeLatch.countDown();
-			}
-		}
-	}
-
-	/**
-	 * Waits until we have been requested to close the stream.
-	 */
-	private synchronized void waitUntilClosed() {
-		waitingForClose = true;
-		notify();
-		while (!closeRequested) {
-			try {
-				wait();
-			} catch (InterruptedException e) {
-				closeRequested = true; // alternate quit signal
-			}
-		}
-	}
-
-	/**
-	 * Reads bytes into the buffer until EOF, closed, or error.
-	 */
-	private void readUntilDone() throws IOException {
-		for (;;) {
-			int off, len;
-			synchronized (this) {
-				while (isBufferFull()) {
-					if (closeRequested) {
-						return; // quit signal
-					}
-					waitForRead();
-				}
-				off = (head + length) % iobuffer.length;
-				len = ((head > off) ? head : iobuffer.length) - off;
-			}
-			int count;
-			try {
-				// the i/o operation might block without releasing the lock,
-				// so we do this outside of the synchronized block
-				count = in.read(iobuffer, off, len);
-				if (count == -1) {
-					return; // EOF encountered
-				}
-			} catch (InterruptedIOException e) {
-				count = e.bytesTransferred; // keep partial transfer
-			}
-			synchronized (this) {
-				length += count;
-				notify();
-			}
-		}
-	}
-
-	/*
-	 * Wait for a read when the buffer is full (with the implication
-	 * that space will become available in the buffer after the read 
-	 * takes place).
-	 */
-	private synchronized void waitForRead() {
-		try {
-			if (growWhenFull) {
-				// wait a second before growing to let reads catch up
-				wait(readTimeout);
-			} else {
-				wait();
-			}
-		} catch (InterruptedException e) {
-			closeRequested = true; // alternate quit signal
-		}
-		// If the buffer is still full, give it a chance to grow
-		if (growWhenFull && isBufferFull()) {
-			growBuffer();
-		}
-	}
-
-	private synchronized void growBuffer() {
-		int newSize = 2 * iobuffer.length;
-		if (newSize > iobuffer.length) {
-			if (Policy.DEBUG_STREAMS) {
-				System.out.println("InputStream growing to " + newSize + " bytes"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			byte[] newBuffer = new byte[newSize];
-			int pos = 0;
-			int len = length;
-			while (len-- > 0) {
-				newBuffer[pos++] = iobuffer[head++];
-				if (head == iobuffer.length) {
-					head = 0;
-				}
-			}
-			iobuffer = newBuffer;
-			head = 0;
-			// length instance variable was not changed by this method
-		}
-	}
-
-	private boolean isBufferFull() {
-		return length == iobuffer.length;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutOutputStream.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutOutputStream.java
deleted file mode 100644
index e1aa31c..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TimeoutOutputStream.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.commons.net;
-
-import java.io.BufferedOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-
-
-/**
- * Wraps an output stream that blocks indefinitely to simulate timeouts on write(), flush(), and close(). The resulting
- * output stream is buffered and supports retrying operations that failed due to an InterruptedIOException.
- * 
- * Supports resuming partially completed operations after an InterruptedIOException REGARDLESS of whether the underlying
- * stream does unless the underlying stream itself generates InterruptedIOExceptions in which case it must also support
- * resuming. Check the bytesTransferred field to determine how much of the operation completed; conversely, at what
- * point to resume.
- */
-public class TimeoutOutputStream extends FilterOutputStream {
-	// unsynchronized variables
-	private final long writeTimeout; // write() timeout in millis
-
-	private final long closeTimeout; // close() timeout in millis, or -1
-
-	// requests for the thread (synchronized)
-	private final byte[] iobuffer; // circular buffer
-
-	private int head = 0; // points to first unwritten byte
-
-	private int length = 0; // number of remaining unwritten bytes
-
-	private boolean closeRequested = false; // if true, close requested
-
-	private boolean flushRequested = false; // if true, flush requested
-
-	// responses from the thread (synchronized)
-	private Thread thread;
-
-	private boolean waitingForClose = false; // if true, the thread is waiting for close()
-
-	private IOException ioe = null;
-
-	/**
-	 * Creates a timeout wrapper for an output stream.
-	 * 
-	 * @param out
-	 *            the underlying input stream
-	 * @param bufferSize
-	 *            the buffer size in bytes; should be large enough to mitigate Thread synchronization and context
-	 *            switching overhead
-	 * @param writeTimeout
-	 *            the number of milliseconds to block for a write() or flush() before throwing an
-	 *            InterruptedIOException; 0 blocks indefinitely
-	 * @param closeTimeout
-	 *            the number of milliseconds to block for a close() before throwing an InterruptedIOException; 0 blocks
-	 *            indefinitely, -1 closes the stream in the background
-	 */
-	public TimeoutOutputStream(OutputStream out, int bufferSize, long writeTimeout, long closeTimeout) {
-		super(new BufferedOutputStream(out, bufferSize));
-		this.writeTimeout = writeTimeout;
-		this.closeTimeout = closeTimeout;
-		this.iobuffer = new byte[bufferSize];
-		thread = new Thread(new Runnable() {
-			public void run() {
-				runThread();
-			}
-		}, "TimeoutOutputStream");//$NON-NLS-1$
-		thread.setDaemon(true);
-		thread.start();
-	}
-
-	/**
-	 * Wraps the underlying stream's method. It may be important to wait for a stream to actually be closed because it
-	 * holds an implicit lock on a system resoure (such as a file) while it is open. Closing a stream may take time if
-	 * the underlying stream is still servicing a previous request.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired, bytesTransferred will reflect the number of bytes flushed from the buffer
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public void close() throws IOException {
-		Thread oldThread;
-		synchronized (this) {
-			if (thread == null) {
-				return;
-			}
-			oldThread = thread;
-			closeRequested = true;
-			thread.interrupt();
-			checkError();
-		}
-		if (closeTimeout == -1) {
-			return;
-		}
-		try {
-			oldThread.join(closeTimeout);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt(); // we weren't expecting to be interrupted
-		}
-		synchronized (this) {
-			checkError();
-			if (thread != null) {
-				throw new InterruptedIOException();
-			}
-		}
-	}
-
-	/**
-	 * Writes a byte to the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired and no data was sent, bytesTransferred will be zero
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized void write(int b) throws IOException {
-		syncCommit(true);
-		iobuffer[(head + length) % iobuffer.length] = (byte) b;
-		length++;
-		notify();
-	}
-
-	/**
-	 * Writes multiple bytes to the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired, bytesTransferred will reflect the number of bytes sent
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized void write(byte[] buffer, int off, int len) throws IOException {
-		int amount = 0;
-		try {
-			do {
-				syncCommit(true);
-				while (amount < len && length != iobuffer.length) {
-					iobuffer[(head + length) % iobuffer.length] = buffer[off++];
-					length++;
-					amount++;
-				}
-			} while (amount < len);
-		} catch (InterruptedIOException e) {
-			e.bytesTransferred = amount;
-			throw e;
-		}
-		notify();
-	}
-
-	/**
-	 * Flushes the stream.
-	 * 
-	 * @throws InterruptedIOException
-	 *             if the timeout expired, bytesTransferred will reflect the number of bytes flushed from the buffer
-	 * @throws IOException
-	 *             if an i/o error occurs
-	 */
-	@Override
-	public synchronized void flush() throws IOException {
-		int oldLength = length;
-		flushRequested = true;
-		try {
-			syncCommit(false);
-		} catch (InterruptedIOException e) {
-			e.bytesTransferred = oldLength - length;
-			throw e;
-		}
-		notify();
-	}
-
-	/**
-	 * Waits for the buffer to drain if it is full.
-	 * 
-	 * @param partial
-	 *            if true, waits until the buffer is partially empty, else drains it entirely
-	 * @throws InterruptedIOException
-	 *             if the buffer could not be drained as requested
-	 */
-	private void syncCommit(boolean partial) throws IOException {
-		checkError(); // check errors before allowing the addition of new bytes
-		if (partial && length != iobuffer.length || length == 0) {
-			return;
-		}
-		if (waitingForClose) {
-			throw new IOException(Messages.TimeoutOutputStream_cannotWriteToStream);
-		}
-		notify();
-		try {
-			wait(writeTimeout);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt(); // we weren't expecting to be interrupted
-		}
-		checkError(); // check errors before allowing the addition of new bytes
-		if (partial && length != iobuffer.length || length == 0) {
-			return;
-		}
-		throw new InterruptedIOException();
-	}
-
-	/**
-	 * If an exception is pending, throws it.
-	 */
-	private void checkError() throws IOException {
-		if (ioe != null) {
-			IOException e = ioe;
-			ioe = null;
-			throw e;
-		}
-	}
-
-	/**
-	 * Runs the thread in the background.
-	 */
-	private void runThread() {
-		try {
-			writeUntilDone();
-		} catch (IOException e) {
-			synchronized (this) {
-				ioe = e;
-			}
-		} finally {
-			waitUntilClosed();
-			try {
-				out.close();
-			} catch (IOException e) {
-				synchronized (this) {
-					ioe = e;
-				}
-			} finally {
-				synchronized (this) {
-					thread = null;
-					notify();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Waits until we have been requested to close the stream.
-	 */
-	private synchronized void waitUntilClosed() {
-		waitingForClose = true;
-		notify();
-		while (!closeRequested) {
-			try {
-				wait();
-			} catch (InterruptedException e) {
-				closeRequested = true; // alternate quit signal
-			}
-		}
-	}
-
-	/**
-	 * Writes bytes from the buffer until closed and buffer is empty
-	 */
-	private void writeUntilDone() throws IOException {
-		int bytesUntilFlush = -1; // if > 0, then we will flush after that many bytes have been written
-		for (;;) {
-			int off, len;
-			synchronized (this) {
-				for (;;) {
-					if (closeRequested && length == 0) {
-						return; // quit signal
-					}
-					if (length != 0 || flushRequested) {
-						break;
-					}
-					try {
-						wait();
-					} catch (InterruptedException e) {
-						closeRequested = true; // alternate quit signal
-					}
-				}
-				off = head;
-				len = iobuffer.length - head;
-				if (len > length) {
-					len = length;
-				}
-				if (flushRequested && bytesUntilFlush < 0) {
-					flushRequested = false;
-					bytesUntilFlush = length;
-				}
-			}
-
-			// If there are bytes to be written, write them
-			if (len != 0) {
-				// write out all remaining bytes from the buffer before flushing
-				try {
-					// the i/o operation might block without releasing the lock,
-					// so we do this outside of the synchronized block
-					out.write(iobuffer, off, len);
-				} catch (InterruptedIOException e) {
-					len = e.bytesTransferred;
-				}
-			}
-
-			// If there was a pending flush, do it
-			if (bytesUntilFlush >= 0) {
-				bytesUntilFlush -= len;
-				if (bytesUntilFlush <= 0) {
-					// flush the buffer now
-					try {
-						out.flush();
-					} catch (InterruptedIOException e) {
-					}
-					bytesUntilFlush = -1; // might have been 0
-				}
-			}
-
-			// If bytes were written, update the circular buffer
-			if (len != 0) {
-				synchronized (this) {
-					head = (head + len) % iobuffer.length;
-					length -= len;
-					notify();
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TrustAllTrustManager.java b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TrustAllTrustManager.java
deleted file mode 100644
index 31f855b..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/TrustAllTrustManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Eugene Kuleshov - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.net;
-
-import javax.net.ssl.X509TrustManager;
-
-/**
- * TrustAll class implements X509TrustManager to access all https servers with signed and unsigned certificates.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public class TrustAllTrustManager implements X509TrustManager {
-
-	public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-		return null;
-	}
-
-	public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-		// don't need to do any checks
-	}
-
-	public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-		// don't need to do any checks
-	}
-}
diff --git a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/messages.properties b/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/messages.properties
deleted file mode 100644
index 8943ed9..0000000
--- a/org.eclipse.mylyn.commons.net/src/org/eclipse/mylyn/internal/commons/net/messages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-PollingInputStream_readTimeout=Timeout while reading from input stream
-PollingInputStream_closeTimeout=Timeout while closing input stream
-PollingOutputStream_writeTimeout=Timeout while writing to output stream
-PollingOutputStream_closeTimeout=Timeout while closing output stream
-TimeoutOutputStream_cannotWriteToStream=Cannot write to output stream
-
-Util_processTimeout=A timeout occurred executing command ''{0}''
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.soap/.classpath b/org.eclipse.mylyn.commons.soap/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.mylyn.commons.soap/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.commons.soap/.cvsignore b/org.eclipse.mylyn.commons.soap/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.commons.soap/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.commons.soap/.project b/org.eclipse.mylyn.commons.soap/.project
deleted file mode 100644
index 3d5c468..0000000
--- a/org.eclipse.mylyn.commons.soap/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.soap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b6172c..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:47 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 1d45f1b..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sat Dec 13 17:58:50 PST 2008
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.soap/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
deleted file mode 100644
index e6c02ee..0000000
--- a/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
- javax.xml.soap;bundle-version="1.2.0",
- org.apache.axis;bundle-version="1.4.0",
- org.apache.commons.httpclient;bundle-version="3.1.0",
- org.eclipse.core.runtime,
- org.eclipse.core.net,
- org.eclipse.mylyn.commons.net;bundle-version="[3.1.0,4.0.0)"
-Bundle-ClassPath: .
-Export-Package: org.eclipse.mylyn.internal.commons.soap;x-internal:=true,
- org.eclipse.mylyn.internal.provisional.commons.soap;x-friends:="org.eclipse.mylyn.xplanner.core,org.eclipse.mylyn.jira.core"
-Bundle-Localization: plugin
-Eclipse-RegisterBuddy: org.apache.axis
diff --git a/org.eclipse.mylyn.commons.soap/about.html b/org.eclipse.mylyn.commons.soap/about.html
deleted file mode 100644
index 0b16825..0000000
--- a/org.eclipse.mylyn.commons.soap/about.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this
-Content directly from the Eclipse Foundation, the
-following is provided for informational purposes only,
-and you should look to the Redistributor&rsquo;s
-license for terms and conditions of use.</p>
-
-<h4>Apache Axis 1.4 (subset)</h4> 
-		
-<p>The plug-in is accompanied by a modified subset of Apache Axis 1.4.0 (&quot;Axis&quot;) developed by the Apache Software Foundation as
-part of the Apache Web Services project.  Files included from the Axis distribution (see modfied files for change log):</p>
-
-<pre>
-Original File: src/org/apache/axis/transport/http/CommonsHTTPSender.java
-Modified File: src/org/eclipse/mylyn/provisional/internal/commons/soap/CommonsHttpSender.java
-</pre>
-
-<p>Your use of Apache Axis is subject to the terms and conditions of the Apache License, Version 2.0
-(&quot;Apache License&quot;).  A copy of the Apache License can be found in <a href="about_files/LICENSE">about_files/LICENSE</a>
-and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.</p>
-
-<p>The Apache attribution <a href="about_files/NOTICE" target="_blank">NOTICE</a> file is included with the Content in accordance with 4d of the Apache License, Version 2.0.</p>
-
-</body>
-</html>
diff --git a/org.eclipse.mylyn.commons.soap/about_files/LICENSE b/org.eclipse.mylyn.commons.soap/about_files/LICENSE
deleted file mode 100644
index 6b0b127..0000000
--- a/org.eclipse.mylyn.commons.soap/about_files/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/org.eclipse.mylyn.commons.soap/about_files/NOTICE b/org.eclipse.mylyn.commons.soap/about_files/NOTICE
deleted file mode 100644
index e19d1ce..0000000
--- a/org.eclipse.mylyn.commons.soap/about_files/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-   ==  Version 2.0, in this case for the Apache Axis distribution.        ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
diff --git a/org.eclipse.mylyn.commons.soap/build.properties b/org.eclipse.mylyn.commons.soap/build.properties
deleted file mode 100644
index 8302941..0000000
--- a/org.eclipse.mylyn.commons.soap/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties,\
-               about_files/
-src.includes = about.html
diff --git a/org.eclipse.mylyn.commons.soap/plugin.properties b/org.eclipse.mylyn.commons.soap/plugin.properties
deleted file mode 100644
index e3839da..0000000
--- a/org.eclipse.mylyn.commons.soap/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.commons.net
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Commons Soap
diff --git a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/commons/soap/SoapRequest.java b/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/commons/soap/SoapRequest.java
deleted file mode 100644
index cb36662..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/commons/soap/SoapRequest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.commons.soap;
-
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-/**
- * @author Steffen Pingel
- */
-public class SoapRequest {
-
-	private static ThreadLocal<SoapRequest> currentRequest = new ThreadLocal<SoapRequest>();
-
-	private static final int METHOD_POLL_INTERVAL = 200;
-
-	public static SoapRequest getCurrentRequest() {
-		return currentRequest.get();
-	}
-
-	public static void setCurrentRequest(SoapRequest request) {
-		currentRequest.set(request);
-	}
-
-	private volatile boolean done;
-
-	private volatile HttpMethodBase method;
-
-	private final IProgressMonitor monitor;
-
-	public SoapRequest(IProgressMonitor monitor) {
-		this.monitor = monitor;
-
-	}
-
-	public void cancel() {
-		while (method == null) {
-			if (done) {
-				throw new OperationCanceledException();
-			}
-
-			try {
-				Thread.sleep(METHOD_POLL_INTERVAL);
-			} catch (InterruptedException e) {
-				throw new OperationCanceledException();
-			}
-		}
-
-		method.abort();
-	}
-
-	public void done() {
-		done = true;
-	}
-
-	public HttpMethodBase getMethod() {
-		return method;
-	}
-
-	public IProgressMonitor getMonitor() {
-		return monitor;
-	}
-
-	public void setMethod(HttpMethodBase method) {
-		this.method = method;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AbstractSoapClient.java b/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AbstractSoapClient.java
deleted file mode 100644
index f223349..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AbstractSoapClient.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.provisional.commons.soap;
-
-import java.rmi.RemoteException;
-import java.util.concurrent.Callable;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.commons.net.Policy;
-import org.eclipse.mylyn.commons.net.UnsupportedRequestException;
-import org.eclipse.mylyn.commons.net.WebRequest;
-import org.eclipse.mylyn.commons.net.WebUtil;
-import org.eclipse.mylyn.internal.commons.soap.SoapRequest;
-
-/**
- * Base class for clients that access SOAP servers.
- * 
- * @author Steffen Pingel
- */
-public abstract class AbstractSoapClient {
-
-	/**
-	 * Executes <code>runnable</code>. If an authentication exception occurs <code>runnable</code>
-	 * {@link #doLogin(IProgressMonitor)} is invoked and the <code>runnable</code> is executed again. If authentication
-	 * fails on the second attempt
-	 * {@link AbstractWebLocation#requestCredentials(AuthenticationType, String, IProgressMonitor)} is invoked and the
-	 * cycle is restarted from the beginning.
-	 * 
-	 * @param <T>
-	 *            type for the result of <code>runnable</code>
-	 * @param monitor
-	 *            the progress monitor for cancellation support
-	 * @param runnable
-	 *            the request to execute
-	 * @return the result of <code>runnable</code>
-	 * @throws Exception
-	 *             if an error occurs during execution of <code>runnable</code>, aborts <code>runnable</code> and throws
-	 *             {@link OperationCanceledException} if the progress monitor is canceled
-	 * @see #callOnce(IProgressMonitor, Callable)
-	 */
-	protected <T> T call(IProgressMonitor monitor, Callable<T> runnable) throws Exception {
-		while (true) {
-			try {
-				try {
-					return callOnce(monitor, runnable);
-				} catch (Exception e) {
-					if (isAuthenticationException(e) && doLogin(monitor)) {
-						return callOnce(monitor, runnable);
-					} else {
-						throw e;
-					}
-				}
-			} catch (Exception e) {
-				if (isAuthenticationException(e)) {
-					try {
-						getLocation().requestCredentials(AuthenticationType.REPOSITORY, null, monitor);
-					} catch (UnsupportedRequestException ignored) {
-						throw e;
-					}
-				} else {
-					throw e;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Executes <code>runnable</code>. Returns after runnable has completed.
-	 * 
-	 * @param <T>
-	 *            type for the result of <code>runnable</code>
-	 * @param monitor
-	 *            the progress monitor for cancellation support
-	 * @param runnable
-	 *            the request to execute
-	 * @return the result of <code>runnable</code>
-	 * @throws Exception
-	 *             if an error occurs during execution of <code>runnable</code>, aborts <code>runnable</code> and throws
-	 *             {@link OperationCanceledException} if the progress monitor is canceled
-	 */
-	protected <T> T callOnce(IProgressMonitor monitor, final Callable<T> runnable) throws Exception {
-		try {
-			monitor = Policy.monitorFor(monitor);
-
-			final SoapRequest request = new SoapRequest(monitor);
-			return WebUtil.execute(monitor, new WebRequest<T>() {
-
-				@Override
-				public void abort() {
-					request.cancel();
-				}
-
-				public T call() throws Exception {
-					try {
-						SoapRequest.setCurrentRequest(request);
-						return runnable.call();
-					} finally {
-						request.done();
-					}
-				}
-
-			});
-		} catch (RemoteException e) {
-			throw e;
-		} catch (Exception e) {
-			throw e;
-		} catch (Error e) {
-			throw e;
-		} catch (Throwable e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * Returns the server location.
-	 */
-	protected abstract AbstractWebLocation getLocation();
-
-	/**
-	 * Returns if <code>exception</code> indicates an authentication error. If true is returned the original request can
-	 * be retried with different credentials.
-	 * 
-	 * @see #call(IProgressMonitor, Callable)
-	 */
-	protected abstract boolean isAuthenticationException(Exception exception);
-
-	/**
-	 * If a request fails due to an authentication error this method can be used to re-establish a session. If true is
-	 * returned the original request is retried.
-	 * 
-	 * @param monitor
-	 * @return if false is returned the
-	 * @see #call(IProgressMonitor, Callable)
-	 * @see #isAuthenticationException(Exception)
-	 */
-	protected abstract boolean doLogin(IProgressMonitor monitor);
-
-}
diff --git a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AxisHttpFault.java b/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AxisHttpFault.java
deleted file mode 100644
index 90efc82..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/AxisHttpFault.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.soap;
-
-import java.io.IOException;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.Constants;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpMethodBase;
-
-/**
- * Indicates that the server returned an unexpected HTTP error in response to a SOAP call.
- * 
- * @author Steffen Pingel
- */
-public class AxisHttpFault extends AxisFault {
-
-	private static final long serialVersionUID = -7568493217182396309L;
-
-	public static AxisHttpFault makeFault(HttpMethodBase method) throws IOException {
-		int returnCode = method.getStatusCode();
-		String statusMessage = method.getStatusText();
-		AxisHttpFault fault = new AxisHttpFault("HTTP", "(" + returnCode + ")" + statusMessage, returnCode); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		fault.extractDetails(method);
-		fault.setFaultDetailString(Messages.getMessage("return01", "" + returnCode, //$NON-NLS-1$ //$NON-NLS-2$
-				method.getResponseBodyAsString()));
-		fault.addFaultDetail(Constants.QNAME_FAULTDETAIL_HTTPERRORCODE, Integer.toString(returnCode));
-		return fault;
-	}
-
-	private String location;
-
-	private final int returnCode;
-
-	public AxisHttpFault(String code, String faultString, int returnCode) {
-		super(code, faultString, null, null);
-		this.returnCode = returnCode;
-	}
-
-	private void extractDetails(HttpMethodBase method) {
-		Header locationHeader = method.getResponseHeader("location"); //$NON-NLS-1$
-		if (locationHeader != null) {
-			this.location = locationHeader.getValue();
-		}
-	}
-
-	public String getLocation() {
-		return location;
-	}
-
-	public int getReturnCode() {
-		return returnCode;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java b/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java
deleted file mode 100644
index 3831958..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java
+++ /dev/null
@@ -1,851 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Original class;
- *  Axis 1.4: src/org/apache/axis/transport/http/CommonsHTTPSender.java
- * 
- * Modifications for the Mylyn project:
- * 
- * Steffen Pingel
- *   - renamed class to CommonsHttpSender  
- *   - changed package from org.apache.axis.transport.http to 
- *     org.eclipse.mylyn.internal.jira.core.service.soap 
- *   - changed visibility of addContextInfo() from private to protected
- *   - reformatted source and added @SuppressWarnings annotation
- *   - commented calls to commons logging out 
- *   - added timeout thread for idle connections
- *   - added AxisHttpFault to provide additional details in case of http error
- */
-package org.eclipse.mylyn.internal.provisional.commons.soap;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import javax.xml.soap.MimeHeader;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPException;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.components.net.CommonsHTTPClientProperties;
-import org.apache.axis.components.net.CommonsHTTPClientPropertiesFactory;
-import org.apache.axis.components.net.TransportClientProperties;
-import org.apache.axis.components.net.TransportClientPropertiesFactory;
-import org.apache.axis.handlers.BasicHandler;
-import org.apache.axis.soap.SOAP12Constants;
-import org.apache.axis.soap.SOAPConstants;
-import org.apache.axis.transport.http.HTTPConstants;
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.NetworkUtils;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.HttpVersion;
-import org.apache.commons.httpclient.NTCredentials;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.eclipse.mylyn.commons.net.WebUtil;
-
-/**
- * This class uses Jakarta Commons's HttpClient to call a SOAP server.
- * 
- * @author Davanum Srinivas (dims@yahoo.com) History: By Chandra Talluri Modifications done for maintaining sessions.
- *         Cookies needed to be set on HttpState not on MessageContext, since ttpMethodBase overwrites the cookies from
- *         HttpState. Also we need to setCookiePolicy on HttpState to CookiePolicy.COMPATIBILITY else it is defaulting
- *         to RFC2109Spec and adding Version information to it and tomcat server not recognizing it
- */
-@SuppressWarnings( { "serial", "unchecked", "null" })
-public class CommonsHttpSender extends BasicHandler {
-
-	/** Field log */
-	//protected static Log log = LogFactory.getLog(CommonsHTTPSender.class.getName());
-	protected HttpConnectionManager connectionManager;
-
-	protected CommonsHTTPClientProperties clientProperties;
-
-	boolean httpChunkStream = true; //Use HTTP chunking or not.
-
-	public CommonsHttpSender() {
-		initialize();
-	}
-
-	protected void initialize() {
-		this.clientProperties = CommonsHTTPClientPropertiesFactory.create();
-		this.connectionManager = WebUtil.getConnectionManager();
-	}
-
-	/**
-	 * invoke creates a socket connection, sends the request SOAP message and then reads the response SOAP message back
-	 * from the SOAP server
-	 * 
-	 * @param msgContext
-	 *            the messsage context
-	 * 
-	 * @throws AxisFault
-	 */
-	public void invoke(MessageContext msgContext) throws AxisFault {
-		HttpMethodBase method = null;
-//		if (log.isDebugEnabled()) {
-//			log.debug(Messages.getMessage("enter00", "CommonsHTTPSender::invoke"));
-//		}
-		try {
-			URL targetURL = new URL(msgContext.getStrProp(MessageContext.TRANS_URL));
-
-			// no need to retain these, as the cookies/credentials are
-			// stored in the message context across multiple requests.
-			// the underlying connection manager, however, is retained
-			// so sockets get recycled when possible.
-			HttpClient httpClient = new HttpClient(this.connectionManager);
-			// the timeout value for allocation of connections from the pool
-			httpClient.getParams().setConnectionManagerTimeout(this.clientProperties.getConnectionPoolTimeout());
-
-			HostConfiguration hostConfiguration = getHostConfiguration(httpClient, msgContext, targetURL);
-
-			boolean posting = true;
-
-			// If we're SOAP 1.2, allow the web method to be set from the
-			// MessageContext.
-			if (msgContext.getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS) {
-				String webMethod = msgContext.getStrProp(SOAP12Constants.PROP_WEBMETHOD);
-				if (webMethod != null) {
-					posting = webMethod.equals(HTTPConstants.HEADER_POST);
-				}
-			}
-
-			if (posting) {
-				Message reqMessage = msgContext.getRequestMessage();
-				method = new PostMethod(targetURL.toString());
-
-				// set false as default, addContetInfo can overwrite
-				method.getParams().setBooleanParameter(HttpMethodParams.USE_EXPECT_CONTINUE, false);
-
-				addContextInfo(method, httpClient, msgContext, targetURL);
-
-				MessageRequestEntity requestEntity = null;
-				if (msgContext.isPropertyTrue(HTTPConstants.MC_GZIP_REQUEST)) {
-					requestEntity = new GzipMessageRequestEntity(method, reqMessage, httpChunkStream);
-				} else {
-					requestEntity = new MessageRequestEntity(method, reqMessage, httpChunkStream);
-				}
-				((PostMethod) method).setRequestEntity(requestEntity);
-			} else {
-				method = new GetMethod(targetURL.toString());
-				addContextInfo(method, httpClient, msgContext, targetURL);
-			}
-
-			String httpVersion = msgContext.getStrProp(MessageContext.HTTP_TRANSPORT_VERSION);
-			if (httpVersion != null) {
-				if (httpVersion.equals(HTTPConstants.HEADER_PROTOCOL_V10)) {
-					method.getParams().setVersion(HttpVersion.HTTP_1_0);
-				}
-				// assume 1.1
-			}
-
-			// don't forget the cookies!
-			// Cookies need to be set on HttpState, since HttpMethodBase 
-			// overwrites the cookies from HttpState
-			if (msgContext.getMaintainSession()) {
-				HttpState state = httpClient.getState();
-				method.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY);
-				String host = hostConfiguration.getHost();
-				String path = targetURL.getPath();
-				boolean secure = hostConfiguration.getProtocol().isSecure();
-				fillHeaders(msgContext, state, HTTPConstants.HEADER_COOKIE, host, path, secure);
-				fillHeaders(msgContext, state, HTTPConstants.HEADER_COOKIE2, host, path, secure);
-				httpClient.setState(state);
-			}
-
-			int returnCode = httpClient.executeMethod(hostConfiguration, method, null);
-
-			String contentType = getHeader(method, HTTPConstants.HEADER_CONTENT_TYPE);
-			String contentLocation = getHeader(method, HTTPConstants.HEADER_CONTENT_LOCATION);
-//			String contentLength = getHeader(method, HTTPConstants.HEADER_CONTENT_LENGTH);
-
-			if ((returnCode > 199) && (returnCode < 300)) {
-
-				// SOAP return is OK - so fall through
-			} else if (msgContext.getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS) {
-				// For now, if we're SOAP 1.2, fall through, since the range of
-				// valid result codes is much greater
-			} else if ((contentType != null) && !contentType.equals("text/html") //$NON-NLS-1$
-					&& ((returnCode > 499) && (returnCode < 600))) {
-
-				// SOAP Fault should be in here - so fall through
-			} else {
-//				String statusMessage = method.getStatusText();
-//				AxisFault fault = new AxisFault("HTTP", "(" + returnCode + ")" + statusMessage, null, null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-				try {
-//					fault.setFaultDetailString(Messages.getMessage("return01", "" + returnCode, //$NON-NLS-1$ //$NON-NLS-2$
-//							method.getResponseBodyAsString()));
-//					fault.addFaultDetail(Constants.QNAME_FAULTDETAIL_HTTPERRORCODE, Integer.toString(returnCode));
-//					throw fault;
-					throw AxisHttpFault.makeFault(method);
-				} finally {
-					method.releaseConnection(); // release connection back to pool.
-				}
-			}
-
-			// wrap the response body stream so that close() also releases 
-			// the connection back to the pool.
-			InputStream releaseConnectionOnCloseStream = createConnectionReleasingInputStream(method);
-
-			Header contentEncoding = method.getResponseHeader(HTTPConstants.HEADER_CONTENT_ENCODING);
-			if (contentEncoding != null) {
-				if (contentEncoding.getValue().equalsIgnoreCase(HTTPConstants.COMPRESSION_GZIP)) {
-					releaseConnectionOnCloseStream = new GZIPInputStream(releaseConnectionOnCloseStream);
-				} else {
-					AxisFault fault = new AxisFault("HTTP", "unsupported content-encoding of '" //$NON-NLS-1$ //$NON-NLS-2$
-							+ contentEncoding.getValue() + "' found", null, null); //$NON-NLS-1$
-					throw fault;
-				}
-
-			}
-			Message outMsg = new Message(releaseConnectionOnCloseStream, false, contentType, contentLocation);
-			// Transfer HTTP headers of HTTP message to MIME headers of SOAP message
-			Header[] responseHeaders = method.getResponseHeaders();
-			MimeHeaders responseMimeHeaders = outMsg.getMimeHeaders();
-			for (Header responseHeader : responseHeaders) {
-				responseMimeHeaders.addHeader(responseHeader.getName(), responseHeader.getValue());
-			}
-			outMsg.setMessageType(Message.RESPONSE);
-			msgContext.setResponseMessage(outMsg);
-//			if (log.isDebugEnabled()) {
-//				if (null == contentLength) {
-//					log.debug("\n" + Messages.getMessage("no00", "Content-Length"));
-//				}
-//				log.debug("\n" + Messages.getMessage("xmlRecd00"));
-//				log.debug("-----------------------------------------------");
-//				log.debug(outMsg.getSOAPPartAsString());
-//			}
-
-			// if we are maintaining session state,
-			// handle cookies (if any)
-			if (msgContext.getMaintainSession()) {
-				Header[] headers = method.getResponseHeaders();
-
-				for (Header header : headers) {
-					if (header.getName().equalsIgnoreCase(HTTPConstants.HEADER_SET_COOKIE)) {
-						handleCookie(HTTPConstants.HEADER_COOKIE, header.getValue(), msgContext);
-					} else if (header.getName().equalsIgnoreCase(HTTPConstants.HEADER_SET_COOKIE2)) {
-						handleCookie(HTTPConstants.HEADER_COOKIE2, header.getValue(), msgContext);
-					}
-				}
-			}
-
-			// always release the connection back to the pool if 
-			// it was one way invocation
-			if (msgContext.isPropertyTrue("axis.one.way")) { //$NON-NLS-1$
-				method.releaseConnection();
-			}
-
-		} catch (Exception e) {
-//			log.debug(e);
-			throw AxisFault.makeFault(e);
-		}
-
-//		if (log.isDebugEnabled()) {
-//			log.debug(Messages.getMessage("exit00", "CommonsHTTPSender::invoke"));
-//		}
-	}
-
-	/**
-	 * little helper function for cookies. fills up the message context with a string or an array of strings (if there
-	 * are more than one Set-Cookie)
-	 * 
-	 * @param cookieName
-	 * @param setCookieName
-	 * @param cookie
-	 * @param msgContext
-	 */
-	public void handleCookie(String cookieName, String cookie, MessageContext msgContext) {
-
-		cookie = cleanupCookie(cookie);
-		int keyIndex = cookie.indexOf("="); //$NON-NLS-1$
-		String key = (keyIndex != -1) ? cookie.substring(0, keyIndex) : cookie;
-
-		ArrayList cookies = new ArrayList();
-		Object oldCookies = msgContext.getProperty(cookieName);
-		boolean alreadyExist = false;
-		if (oldCookies != null) {
-			if (oldCookies instanceof String[]) {
-				String[] oldCookiesArray = (String[]) oldCookies;
-				for (String anOldCookie : oldCookiesArray) {
-					if (key != null && anOldCookie.indexOf(key) == 0) { // same cookie key
-						anOldCookie = cookie; // update to new one
-						alreadyExist = true;
-					}
-					cookies.add(anOldCookie);
-				}
-			} else {
-				String oldCookie = (String) oldCookies;
-				if (key != null && oldCookie.indexOf(key) == 0) { // same cookie key
-					oldCookie = cookie; // update to new one
-					alreadyExist = true;
-				}
-				cookies.add(oldCookie);
-			}
-		}
-
-		if (!alreadyExist) {
-			cookies.add(cookie);
-		}
-
-		if (cookies.size() == 1) {
-			msgContext.setProperty(cookieName, cookies.get(0));
-		} else if (cookies.size() > 1) {
-			msgContext.setProperty(cookieName, cookies.toArray(new String[cookies.size()]));
-		}
-	}
-
-	/**
-	 * Add cookies from message context
-	 * 
-	 * @param msgContext
-	 * @param state
-	 * @param header
-	 * @param host
-	 * @param path
-	 * @param secure
-	 */
-	private void fillHeaders(MessageContext msgContext, HttpState state, String header, String host, String path,
-			boolean secure) {
-		Object ck1 = msgContext.getProperty(header);
-		if (ck1 != null) {
-			if (ck1 instanceof String[]) {
-				String[] cookies = (String[]) ck1;
-				for (String cookie : cookies) {
-					addCookie(state, cookie, host, path, secure);
-				}
-			} else {
-				addCookie(state, (String) ck1, host, path, secure);
-			}
-		}
-	}
-
-	/**
-	 * add cookie to state
-	 * 
-	 * @param state
-	 * @param cookie
-	 */
-	private void addCookie(HttpState state, String cookie, String host, String path, boolean secure) {
-		int index = cookie.indexOf('=');
-		state.addCookie(new Cookie(host, cookie.substring(0, index), cookie.substring(index + 1), path, null, secure));
-	}
-
-	/**
-	 * cleanup the cookie value.
-	 * 
-	 * @param cookie
-	 *            initial cookie value
-	 * 
-	 * @return a cleaned up cookie value.
-	 */
-	private String cleanupCookie(String cookie) {
-		cookie = cookie.trim();
-		// chop after first ; a la Apache SOAP (see HTTPUtils.java there)
-		int index = cookie.indexOf(';');
-		if (index != -1) {
-			cookie = cookie.substring(0, index);
-		}
-		return cookie;
-	}
-
-	protected HostConfiguration getHostConfiguration(HttpClient client, MessageContext context, URL targetURL) {
-		TransportClientProperties tcp = TransportClientPropertiesFactory.create(targetURL.getProtocol()); // http or https
-		int port = targetURL.getPort();
-		boolean hostInNonProxyList = isHostInNonProxyList(targetURL.getHost(), tcp.getNonProxyHosts());
-
-		HostConfiguration config = new HostConfiguration();
-
-		if (port == -1) {
-			if (targetURL.getProtocol().equalsIgnoreCase("https")) { //$NON-NLS-1$
-				port = 443; // default port for https being 443
-			} else { // it must be http
-				port = 80; // default port for http being 80
-			}
-		}
-
-		if (hostInNonProxyList) {
-			config.setHost(targetURL.getHost(), port, targetURL.getProtocol());
-		} else {
-			if (tcp.getProxyHost().length() == 0 || tcp.getProxyPort().length() == 0) {
-				config.setHost(targetURL.getHost(), port, targetURL.getProtocol());
-			} else {
-				if (tcp.getProxyUser().length() != 0) {
-					Credentials proxyCred = new UsernamePasswordCredentials(tcp.getProxyUser(), tcp.getProxyPassword());
-					// if the username is in the form "user\domain" 
-					// then use NTCredentials instead.
-					int domainIndex = tcp.getProxyUser().indexOf("\\"); //$NON-NLS-1$
-					if (domainIndex > 0) {
-						String domain = tcp.getProxyUser().substring(0, domainIndex);
-						if (tcp.getProxyUser().length() > domainIndex + 1) {
-							String user = tcp.getProxyUser().substring(domainIndex + 1);
-							proxyCred = new NTCredentials(user, tcp.getProxyPassword(), tcp.getProxyHost(), domain);
-						}
-					}
-					client.getState().setProxyCredentials(AuthScope.ANY, proxyCred);
-				}
-				int proxyPort = new Integer(tcp.getProxyPort()).intValue();
-				config.setProxy(tcp.getProxyHost(), proxyPort);
-			}
-		}
-		return config;
-	}
-
-	/**
-	 * Extracts info from message context.
-	 * 
-	 * @param method
-	 *            Post method
-	 * @param httpClient
-	 *            The client used for posting
-	 * @param msgContext
-	 *            the message context
-	 * @param tmpURL
-	 *            the url to post to.
-	 * 
-	 * @throws Exception
-	 */
-	protected void addContextInfo(HttpMethodBase method, HttpClient httpClient, MessageContext msgContext, URL tmpURL)
-			throws Exception {
-
-		// optionally set a timeout for the request
-		if (msgContext.getTimeout() != 0) {
-			/* ISSUE: these are not the same, but MessageContext has only one
-			          definition of timeout */
-			// SO_TIMEOUT -- timeout for blocking reads
-			httpClient.getHttpConnectionManager().getParams().setSoTimeout(msgContext.getTimeout());
-			// timeout for initial connection
-			httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(msgContext.getTimeout());
-		}
-
-		// Get SOAPAction, default to ""
-		String action = msgContext.useSOAPAction() ? msgContext.getSOAPActionURI() : ""; //$NON-NLS-1$
-
-		if (action == null) {
-			action = ""; //$NON-NLS-1$
-		}
-
-		Message msg = msgContext.getRequestMessage();
-		if (msg != null) {
-			method.setRequestHeader(new Header(HTTPConstants.HEADER_CONTENT_TYPE,
-					msg.getContentType(msgContext.getSOAPConstants())));
-		}
-		method.setRequestHeader(new Header(HTTPConstants.HEADER_SOAP_ACTION, "\"" + action + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
-		method.setRequestHeader(new Header(HTTPConstants.HEADER_USER_AGENT, Messages.getMessage("axisUserAgent"))); //$NON-NLS-1$
-		String userID = msgContext.getUsername();
-		String passwd = msgContext.getPassword();
-
-		// if UserID is not part of the context, but is in the URL, use
-		// the one in the URL.
-		if ((userID == null) && (tmpURL.getUserInfo() != null)) {
-			String info = tmpURL.getUserInfo();
-			int sep = info.indexOf(':');
-
-			if ((sep >= 0) && (sep + 1 < info.length())) {
-				userID = info.substring(0, sep);
-				passwd = info.substring(sep + 1);
-			} else {
-				userID = info;
-			}
-		}
-		if (userID != null) {
-			Credentials proxyCred = new UsernamePasswordCredentials(userID, passwd);
-			// if the username is in the form "user\domain"
-			// then use NTCredentials instead.
-			int domainIndex = userID.indexOf("\\"); //$NON-NLS-1$
-			if (domainIndex > 0) {
-				String domain = userID.substring(0, domainIndex);
-				if (userID.length() > domainIndex + 1) {
-					String user = userID.substring(domainIndex + 1);
-					proxyCred = new NTCredentials(user, passwd, NetworkUtils.getLocalHostname(), domain);
-				}
-			}
-			httpClient.getState().setCredentials(AuthScope.ANY, proxyCred);
-		}
-
-		// add compression headers if needed
-		if (msgContext.isPropertyTrue(HTTPConstants.MC_ACCEPT_GZIP)) {
-			method.addRequestHeader(HTTPConstants.HEADER_ACCEPT_ENCODING, HTTPConstants.COMPRESSION_GZIP);
-		}
-		if (msgContext.isPropertyTrue(HTTPConstants.MC_GZIP_REQUEST)) {
-			method.addRequestHeader(HTTPConstants.HEADER_CONTENT_ENCODING, HTTPConstants.COMPRESSION_GZIP);
-		}
-
-		// Transfer MIME headers of SOAPMessage to HTTP headers. 
-		MimeHeaders mimeHeaders = msg.getMimeHeaders();
-		if (mimeHeaders != null) {
-			for (Iterator i = mimeHeaders.getAllHeaders(); i.hasNext();) {
-				MimeHeader mimeHeader = (MimeHeader) i.next();
-				//HEADER_CONTENT_TYPE and HEADER_SOAP_ACTION are already set.
-				//Let's not duplicate them.
-				String headerName = mimeHeader.getName();
-				if (headerName.equals(HTTPConstants.HEADER_CONTENT_TYPE)
-						|| headerName.equals(HTTPConstants.HEADER_SOAP_ACTION)) {
-					continue;
-				}
-				method.addRequestHeader(mimeHeader.getName(), mimeHeader.getValue());
-			}
-		}
-
-		// process user defined headers for information.
-		Hashtable userHeaderTable = (Hashtable) msgContext.getProperty(HTTPConstants.REQUEST_HEADERS);
-
-		if (userHeaderTable != null) {
-			for (Iterator e = userHeaderTable.entrySet().iterator(); e.hasNext();) {
-				Map.Entry me = (Map.Entry) e.next();
-				Object keyObj = me.getKey();
-
-				if (null == keyObj) {
-					continue;
-				}
-				String key = keyObj.toString().trim();
-				String value = me.getValue().toString().trim();
-
-				if (key.equalsIgnoreCase(HTTPConstants.HEADER_EXPECT)
-						&& value.equalsIgnoreCase(HTTPConstants.HEADER_EXPECT_100_Continue)) {
-					method.getParams().setBooleanParameter(HttpMethodParams.USE_EXPECT_CONTINUE, true);
-				} else if (key.equalsIgnoreCase(HTTPConstants.HEADER_TRANSFER_ENCODING_CHUNKED)) {
-					String val = me.getValue().toString();
-					if (null != val) {
-						httpChunkStream = JavaUtils.isTrue(val);
-					}
-				} else {
-					method.addRequestHeader(key, value);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the specified host is in the list of non proxy hosts.
-	 * 
-	 * @param host
-	 *            host name
-	 * @param nonProxyHosts
-	 *            string containing the list of non proxy hosts
-	 * 
-	 * @return true/false
-	 */
-	protected boolean isHostInNonProxyList(String host, String nonProxyHosts) {
-
-		if ((nonProxyHosts == null) || (host == null)) {
-			return false;
-		}
-
-		/*
-		 * The http.nonProxyHosts system property is a list enclosed in
-		 * double quotes with items separated by a vertical bar.
-		 */
-		StringTokenizer tokenizer = new StringTokenizer(nonProxyHosts, "|\""); //$NON-NLS-1$
-
-		while (tokenizer.hasMoreTokens()) {
-			String pattern = tokenizer.nextToken();
-
-//			if (log.isDebugEnabled()) {
-//				log.debug(Messages.getMessage("match00", new String[] { "HTTPSender", host, pattern }));
-//			}
-			if (match(pattern, host, false)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Matches a string against a pattern. The pattern contains two special characters: '*' which means zero or more
-	 * characters,
-	 * 
-	 * @param pattern
-	 *            the (non-null) pattern to match against
-	 * @param str
-	 *            the (non-null) string that must be matched against the pattern
-	 * @param isCaseSensitive
-	 * 
-	 * @return <code>true</code> when the string matches against the pattern, <code>false</code> otherwise.
-	 */
-	protected static boolean match(String pattern, String str, boolean isCaseSensitive) {
-
-		char[] patArr = pattern.toCharArray();
-		char[] strArr = str.toCharArray();
-		int patIdxStart = 0;
-		int patIdxEnd = patArr.length - 1;
-		int strIdxStart = 0;
-		int strIdxEnd = strArr.length - 1;
-		char ch;
-		boolean containsStar = false;
-
-		for (char element : patArr) {
-			if (element == '*') {
-				containsStar = true;
-				break;
-			}
-		}
-		if (!containsStar) {
-
-			// No '*'s, so we make a shortcut
-			if (patIdxEnd != strIdxEnd) {
-				return false; // Pattern and string do not have the same size
-			}
-			for (int i = 0; i <= patIdxEnd; i++) {
-				ch = patArr[i];
-				if (isCaseSensitive && (ch != strArr[i])) {
-					return false; // Character mismatch
-				}
-				if (!isCaseSensitive && (Character.toUpperCase(ch) != Character.toUpperCase(strArr[i]))) {
-					return false; // Character mismatch
-				}
-			}
-			return true; // String matches against pattern
-		}
-		if (patIdxEnd == 0) {
-			return true; // Pattern contains only '*', which matches anything
-		}
-
-		// Process characters before first star
-		while ((ch = patArr[patIdxStart]) != '*' && (strIdxStart <= strIdxEnd)) {
-			if (isCaseSensitive && (ch != strArr[strIdxStart])) {
-				return false; // Character mismatch
-			}
-			if (!isCaseSensitive && (Character.toUpperCase(ch) != Character.toUpperCase(strArr[strIdxStart]))) {
-				return false; // Character mismatch
-			}
-			patIdxStart++;
-			strIdxStart++;
-		}
-		if (strIdxStart > strIdxEnd) {
-
-			// All characters in the string are used. Check if only '*'s are
-			// left in the pattern. If so, we succeeded. Otherwise failure.
-			for (int i = patIdxStart; i <= patIdxEnd; i++) {
-				if (patArr[i] != '*') {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		// Process characters after last star
-		while ((ch = patArr[patIdxEnd]) != '*' && (strIdxStart <= strIdxEnd)) {
-			if (isCaseSensitive && (ch != strArr[strIdxEnd])) {
-				return false; // Character mismatch
-			}
-			if (!isCaseSensitive && (Character.toUpperCase(ch) != Character.toUpperCase(strArr[strIdxEnd]))) {
-				return false; // Character mismatch
-			}
-			patIdxEnd--;
-			strIdxEnd--;
-		}
-		if (strIdxStart > strIdxEnd) {
-
-			// All characters in the string are used. Check if only '*'s are
-			// left in the pattern. If so, we succeeded. Otherwise failure.
-			for (int i = patIdxStart; i <= patIdxEnd; i++) {
-				if (patArr[i] != '*') {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		// process pattern between stars. padIdxStart and patIdxEnd point
-		// always to a '*'.
-		while ((patIdxStart != patIdxEnd) && (strIdxStart <= strIdxEnd)) {
-			int patIdxTmp = -1;
-
-			for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
-				if (patArr[i] == '*') {
-					patIdxTmp = i;
-					break;
-				}
-			}
-			if (patIdxTmp == patIdxStart + 1) {
-
-				// Two stars next to each other, skip the first one.
-				patIdxStart++;
-				continue;
-			}
-
-			// Find the pattern between padIdxStart & padIdxTmp in str between
-			// strIdxStart & strIdxEnd
-			int patLength = (patIdxTmp - patIdxStart - 1);
-			int strLength = (strIdxEnd - strIdxStart + 1);
-			int foundIdx = -1;
-
-			strLoop: for (int i = 0; i <= strLength - patLength; i++) {
-				for (int j = 0; j < patLength; j++) {
-					ch = patArr[patIdxStart + j + 1];
-					if (isCaseSensitive && (ch != strArr[strIdxStart + i + j])) {
-						continue strLoop;
-					}
-					if (!isCaseSensitive
-							&& (Character.toUpperCase(ch) != Character.toUpperCase(strArr[strIdxStart + i + j]))) {
-						continue strLoop;
-					}
-				}
-				foundIdx = strIdxStart + i;
-				break;
-			}
-			if (foundIdx == -1) {
-				return false;
-			}
-			patIdxStart = patIdxTmp;
-			strIdxStart = foundIdx + patLength;
-		}
-
-		// All characters in the string are used. Check if only '*'s are left
-		// in the pattern. If so, we succeeded. Otherwise failure.
-		for (int i = patIdxStart; i <= patIdxEnd; i++) {
-			if (patArr[i] != '*') {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static String getHeader(HttpMethodBase method, String headerName) {
-		Header header = method.getResponseHeader(headerName);
-		return (header == null) ? null : header.getValue().trim();
-	}
-
-	private InputStream createConnectionReleasingInputStream(final HttpMethodBase method) throws IOException {
-		return new FilterInputStream(method.getResponseBodyAsStream()) {
-			@Override
-			public void close() throws IOException {
-				try {
-					super.close();
-				} finally {
-					method.releaseConnection();
-				}
-			}
-		};
-	}
-
-	private static class MessageRequestEntity implements RequestEntity {
-
-		private final HttpMethodBase method;
-
-		private final Message message;
-
-		boolean httpChunkStream = true; //Use HTTP chunking or not.
-
-		public MessageRequestEntity(HttpMethodBase method, Message message) {
-			this.message = message;
-			this.method = method;
-		}
-
-		public MessageRequestEntity(HttpMethodBase method, Message message, boolean httpChunkStream) {
-			this.message = message;
-			this.method = method;
-			this.httpChunkStream = httpChunkStream;
-		}
-
-		public boolean isRepeatable() {
-			return true;
-		}
-
-		public void writeRequest(OutputStream out) throws IOException {
-			try {
-				this.message.writeTo(out);
-			} catch (SOAPException e) {
-				throw new IOException(e.getMessage());
-			}
-		}
-
-		protected boolean isContentLengthNeeded() {
-			return this.method.getParams().getVersion() == HttpVersion.HTTP_1_0 || !httpChunkStream;
-		}
-
-		public long getContentLength() {
-			if (isContentLengthNeeded()) {
-				try {
-					return message.getContentLength();
-				} catch (Exception e) {
-				}
-			}
-			return -1; /* -1 for chunked */
-		}
-
-		public String getContentType() {
-			return null; // a separate header is added
-		}
-
-	}
-
-	private static class GzipMessageRequestEntity extends MessageRequestEntity {
-
-		public GzipMessageRequestEntity(HttpMethodBase method, Message message) {
-			super(method, message);
-		}
-
-		public GzipMessageRequestEntity(HttpMethodBase method, Message message, boolean httpChunkStream) {
-			super(method, message, httpChunkStream);
-		}
-
-		@Override
-		public void writeRequest(OutputStream out) throws IOException {
-			if (cachedStream != null) {
-				cachedStream.writeTo(out);
-			} else {
-				GZIPOutputStream gzStream = new GZIPOutputStream(out);
-				super.writeRequest(gzStream);
-				gzStream.finish();
-			}
-		}
-
-		@Override
-		public long getContentLength() {
-			if (isContentLengthNeeded()) {
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				try {
-					writeRequest(baos);
-					cachedStream = baos;
-					return baos.size();
-				} catch (IOException e) {
-					// fall through to doing chunked.
-				}
-			}
-			return -1; // do chunked 
-		}
-
-		private ByteArrayOutputStream cachedStream;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/SoapHttpSender.java b/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/SoapHttpSender.java
deleted file mode 100644
index 4ce694d..0000000
--- a/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/SoapHttpSender.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.soap;
-
-import java.net.URL;
-
-import org.apache.axis.MessageContext;
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-import org.eclipse.mylyn.commons.net.WebUtil;
-import org.eclipse.mylyn.internal.commons.soap.SoapRequest;
-
-/**
- * A client for SOAP calls that uses {@link AbstractWebLocation} and is based on {@link CommonsHttpSender}. Specify the
- * client in your soap service configuration:
- * 
- * <pre>
- * &lt;deployment name=&quot;defaultClientConfig&quot;
- *             xmlns=&quot;http://xml.apache.org/axis/wsdd/&quot;
- *             xmlns:java=&quot;http://xml.apache.org/axis/wsdd/providers/java&quot;&gt;
- *   &lt;transport name=&quot;http&quot; pivot=&quot;java:org.eclipse.mylyn.internal.provisional.commons.soap.SoapHttpSender&quot; /&gt;
- *   &lt;transport name=&quot;https&quot; pivot=&quot;java:org.eclipse.mylyn.internal.provisional.commons.soap.SoapHttpSender&quot;/&gt;
- *   ...
- * &lt;/deployment&gt;
- * </pre>
- * 
- * @author Steffen Pingel
- */
-public class SoapHttpSender extends CommonsHttpSender {
-
-	private static final long serialVersionUID = -5876804777334482128L;
-
-	/**
-	 * The key for specifying the server location of type {@link AbstractWebLocation}.
-	 */
-	public static final String LOCATION = "org.eclipse.mylyn.commons.soap.location"; //$NON-NLS-1$
-
-	/**
-	 * The key for specifying a user agent of type {@link String}.
-	 */
-	public static final String USER_AGENT = "org.eclipse.mylyn.commons.soap.userAgent"; //$NON-NLS-1$
-
-	@Override
-	protected HostConfiguration getHostConfiguration(HttpClient client, MessageContext context, URL url) {
-		AbstractWebLocation location = (AbstractWebLocation) context.getProperty(LOCATION);
-		if (location == null) {
-			throw new RuntimeException("Required property SoapHttpSender.LOCATION not set"); //$NON-NLS-1$
-		}
-		SoapRequest request = SoapRequest.getCurrentRequest();
-		WebUtil.configureHttpClient(client, (String) context.getProperty(USER_AGENT));
-		return WebUtil.createHostConfiguration(client, location, (request != null) ? request.getMonitor() : null);
-	}
-
-	@Override
-	protected void addContextInfo(HttpMethodBase method, HttpClient httpClient, MessageContext msgContext, URL tmpURL)
-			throws Exception {
-		super.addContextInfo(method, httpClient, msgContext, tmpURL);
-
-		SoapRequest request = SoapRequest.getCurrentRequest();
-		if (request != null) {
-			request.setMethod(method);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/.classpath b/org.eclipse.mylyn.commons.tests/.classpath
deleted file mode 100644
index 8d4bac7..0000000
--- a/org.eclipse.mylyn.commons.tests/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/mylyn/internal/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/net/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.commons.tests/.project b/org.eclipse.mylyn.commons.tests/.project
deleted file mode 100644
index ef32ef4..0000000
--- a/org.eclipse.mylyn.commons.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48cbe18..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,344 +0,0 @@
-#Tue May 12 20:42:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5e70d08..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Sat Mar 01 03:38:47 PST 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) 2004, 2007 Mylyn project committers and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *******************************************************************************/\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5ca4688..0000000
--- a/org.eclipse.mylyn.commons.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Commons Tests
-Bundle-SymbolicName: org.eclipse.mylyn.commons.tests
-Bundle-Version: 0.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.net,
- org.eclipse.ui,
- org.junit,
- org.eclipse.mylyn.commons.core,
- org.eclipse.mylyn.commons.net,
- org.eclipse.mylyn.commons.ui
-Export-Package: org.eclipse.mylyn.commons.tests;x-internal:=true,
- org.eclipse.mylyn.commons.tests.manual;x-internal:=true,
- org.eclipse.mylyn.commons.tests.net;x-internal:=true,
- org.eclipse.mylyn.commons.tests.support;x-internal:=true
-Bundle-Vendor: Eclipse.org
diff --git a/org.eclipse.mylyn.commons.tests/about.html b/org.eclipse.mylyn.commons.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons.tests/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.tests/build.properties b/org.eclipse.mylyn.commons.tests/build.properties
deleted file mode 100644
index 44e37a8..0000000
--- a/org.eclipse.mylyn.commons.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               about.html
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/AllCommonsTests.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/AllCommonsTests.java
deleted file mode 100644
index db0dac2..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/AllCommonsTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.commons.tests.net.SslProtocolSocketFactoryTest;
-import org.eclipse.mylyn.commons.tests.net.WebUtilTest;
-
-/**
- * @author Mik Kersten
- */
-public class AllCommonsTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.commons.tests");
-		suite.addTestSuite(SslProtocolSocketFactoryTest.class);
-		suite.addTestSuite(WebUtilTest.class);
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/NoticicationPopupMain.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/NoticicationPopupMain.java
deleted file mode 100644
index 1acbcbf..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/NoticicationPopupMain.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Benjamin Pasero - initial API and contribution
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.manual;
-
-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Benjamin Pasero
- * @author Mik Kersten
- */
-public class NoticicationPopupMain {
-
-	public static void main(String[] args) {
-		Display display = new Display();
-		Shell shell = new Shell(display);
-		shell.setLayout(new FillLayout());
-
-		shell.open();
-
-		final AbstractNotificationPopup popup = new SampleNotificationPopup(display);
-
-		shell.addShellListener(new ShellAdapter() {
-			@Override
-			public void shellClosed(ShellEvent e) {
-				popup.close();
-			}
-		});
-
-		popup.open();
-
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) {
-				display.sleep();
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/SampleNotificationPopup.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/SampleNotificationPopup.java
deleted file mode 100644
index 72b24bb..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/SampleNotificationPopup.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Benjamin Pasero - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.manual;
-
-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author Benjamin Pasero
- * @author Mik Kersten
- */
-public class SampleNotificationPopup extends AbstractNotificationPopup {
-
-	public SampleNotificationPopup(Display display) {
-		super(display);
-	}
-
-	@Override
-	protected void createTitleArea(Composite parent) {
-		((GridData) parent.getLayoutData()).heightHint = 24;
-
-		Label titleCircleLabel = new Label(parent, SWT.NONE);
-		titleCircleLabel.setText("RSSOwl - Incoming News");
-		titleCircleLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-		titleCircleLabel.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
-
-		Label closeButton = new Label(parent, SWT.NONE);
-		closeButton.setText("Close");
-		closeButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		closeButton.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
-		closeButton.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseUp(MouseEvent e) {
-				close();
-			}
-		});
-	}
-
-	@Override
-	protected void createContentArea(Composite parent) {
-		for (int i = 0; i < 5; i++) {
-			Label l = new Label(parent, SWT.None);
-			l.setText("News: " + i);
-			l.setBackground(parent.getBackground());
-		}
-	}
-
-	@Override
-	protected String getPopupShellTitle() {
-		return "Sample Notification";
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/StatusHandlerTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/StatusHandlerTest.java
deleted file mode 100644
index 2b38add..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/manual/StatusHandlerTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.manual;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class StatusHandlerTest extends TestCase {
-
-	public void testErrorDialog() {
-		try {
-			int i = 10 / 0;
-			System.out.println(i);
-		} catch (Throwable t) {
-			StatusHandler.fail(new Status(IStatus.ERROR, "org.eclipse.mylyn", "whoops", t));
-		}
-		StatusHandler.fail(new Status(IStatus.ERROR, "org.eclipse.mylyn", "whoops"));
-
-		assertTrue(confirmWithUser("Did an error dialog show up correctly?"));
-	}
-
-	public boolean confirmWithUser(String message) {
-		final boolean[] questionResponse = new boolean[1];
-		final String finalMsg = message;
-		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
-			public void run() {
-				try {
-					IWorkbenchWindow iww = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
-					Shell shell = iww.getShell();
-					questionResponse[0] = MessageDialog.openQuestion(shell, "JUnit Verification", finalMsg);
-				} catch (Throwable t) {
-					t.printStackTrace();
-				}
-			}
-		});
-		return questionResponse[0];
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/SslProtocolSocketFactoryTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/SslProtocolSocketFactoryTest.java
deleted file mode 100644
index 6a67373..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/SslProtocolSocketFactoryTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.net;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.eclipse.mylyn.commons.tests.support.TestProxy;
-import org.eclipse.mylyn.internal.commons.net.SslProtocolSocketFactory;
-
-/**
- * @author Steffen Pingel
- */
-public class SslProtocolSocketFactoryTest extends TestCase {
-
-	private TestProxy testProxy;
-
-	private InetSocketAddress proxyAddress;
-
-	@Override
-	protected void setUp() throws Exception {
-		testProxy = new TestProxy();
-		int proxyPort = testProxy.startAndWait();
-		assert proxyPort > 0;
-		proxyAddress = new InetSocketAddress("localhost", proxyPort);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		testProxy.stop();
-	}
-
-	public void testTrustAllSslProtocolSocketFactory() throws Exception {
-		SslProtocolSocketFactory factory = SslProtocolSocketFactory.getInstance();
-		Socket s;
-
-		s = factory.createSocket(proxyAddress.getHostName(), proxyAddress.getPort());
-		assertNotNull(s);
-		assertTrue(s.isConnected());
-		s.close();
-
-		InetAddress anyHost = new Socket().getLocalAddress();
-
-		s = factory.createSocket(proxyAddress.getHostName(), proxyAddress.getPort(), anyHost, 0);
-		assertNotNull(s);
-		assertTrue(s.isConnected());
-		s.close();
-
-		HttpConnectionParams params = new HttpConnectionParams();
-		s = factory.createSocket(proxyAddress.getHostName(), proxyAddress.getPort(), anyHost, 0, params);
-		assertNotNull(s);
-		assertTrue(s.isConnected());
-		s.close();
-
-		params.setConnectionTimeout(1000);
-		s = factory.createSocket(proxyAddress.getHostName(), proxyAddress.getPort(), anyHost, 0, params);
-		assertNotNull(s);
-		assertTrue(s.isConnected());
-		s.close();
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
deleted file mode 100644
index 7ba12e3..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.net;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.Proxy.Type;
-
-import javax.net.ssl.SSLHandshakeException;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.HttpMethodRetryHandler;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.eclipse.core.net.proxy.IProxyData;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.mylyn.commons.net.AbstractWebLocation;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.commons.net.IProxyProvider;
-import org.eclipse.mylyn.commons.net.WebLocation;
-import org.eclipse.mylyn.commons.net.WebUtil;
-import org.eclipse.mylyn.commons.tests.support.TestProxy;
-import org.eclipse.mylyn.commons.tests.support.TestProxy.Message;
-import org.eclipse.mylyn.internal.commons.net.AuthenticatedProxy;
-import org.eclipse.mylyn.internal.commons.net.SslProtocolSocketFactory;
-
-/**
- * @author Steffen Pingel
- */
-public class WebUtilTest extends TestCase {
-
-	private class StubProgressMonitor implements IProgressMonitor {
-
-		private volatile boolean canceled;
-
-		public void beginTask(String name, int totalWork) {
-		}
-
-		public void done() {
-		}
-
-		public void internalWorked(double work) {
-		}
-
-		public boolean isCanceled() {
-			return canceled;
-		}
-
-		public void setCanceled(boolean value) {
-			this.canceled = value;
-		}
-
-		public void setTaskName(String name) {
-		}
-
-		public void subTask(String name) {
-		}
-
-		public void worked(int work) {
-		}
-
-	}
-
-	private TestProxy testProxy;
-
-	private HttpClient client;
-
-	private InetSocketAddress proxyAddress;
-
-	public WebUtilTest() {
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		testProxy = new TestProxy();
-		int proxyPort = testProxy.startAndWait();
-		assert proxyPort > 0;
-		proxyAddress = new InetSocketAddress("localhost", proxyPort);
-
-		client = new HttpClient();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-
-		testProxy.stop();
-	}
-
-	public void testConnectCancelStalledConnect() throws Exception {
-		final StubProgressMonitor monitor = new StubProgressMonitor();
-		String host = "google.com";
-		int port = 9999;
-
-		try {
-			Runnable runner = new Runnable() {
-				public void run() {
-					try {
-						Thread.sleep(500);
-					} catch (InterruptedException e) {
-					}
-					monitor.canceled = true;
-				}
-			};
-			new Thread(runner).start();
-			WebUtil.connect(new Socket(), new InetSocketAddress(host, port), 5000, monitor);
-			fail("Expected OperationCanceledException");
-		} catch (OperationCanceledException expected) {
-			assertTrue(monitor.isCanceled());
-		}
-	}
-
-	public void testExecute() throws Exception {
-		StubProgressMonitor monitor = new StubProgressMonitor();
-		HttpClient client = new HttpClient();
-		String url = "http://eclipse.org/";
-		WebLocation location = new WebLocation(url);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, monitor);
-
-		GetMethod method = new GetMethod(url);
-		try {
-			int result = WebUtil.execute(client, hostConfiguration, method, monitor);
-			assertEquals(HttpStatus.SC_OK, result);
-		} finally {
-			method.releaseConnection();
-		}
-	}
-
-	public void testExecuteCancelStalledConnect() throws Exception {
-		final StubProgressMonitor monitor = new StubProgressMonitor();
-		HttpClient client = new HttpClient();
-		String url = "http://google.com:9999/";
-		WebLocation location = new WebLocation(url);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, monitor);
-
-		GetMethod method = new GetMethod(url);
-		try {
-			Runnable runner = new Runnable() {
-				public void run() {
-					try {
-						Thread.sleep(500);
-					} catch (InterruptedException e) {
-					}
-					monitor.canceled = true;
-				}
-			};
-			new Thread(runner).start();
-			WebUtil.execute(client, hostConfiguration, method, monitor);
-			client.executeMethod(method);
-			fail("Expected OperationCanceledException");
-		} catch (OperationCanceledException expected) {
-			assertTrue(monitor.isCanceled());
-		} finally {
-			method.releaseConnection();
-		}
-	}
-
-	public void testExecuteAlreadyCancelled() throws Exception {
-		StubProgressMonitor monitor = new StubProgressMonitor();
-		HttpClient client = new HttpClient();
-		String url = "http://eclipse.org/";
-		WebLocation location = new WebLocation(url);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, monitor);
-
-		GetMethod method = new GetMethod(url);
-		try {
-			monitor.canceled = true;
-			WebUtil.execute(client, hostConfiguration, method, monitor);
-			fail("Expected InterruptedIOException");
-		} catch (OperationCanceledException expected) {
-		} finally {
-			method.releaseConnection();
-		}
-	}
-
-	public void testConfigureHttpClient() {
-		HttpClient client = new HttpClient();
-
-		WebUtil.configureHttpClient(client, "");
-		assertEquals(WebUtil.getUserAgent(""), client.getParams().getParameter(HttpMethodParams.USER_AGENT));
-
-		WebUtil.configureHttpClient(client, null);
-		assertEquals(WebUtil.getUserAgent(""), client.getParams().getParameter(HttpMethodParams.USER_AGENT));
-
-		WebUtil.configureHttpClient(client, "myagent");
-		assertTrue(-1 != client.getParams().getParameter(HttpMethodParams.USER_AGENT).toString().indexOf("myagent"));
-
-		// TODO test timeouts
-	}
-
-	public void testCreateHostConfigurationProxy() throws Exception {
-		StubProgressMonitor monitor = new StubProgressMonitor();
-		HttpClient client = new HttpClient();
-		WebUtil.createHostConfiguration(client, new WebLocation("http://eclipse.org/", null, null,
-				new IProxyProvider() {
-					public Proxy getProxyForHost(String host, String proxyType) {
-						assertEquals(IProxyData.HTTP_PROXY_TYPE, proxyType);
-						return null;
-					}
-				}), monitor);
-		WebUtil.createHostConfiguration(client, new WebLocation("https://eclipse.org/", null, null,
-				new IProxyProvider() {
-					public Proxy getProxyForHost(String host, String proxyType) {
-						assertEquals(IProxyData.HTTPS_PROXY_TYPE, proxyType);
-						return null;
-					}
-				}), monitor);
-	}
-
-	public void testLocationConnect() throws Exception {
-		String url = "http://" + proxyAddress.getHostName() + ":" + proxyAddress.getPort() + "/";
-		AbstractWebLocation location = new WebLocation(url, null, null, null);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod("/");
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(200, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET / HTTP/1.1", request.request);
-	}
-
-	public void testLocationConnectSsl() throws Exception {
-		String url = "https://" + proxyAddress.getHostName() + ":" + proxyAddress.getPort() + "/";
-		AbstractWebLocation location = new WebLocation(url, null, null, null);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		testProxy.setCloseOnConnect(true);
-
-		GetMethod method = new GetMethod("/");
-		try {
-			int statusCode = client.executeMethod(hostConfiguration, method);
-			fail("Expected SSLHandshakeException, got status: " + statusCode);
-		} catch (SSLHandshakeException e) {
-		}
-
-		assertFalse(testProxy.hasRequest());
-	}
-
-	public void testLocationConnectProxy() throws Exception {
-		String url = "http://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		AbstractWebLocation location = new WebLocation(url, null, null, new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod(WebUtil.getRequestPath(url));
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(200, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET http://foo/bar HTTP/1.1", request.request);
-	}
-
-	public void testLocationConnectProxyHttpAuth() throws Exception {
-		String url = "http://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		WebLocation location = new WebLocation(url, "", "", new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		location.setCredentials(AuthenticationType.HTTP, "user", "pass");
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		client.getParams().setAuthenticationPreemptive(true);
-
-		Message response = new Message("HTTP/1.1 401 Authentication required");
-		response.headers.add("WWW-Authenticate: Basic realm=\"Foo\"");
-		testProxy.addResponse(response);
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod(url);
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(401, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET http://foo/bar HTTP/1.1", request.request);
-		assertEquals("Basic dXNlcjpwYXNz", request.getHeaderValue("Authorization"));
-	}
-
-	public void testLocationConnectProxyNoProxyCredentials() throws Exception {
-		String url = "http://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		AbstractWebLocation location = new WebLocation(url, "user", "pass", new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		Message response = new Message("HTTP/1.1 407 Proxy authentication required");
-		response.headers.add("Proxy-Authenticate: Basic realm=\"Foo\"");
-		testProxy.addResponse(response);
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod(url);
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(407, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET http://foo/bar HTTP/1.1", request.request);
-
-		assertFalse("Expected HttpClient to close connection", testProxy.hasRequest());
-	}
-
-	public void testLocationConnectProxyProxyCredentials() throws Exception {
-		String url = "http://foo/bar";
-		final Proxy proxy = new AuthenticatedProxy(Type.HTTP, proxyAddress, "proxyUser", "proxyPass");
-		AbstractWebLocation location = new WebLocation(url, "user", "pass", new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		client.getParams().setAuthenticationPreemptive(true);
-
-		Message response = new Message("HTTP/1.1 407 Proxy authentication required");
-		response.headers.add("Proxy-Authenticate: Basic realm=\"Foo\"");
-		testProxy.addResponse(response);
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod(url);
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(407, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET http://foo/bar HTTP/1.1", request.request);
-		assertEquals("Basic cHJveHlVc2VyOnByb3h5UGFzcw==", request.getHeaderValue("Proxy-Authorization"));
-	}
-
-	public void testLocationConnectProxyProxyCredentialsHttpAuth() throws Exception {
-		String url = "http://foo/bar";
-		final Proxy proxy = new AuthenticatedProxy(Type.HTTP, proxyAddress, "proxyUser", "proxyPass");
-		WebLocation location = new WebLocation(url, "", "", new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		location.setCredentials(AuthenticationType.HTTP, "user", "pass");
-
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		client.getParams().setAuthenticationPreemptive(true);
-
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod(url);
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(200, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("GET http://foo/bar HTTP/1.1", request.request);
-		assertEquals("Basic cHJveHlVc2VyOnByb3h5UGFzcw==", request.getHeaderValue("Proxy-Authorization"));
-		assertEquals("Basic dXNlcjpwYXNz", request.getHeaderValue("Authorization"));
-	}
-
-	public void testLocationSslConnectProxy() throws Exception {
-		String url = "https://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		AbstractWebLocation location = new WebLocation(url, null, null, new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		;
-
-		testProxy.addResponse(TestProxy.SERVICE_UNVAILABLE);
-
-		GetMethod method = new GetMethod("/");
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(503, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("CONNECT foo:443 HTTP/1.1", request.request);
-	}
-
-	public void testLocationSslConnectProxyProxyCredentials() throws Exception {
-		String url = "https://foo/bar";
-		final Proxy proxy = new AuthenticatedProxy(Type.HTTP, proxyAddress, "proxyUser", "proxyPass");
-		AbstractWebLocation location = new WebLocation(url, null, null, new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		;
-		client.getParams().setAuthenticationPreemptive(true);
-
-		testProxy.addResponse(TestProxy.SERVICE_UNVAILABLE);
-
-		GetMethod method = new GetMethod("/");
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(503, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("CONNECT foo:443 HTTP/1.1", request.request);
-		assertEquals("Basic cHJveHlVc2VyOnByb3h5UGFzcw==", request.getHeaderValue("Proxy-Authorization"));
-	}
-
-	public void testLocationSslConnectProxyNoProxyCredentials() throws Exception {
-		String url = "https://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		AbstractWebLocation location = new WebLocation(url, null, null, new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-		;
-
-		Message response = new Message("HTTP/1.1 407 Proxy authentication required");
-		response.headers.add("Proxy-Authenticate: Basic realm=\"Foo\"");
-		testProxy.addResponse(response);
-		testProxy.addResponse(TestProxy.SERVICE_UNVAILABLE);
-
-		GetMethod method = new GetMethod("/");
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(407, statusCode);
-
-		Message request = testProxy.getRequest();
-		assertEquals("CONNECT foo:443 HTTP/1.1", request.request);
-
-		assertFalse("Expected HttpClient to close connection", testProxy.hasRequest());
-	}
-
-	public void testLocationSslConnectProxyTimeout() throws Exception {
-		String url = "https://foo/bar";
-		final Proxy proxy = new Proxy(Type.HTTP, proxyAddress);
-		AbstractWebLocation location = new WebLocation(url, null, null, new IProxyProvider() {
-			public Proxy getProxyForHost(String host, String proxyType) {
-				return proxy;
-			}
-		});
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		testProxy.addResponse(TestProxy.OK);
-
-		GetMethod method = new GetMethod("/");
-		// avoid second attempt to connect to proxy to get exception right away
-		method.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new HttpMethodRetryHandler() {
-			public boolean retryMethod(HttpMethod method, IOException exception, int executionCount) {
-				return false;
-			}
-		});
-		try {
-			int statusCode = client.executeMethod(hostConfiguration, method);
-			fail("Expected SSLHandshakeException, got status: " + statusCode);
-		} catch (SSLHandshakeException e) {
-		} catch (SocketException e) {
-			// connection reset, happens in some environments instead of SSLHandshakeExecption depending on how much data has been written before the socket is closed
-		}
-
-		Message request = testProxy.getRequest();
-		assertEquals("CONNECT foo:443 HTTP/1.1", request.request);
-	}
-
-	public void testLocationConnectSslClientCert() throws Exception {
-		if (!SslProtocolSocketFactory.getInstance().hasKeyManager()) {
-			// skip if keystore property is not set
-			return;
-		}
-
-		String url = "https://mylyn.eclipse.org/secure/";
-		AbstractWebLocation location = new WebLocation(url, null, null, null);
-		HostConfiguration hostConfiguration = WebUtil.createHostConfiguration(client, location, null);
-
-		GetMethod method = new GetMethod(WebUtil.getRequestPath(url));
-		int statusCode = client.executeMethod(hostConfiguration, method);
-		assertEquals(200, statusCode);
-	}
-
-	public void testGetUserAgent() {
-		String userAgent = WebUtil.getUserAgent(null);
-		assertEquals(userAgent, WebUtil.getUserAgent(""));
-		assertEquals(-1, userAgent.indexOf("null"));
-		assertEquals(-1, userAgent.indexOf("  "));
-		assertEquals(0, userAgent.indexOf("Mylyn"));
-
-		userAgent = WebUtil.getUserAgent("abc");
-		assertEquals(-1, userAgent.indexOf("null"));
-		assertEquals(-1, userAgent.indexOf("  "));
-		assertEquals(0, userAgent.indexOf("Mylyn"));
-		assertTrue(userAgent.contains(" abc "));
-	}
-
-	public void testUrlParsers() {
-		String url = "https://example.com:444/folder/file.txt";
-		assertEquals(444, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("/folder/file.txt", WebUtil.getRequestPath(url));
-
-		url = "http://example.com/";
-		assertEquals(80, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("/", WebUtil.getRequestPath(url));
-
-		url = "http://example.com";
-		assertEquals(80, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("", WebUtil.getRequestPath(url));
-
-		url = "https://example.com:321";
-		assertEquals(321, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("", WebUtil.getRequestPath(url));
-
-		url = "example.com:321";
-		assertEquals(321, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("", WebUtil.getRequestPath(url));
-
-		url = "https://example.com:444/folder/file.txt?search=https://example.com:812/folder/file.txt";
-		assertEquals(444, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("/folder/file.txt?search=https://example.com:812/folder/file.txt", WebUtil.getRequestPath(url));
-
-		url = "https://example.com/folder/file.txt?search=https://example.com:812/folder/file.txt";
-		assertEquals(443, WebUtil.getPort(url));
-		assertEquals("example.com", WebUtil.getHost(url));
-		assertEquals("/folder/file.txt?search=https://example.com:812/folder/file.txt", WebUtil.getRequestPath(url));
-
-		url = "https://jira.codehaus.org/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&pid=11093&resolution=-1&sorter/field=updated&sorter/order=DESC&tempMax=1000";
-		assertEquals(443, WebUtil.getPort(url));
-		assertEquals("jira.codehaus.org", WebUtil.getHost(url));
-		assertEquals(
-				"/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?&pid=11093&resolution=-1&sorter/field=updated&sorter/order=DESC&tempMax=1000",
-				WebUtil.getRequestPath(url));
-	}
-
-	public void testGetTitleFromUrl() throws Exception {
-		assertEquals("Eclipse.org home", WebUtil.getTitleFromUrl(new WebLocation("http://eclipse.org"), null));
-		// disabled: fails in environments where the DNS resolver redirects for unknown hosts  
-		//		try {
-//			String title = WebUtil.getTitleFromUrl(new WebLocation("http://invalidurl"), null);
-//			fail("Expected UnknownHostException, got: " + title);
-//		} catch (UnknownHostException e) {
-//		}
-		String url = "http://" + proxyAddress.getHostName() + ":" + proxyAddress.getPort() + "/";
-		testProxy.addResponse(TestProxy.OK);
-		assertNull(WebUtil.getTitleFromUrl(new WebLocation(url), null));
-	}
-
-	/**
-	 * Default encoding needs to be set to non-UTF8 encoding for this test to be meaningful, e.g.
-	 * <code>-Dfile.encoding=ISO-8859-1</code>.
-	 */
-	public void testGetTitleFromUrlUtf8() throws Exception {
-		String message = "HTTP/1.1 200 OK\n" + "Date: Sat, 03 Jan 2009 14:40:23 GMT\n" + "Connection: close\n"
-				+ "Content-Type: text/html; charset=UTF-8\n" + "Content-Length: 30\n" + "\n"
-				+ "<html><title>\u00C3\u00BC</title></html>";
-		testProxy.addResponse(message);
-		String url = "http://" + proxyAddress.getHostName() + ":" + proxyAddress.getPort() + "/";
-		assertEquals("\u00FC", WebUtil.getTitleFromUrl(new WebLocation(url), null));
-	}
-
-	public void testGetPlatformProxyDefault() {
-		assertNull(WebUtil.getProxy("mylyn.eclipse.org", Type.HTTP));
-		assertNull(WebUtil.getProxy("mylyn.eclipse.org", Type.DIRECT));
-		assertNull(WebUtil.getProxy("mylyn.eclipse.org", Type.SOCKS));
-	}
-
-//	public void testGetPlatformProxy() {
-//		IProxyService defaultProxyService = WebUtil.getProxyService();
-//		try {
-//			StubProxyService proxyService = new StubProxyService();
-//			WebUtil.setProxyService(proxyService);
-//			proxyService.setProxy(IProxyData.HTTP_PROXY_TYPE, "proxy", 8080, false);
-//			Proxy proxy = WebUtil.getProxy("mylyn.eclipse.org", Type.HTTP);
-//			assertNotNull(proxy);
-//			assertEquals(Proxy.Type.HTTP, proxy.type());
-//			proxy = WebUtil.getProxy("mylyn.eclipse.org", Type.SOCKS);
-//			assertNull(proxy);
-//		} finally {
-//			WebUtil.setProxyService(defaultProxyService);
-//		}
-//	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonsTestUtil.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonsTestUtil.java
deleted file mode 100644
index 1856e23..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/CommonsTestUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.support;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.framework.adaptor.BundleClassLoader;
-
-/**
- * @author Steffen Pingel
- */
-public class CommonsTestUtil {
-
-	@SuppressWarnings("restriction")
-	public static File getFile(Object source, String filename) throws Exception {
-		if (Platform.isRunning()) {
-			ClassLoader classLoader = source.getClass().getClassLoader();
-			if (classLoader instanceof BundleClassLoader) {
-				URL url = ((BundleClassLoader) classLoader).getResource(filename);
-				URL localURL = FileLocator.toFileURL(url);
-				return new File(localURL.getFile());
-			}
-		} else {
-			URL localURL = source.getClass().getResource("");
-			// remove all package segments from name
-			String directory = source.getClass().getName().replaceAll("[^.]", "");
-			directory = directory.replaceAll(".", "../");
-			if (localURL.getFile().contains("/bin/")) {
-				// account for bin/ when running from Eclipse workspace
-				directory += "../";
-			}
-			return new File(localURL.getFile() + directory + filename);
-		}
-		throw new AssertionFailedError("Could not locate " + filename);
-	}
-
-	public static String read(File source) throws IOException {
-		InputStream in = new FileInputStream(source);
-		try {
-			StringBuilder sb = new StringBuilder();
-			byte[] buf = new byte[1024];
-			int len;
-			while ((len = in.read(buf)) > 0) {
-				sb.append(new String(buf, 0, len));
-			}
-			return sb.toString();
-		} finally {
-			in.close();
-		}
-	}
-
-	/**
-	 * Copies all files in the current data directory to the specified folder. Will overwrite.
-	 */
-	public static void copyFolder(File sourceFolder, File targetFolder) throws IOException {
-		for (File currFile : sourceFolder.listFiles()) {
-			if (currFile.isFile()) {
-				File destFile = new File(targetFolder, currFile.getName());
-				copy(currFile, destFile);
-			} else if (currFile.isDirectory()) {
-				File destDir = new File(targetFolder, currFile.getName());
-				if (!destDir.exists()) {
-					if (!destDir.mkdir()) {
-						throw new IOException("Unable to create destination context folder: "
-								+ destDir.getAbsolutePath());
-					}
-				}
-				for (File file : currFile.listFiles()) {
-					File destFile = new File(destDir, file.getName());
-					if (destFile.exists()) {
-						destFile.delete();
-					}
-					copy(file, destFile);
-				}
-			}
-		}
-	}
-
-	public static void copy(File source, File dest) throws IOException {
-		InputStream in = new FileInputStream(source);
-		try {
-			OutputStream out = new FileOutputStream(dest);
-			try {
-				byte[] buf = new byte[1024];
-				int len;
-				while ((len = in.read(buf)) > 0) {
-					out.write(buf, 0, len);
-				}
-			} finally {
-				out.close();
-			}
-		} finally {
-			in.close();
-		}
-	}
-
-	public static void deleteFolder(File path) {
-		if (path.isDirectory()) {
-			for (File file : path.listFiles()) {
-				file.delete();
-			}
-			path.delete();
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java
deleted file mode 100644
index 077a35f..0000000
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/support/TestProxy.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.commons.tests.support;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.AssertionFailedError;
-
-/**
- * @author Steffen Pingel
- */
-public class TestProxy implements Runnable {
-
-	public static String CRLF = "\r\n";
-
-	public static class Message {
-
-		public List<String> headers = new ArrayList<String>();
-
-		public String request;
-
-		private String charset;
-
-		public Message(String request) {
-			this.request = request;
-			this.charset = "ISO-8859-1";
-		}
-
-		public String getCharset() {
-			return charset;
-		}
-
-		public String getHeader(String prefix) {
-			if (headers != null) {
-				for (String header : headers) {
-					if (header.startsWith(prefix)) {
-						return header;
-					}
-				}
-			}
-			return null;
-		}
-
-		public String getHeaderValue(String prefix) {
-			String header = getHeader(prefix);
-			if (header != null) {
-				int i = header.indexOf(": ");
-				return (i != -1) ? header.substring(i + 2) : "";
-			}
-			return null;
-		}
-
-		public String getMethod() {
-			int i = request.indexOf(" ");
-			return (i != -1) ? request.substring(0, i) : request;
-		}
-
-		public void setCharset(String charset) {
-			this.charset = charset;
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder sb = new StringBuilder();
-			sb.append(request);
-			sb.append("\n");
-			if (headers != null) {
-				for (String header : headers) {
-					sb.append(header);
-					sb.append("\n");
-				}
-			}
-			sb.append("\n");
-			return sb.toString().replaceAll("\n", CRLF);
-		}
-
-	}
-
-	public static final String HEADER_CONNECTION_CLOSE = "Connection: Close";
-
-	public static final String HEADER_NO_CONTENT = "Content-Length: 0";
-
-	public static final Message NOT_FOUND = new Message("HTTP/1.1 404 Not Found");
-
-	public static final Message OK = new Message("HTTP/1.1 200 OK");
-
-	public static final Message SERVICE_UNVAILABLE = createEmptyMessage("HTTP/1.1 503 Service Unavailable");
-
-	static {
-		NOT_FOUND.headers.add(HEADER_CONNECTION_CLOSE);
-	}
-	static {
-		OK.headers.add(HEADER_CONNECTION_CLOSE);
-	}
-
-	static {
-		OK.headers.add(HEADER_CONNECTION_CLOSE);
-	}
-
-	private static Message createEmptyMessage(String status) {
-		return new Message(status + "\n" + HEADER_NO_CONTENT + "\n\n");
-	}
-
-	private boolean autoClose;
-
-	private IOException exception;
-
-	private final int listenPort;
-
-	private final List<Message> requests = new ArrayList<Message>();
-
-	private final List<Message> responses = new ArrayList<Message>();
-
-	private Thread runner;
-
-	private volatile ServerSocket serverSocket;
-
-	private volatile boolean stopped;
-
-	private boolean waitForResponse;
-
-	private boolean closeOnConnect;
-
-	public TestProxy() {
-		this(0);
-	}
-
-	public TestProxy(int listenPort) {
-		this.listenPort = listenPort;
-		this.autoClose = true;
-	}
-
-	public synchronized void addRequest(Message request) {
-		this.requests.add(request);
-		notifyAll();
-	}
-
-	public synchronized void addResponse(Message response) {
-		this.responses.add(response);
-		notifyAll();
-	}
-
-	public synchronized void addResponse(String response) {
-		this.responses.add(new Message(response));
-		notifyAll();
-	}
-
-	public synchronized void checkForException() throws IOException {
-		if (exception != null) {
-			throw exception;
-		}
-	}
-
-	public int getPort() {
-		return serverSocket.getLocalPort();
-	}
-
-	public synchronized Message getRequest() throws InterruptedException {
-		if (requests.isEmpty()) {
-			throw new AssertionFailedError("Request list is empty");
-		}
-		return requests.remove(0);
-	}
-
-	private void handleConnection(Socket socket) {
-		try {
-			while (!closeOnConnect && !stopped) {
-				Message request = readMessage(socket.getInputStream());
-				if (stopped || request == null) {
-					break;
-				}
-				addRequest(request);
-
-				if (hasMoreResponses() || waitForResponse) {
-					Message response = waitForResponse();
-					if (stopped || response == null) {
-						break;
-					}
-					writeMessage(response, socket.getOutputStream());
-
-					if (autoClose && response.toString().contains(HEADER_CONNECTION_CLOSE)) {
-						break;
-					}
-				} else {
-					writeMessage(SERVICE_UNVAILABLE, socket.getOutputStream());
-					System.err.println("Unexpected request: ");
-					System.err.println(request.toString());
-					break;
-				}
-			}
-		} catch (IOException e) {
-			setException(e);
-		} catch (InterruptedException e) {
-		} finally {
-			try {
-				socket.close();
-			} catch (IOException e1) {
-			}
-		}
-	}
-
-	private synchronized boolean hasMoreResponses() {
-		return !responses.isEmpty();
-	}
-
-	public synchronized boolean hasRequest() {
-		return !requests.isEmpty();
-	}
-
-	public boolean isAutoClose() {
-		return autoClose;
-	}
-
-	public boolean isCloseOnConnect() {
-		return closeOnConnect;
-	}
-
-	private Message readMessage(InputStream in) throws IOException {
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-		Message message = null;
-		String line;
-		while ((line = reader.readLine()) != null) {
-			if (line.length() == 0) {
-				if (message == null) {
-					throw new IOException("Incomplete message");
-				}
-				return message;
-			}
-
-			if (message == null) {
-				message = new Message(line);
-			} else {
-				message.headers.add(line);
-			}
-		}
-		throw new EOFException();
-	}
-
-	public void run() {
-		try {
-			serverSocket = new ServerSocket(listenPort);
-			while (!stopped) {
-				Socket socket = serverSocket.accept();
-				handleConnection(socket);
-			}
-		} catch (InterruptedIOException e) {
-		} catch (IOException e) {
-			setException(e);
-		} finally {
-			if (serverSocket != null) {
-				try {
-					serverSocket.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-
-	}
-
-	public void setCloseOnConnect(boolean closeOnConnect) {
-		this.closeOnConnect = closeOnConnect;
-	}
-
-	public void setAutoClose(boolean autoClose) {
-		this.autoClose = autoClose;
-	}
-
-	private synchronized void setException(IOException exception) {
-		this.exception = exception;
-		notifyAll();
-	}
-
-	public void setWaitForResponse(boolean waitForResponse) {
-		this.waitForResponse = waitForResponse;
-	}
-
-	public void start() {
-		runner = new Thread(this, "TestProxy :" + listenPort);
-		runner.start();
-	}
-
-	public int startAndWait() throws InterruptedException {
-		start();
-		while (serverSocket == null || serverSocket.getLocalPort() == -1) {
-			Thread.sleep(100);
-		}
-		return serverSocket.getLocalPort();
-	}
-
-	public void stop() {
-		stopped = true;
-		runner.interrupt();
-		try {
-			runner.join(500);
-		} catch (InterruptedException e) {
-		}
-	}
-
-	public synchronized Message waitForRequest() throws InterruptedException {
-		while (requests.isEmpty()) {
-			if (stopped) {
-				return null;
-			}
-			wait();
-		}
-		return requests.remove(0);
-	}
-
-	public synchronized Message waitForResponse() throws InterruptedException {
-		while (!stopped && responses.isEmpty()) {
-			if (stopped || autoClose) {
-				return null;
-			}
-			wait();
-		}
-		return responses.remove(0);
-	}
-
-	private void writeMessage(Message message, OutputStream out) throws IOException {
-		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, message.getCharset()));
-		writer.write(message.toString());
-		writer.flush();
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/.classpath b/org.eclipse.mylyn.commons.ui/.classpath
deleted file mode 100644
index e756522..0000000
--- a/org.eclipse.mylyn.commons.ui/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/forms/widgets/FormUtil"/>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/browser/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.commons.ui/.project b/org.eclipse.mylyn.commons.ui/.project
deleted file mode 100644
index bbf88aa..0000000
--- a/org.eclipse.mylyn.commons.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.commons.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8b14054..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,344 +0,0 @@
-#Tue May 12 20:42:43 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.commons.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 4b0629a..0000000
--- a/org.eclipse.mylyn.commons.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,126 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.commons.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.editors;resolution:=optional,
- org.eclipse.ui.forms;resolution:=optional,
- org.eclipse.ui.browser;resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin
-Export-Package: org.eclipse.mylyn.internal.commons.ui;x-internal:=true;
-  uses:="org.eclipse.jface.window,
-   org.eclipse.core.runtime,
-   org.eclipse.jface.resource,
-   org.eclipse.core.runtime.jobs,
-   org.eclipse.ui.plugin,
-   org.eclipse.swt.graphics,
-   org.osgi.framework,
-   org.eclipse.swt.widgets",
- org.eclipse.mylyn.internal.provisional.commons.ui;
-  x-friends:="org.eclipse.mylyn.bugzilla.core,
-   org.eclipse.mylyn.bugzilla.ide,
-   org.eclipse.mylyn.bugzilla.ui,
-   org.eclipse.mylyn.commons.core,
-   org.eclipse.mylyn.commons.ui,
-   org.eclipse.mylyn.compatibility,
-   org.eclipse.mylyn.context.core,
-   org.eclipse.mylyn.context.ui,
-   org.eclipse.mylyn.help.ui,
-   org.eclipse.mylyn.ide.ant,
-   org.eclipse.mylyn.ide.ui,
-   org.eclipse.mylyn.java.ui,
-   org.eclipse.mylyn.jira.core,
-   org.eclipse.mylyn.jira.ui,
-   org.eclipse.mylyn.monitor.core,
-   org.eclipse.mylyn.monitor.reports,
-   org.eclipse.mylyn.monitor.server,
-   org.eclipse.mylyn.monitor.study,
-   org.eclipse.mylyn.monitor.ui,
-   org.eclipse.mylyn.monitor.usage,
-   org.eclipse.mylyn.pde.ui,
-   org.eclipse.mylyn.resources.ui,
-   org.eclipse.mylyn.sandbox.dev,
-   org.eclipse.mylyn.sandbox.ui,
-   org.eclipse.mylyn.tasks.bugs,
-   org.eclipse.mylyn.tasks.core,
-   org.eclipse.mylyn.tasks.ui,
-   org.eclipse.mylyn.team.cvs,
-   org.eclipse.mylyn.team.ui,
-   org.eclipse.mylyn.trac.core,
-   org.eclipse.mylyn.trac.tests,
-   org.eclipse.mylyn.trac.ui,
-   org.eclipse.mylyn.trac.wiki,
-   org.eclipse.mylyn.commons.net,
-   org.eclipse.mylyn.web.tasks,
-   org.eclipse.mylyn.web.ui,
-   org.eclipse.mylyn.xplanner.core,
-   org.eclipse.mylyn.xplanner.ui";
-  uses:="org.eclipse.jface.wizard,
-   org.eclipse.jface.window,
-   org.eclipse.core.runtime,
-   org.eclipse.jface.resource,
-   org.eclipse.swt.events,
-   org.eclipse.core.runtime.jobs,
-   org.eclipse.swt.graphics,
-   org.eclipse.jface.viewers,
-   org.eclipse.ui.dialogs,
-   org.eclipse.swt.widgets,
-   org.eclipse.jface.dialogs",
- org.eclipse.mylyn.internal.provisional.commons.ui.editor;
-  x-friends:="org.eclipse.mylyn.bugzilla.core,
-   org.eclipse.mylyn.bugzilla.ide,
-   org.eclipse.mylyn.bugzilla.ui,
-   org.eclipse.mylyn.commons.core,
-   org.eclipse.mylyn.commons.ui,
-   org.eclipse.mylyn.compatibility,
-   org.eclipse.mylyn.context.core,
-   org.eclipse.mylyn.context.ui,
-   org.eclipse.mylyn.help.ui,
-   org.eclipse.mylyn.ide.ant,
-   org.eclipse.mylyn.ide.ui,
-   org.eclipse.mylyn.java.ui,
-   org.eclipse.mylyn.jira.core,
-   org.eclipse.mylyn.jira.ui,
-   org.eclipse.mylyn.monitor.core,
-   org.eclipse.mylyn.monitor.reports,
-   org.eclipse.mylyn.monitor.server,
-   org.eclipse.mylyn.monitor.study,
-   org.eclipse.mylyn.monitor.ui,
-   org.eclipse.mylyn.monitor.usage,
-   org.eclipse.mylyn.pde.ui,
-   org.eclipse.mylyn.resources.ui,
-   org.eclipse.mylyn.sandbox.dev,
-   org.eclipse.mylyn.sandbox.ui,
-   org.eclipse.mylyn.tasks.bugs,
-   org.eclipse.mylyn.tasks.core,
-   org.eclipse.mylyn.tasks.ui,
-   org.eclipse.mylyn.team.cvs,
-   org.eclipse.mylyn.team.ui,
-   org.eclipse.mylyn.trac.core,
-   org.eclipse.mylyn.trac.tests,
-   org.eclipse.mylyn.trac.ui,
-   org.eclipse.mylyn.trac.wiki,
-   org.eclipse.mylyn.commons.net,
-   org.eclipse.mylyn.web.tasks,
-   org.eclipse.mylyn.web.ui,
-   org.eclipse.mylyn.xplanner.core,
-   org.eclipse.mylyn.xplanner.ui";
-  uses:="org.eclipse.jface.wizard,
-   org.eclipse.jface.window,
-   org.eclipse.core.runtime,
-   org.eclipse.jface.resource,
-   org.eclipse.swt.events,
-   org.eclipse.core.runtime.jobs,
-   org.eclipse.swt.graphics,
-   org.eclipse.jface.viewers,
-   org.eclipse.ui.dialogs,
-   org.eclipse.swt.widgets,
-   org.eclipse.jface.dialogs"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.commons.ui/about.html b/org.eclipse.mylyn.commons.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.commons.ui/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/build.properties b/org.eclipse.mylyn.commons.ui/build.properties
deleted file mode 100644
index c2d342d..0000000
--- a/org.eclipse.mylyn.commons.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/blank.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/blank.gif
deleted file mode 100644
index 45b7594..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/blank.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/clearDot.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/clearDot.gif
deleted file mode 100644
index 35d42e8..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/clearDot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall-small.png b/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall-small.png
deleted file mode 100644
index 4321c88..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall-small.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall.png b/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall.png
deleted file mode 100644
index 611a8c5..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/collapseall.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/delete.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/delete.gif
deleted file mode 100644
index b6922ac..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall-small.png b/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall-small.png
deleted file mode 100644
index 05445c0..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall-small.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall.gif
deleted file mode 100644
index 0205b29..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/expandall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-complete.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-complete.gif
deleted file mode 100644
index ef1c1b3..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-complete.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-priority.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-priority.gif
deleted file mode 100644
index 16f5652..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/filter-priority.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh-small.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh-small.gif
deleted file mode 100644
index 284be87..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh-small.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh.gif
deleted file mode 100644
index 634306d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/remove.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/remove.gif
deleted file mode 100644
index 2cd9c54..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/remove.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/elcl16/warning.gif b/org.eclipse.mylyn.commons.ui/icons/elcl16/warning.gif
deleted file mode 100644
index 6e44748..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/elcl16/warning.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/calendar.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/calendar.gif
deleted file mode 100644
index 4126b3c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/calendar.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-fit.png b/org.eclipse.mylyn.commons.ui/icons/etool16/capture-fit.png
deleted file mode 100644
index adbc678..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-fit.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen-bold.png b/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen-bold.png
deleted file mode 100644
index cb3e252..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen-bold.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen.png b/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen.png
deleted file mode 100644
index 91fe363..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/capture-screen.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/clear.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/clear.gif
deleted file mode 100644
index 6bc10f9..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/clear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/content-assist-separator.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/content-assist-separator.gif
deleted file mode 100644
index 25b1176..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/content-assist-separator.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/copy.png b/org.eclipse.mylyn.commons.ui/icons/etool16/copy.png
deleted file mode 100644
index bb5451c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/copy.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/cut.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/cut.gif
deleted file mode 100644
index d044e59..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/cut.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/edit.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/edit.gif
deleted file mode 100644
index e8de662..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/edit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear-disabled.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear-disabled.gif
deleted file mode 100644
index 7df7449..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear.gif
deleted file mode 100644
index b8c55de..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/find-clear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/find.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/find.gif
deleted file mode 100644
index 9d58cb9..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/find.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/go-into.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/go-into.gif
deleted file mode 100644
index 98d316d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/go-into.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/go-up.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/go-up.gif
deleted file mode 100644
index 73e336e..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/go-up.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/grouping.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/grouping.gif
deleted file mode 100644
index b487d07..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/grouping.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/link-editor.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/link-editor.gif
deleted file mode 100644
index 0061df8..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/link-editor.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/maximize.png b/org.eclipse.mylyn.commons.ui/icons/etool16/maximize.png
deleted file mode 100644
index f300b7c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/maximize.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/open-browser.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/open-browser.gif
deleted file mode 100644
index b09bc8b..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/open-browser.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/overlay-repository.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/overlay-repository.gif
deleted file mode 100644
index 0ce0f9f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/overlay-repository.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/person-me-narrow.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/person-me-narrow.gif
deleted file mode 100644
index 268540f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/person-me-narrow.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/person-me.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/person-me.gif
deleted file mode 100644
index fa074fb..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/person-me.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/person-narrow.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/person-narrow.gif
deleted file mode 100644
index 9c0c4bf..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/person-narrow.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/person.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/person.gif
deleted file mode 100644
index dc5a1af..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/person.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/presentation.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/presentation.gif
deleted file mode 100644
index db8f21f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/presentation.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/preview-web.png b/org.eclipse.mylyn.commons.ui/icons/etool16/preview-web.png
deleted file mode 100644
index c82f13f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/preview-web.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-day.png b/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-day.png
deleted file mode 100644
index ae34650..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-day.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-week.png b/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-week.png
deleted file mode 100644
index 94845cb..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/schedule-week.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down-gray.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down-gray.gif
deleted file mode 100644
index f16b4c9..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down-gray.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down.gif
deleted file mode 100644
index 18d6269..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-down.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up-gray.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up-gray.gif
deleted file mode 100644
index 4ac9855..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up-gray.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up.gif
deleted file mode 100644
index fd2d3de..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/sort-up.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-down.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-down.gif
deleted file mode 100644
index 32107ac..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-down.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-right.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-right.gif
deleted file mode 100644
index fc8b2e4..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/toolbar-arrow-right.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/etool16/view-filter.gif b/org.eclipse.mylyn.commons.ui/icons/etool16/view-filter.gif
deleted file mode 100644
index a5317bd..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/etool16/view-filter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/focus-view.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/focus-view.gif
deleted file mode 100644
index bf8439c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/focus-view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/more.png b/org.eclipse.mylyn.commons.ui/icons/eview16/more.png
deleted file mode 100644
index 1252a14..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/more.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close-active.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close-active.gif
deleted file mode 100644
index 8816521..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close-active.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close.gif
deleted file mode 100644
index 17b7573..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/notification-close.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-completed.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-completed.gif
deleted file mode 100644
index 755f70d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-completed.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-conflict.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-conflict.gif
deleted file mode 100644
index d13a356..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-conflict.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-context.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-context.gif
deleted file mode 100644
index c53adcf..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-context.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-due.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-due.gif
deleted file mode 100644
index a0bb744..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-has-due.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-multiple.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-multiple.gif
deleted file mode 100644
index db812df..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-multiple.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-new.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-new.gif
deleted file mode 100644
index fc5592c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming.gif
deleted file mode 100644
index e95e894..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-incoming.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing-new.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing-new.gif
deleted file mode 100644
index 5699bd3..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing.gif
deleted file mode 100644
index 9fe4081..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-outgoing.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-overdue.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-overdue.gif
deleted file mode 100644
index 15b07bb..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-overdue.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming-new.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming-new.gif
deleted file mode 100644
index a9dc04e..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming-new.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming.gif
deleted file mode 100644
index ab5483d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-incoming.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-outgoing.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-outgoing.gif
deleted file mode 100644
index 5f1c76a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/overlay-synch-outgoing.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/1.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/1.png
deleted file mode 100644
index ec9b075..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/1.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/2.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/2.png
deleted file mode 100644
index ffb9c84..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/2.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/3.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/3.png
deleted file mode 100644
index d78a258..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/3.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/4.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/4.png
deleted file mode 100644
index 2b0cd62..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/4.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/5.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/5.png
deleted file mode 100644
index f5b8cc1..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/5.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/6.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/6.png
deleted file mode 100644
index bca79f4..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/6.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/7.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/7.png
deleted file mode 100644
index 53125db..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/7.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/8.png b/org.eclipse.mylyn.commons.ui/icons/eview16/progress/8.png
deleted file mode 100644
index 02bb604..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/progress/8.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/status-conflict.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/status-conflict.gif
deleted file mode 100644
index 1e364ac..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/status-conflict.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/status-normal.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/status-normal.gif
deleted file mode 100644
index 45b7594..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/status-normal.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/eview16/status-server-context.gif b/org.eclipse.mylyn.commons.ui/icons/eview16/status-server-context.gif
deleted file mode 100644
index 7323d96..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/eview16/status-server-context.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/browser-small.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/browser-small.gif
deleted file mode 100644
index d4b0e39..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/browser-small.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/calendar-small.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/calendar-small.gif
deleted file mode 100644
index d9629a1..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/calendar-small.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/complete.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/complete.gif
deleted file mode 100644
index 1f4f0c4..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/complete.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/file-image.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/file-image.gif
deleted file mode 100644
index 07e2598..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/file-image.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-1.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/priority-1.gif
deleted file mode 100644
index f256fa5..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-1.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-2.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/priority-2.gif
deleted file mode 100644
index 4e4b55f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-2.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-3.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/priority-3.gif
deleted file mode 100644
index bc468f7..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-3.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-4.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/priority-4.gif
deleted file mode 100644
index 2bd543a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-4.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-5.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/priority-5.gif
deleted file mode 100644
index 30b6322..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/priority-5.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/obj16/question.gif b/org.eclipse.mylyn.commons.ui/icons/obj16/question.gif
deleted file mode 100644
index 7f6cded..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/obj16/question.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-blank.gif b/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-blank.gif
deleted file mode 100644
index 27e2998..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-blank.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-complete.gif b/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-complete.gif
deleted file mode 100644
index 755f70d..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-complete.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-local-task.gif b/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-local-task.gif
deleted file mode 100644
index fa95ffc..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-local-task.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-warning.gif b/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-warning.gif
deleted file mode 100644
index 4a63dd7..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/ovr16/overlay-warning.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/ovr16/solid-white.gif b/org.eclipse.mylyn.commons.ui/icons/ovr16/solid-white.gif
deleted file mode 100644
index 521055c..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/ovr16/solid-white.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-export.gif b/org.eclipse.mylyn.commons.ui/icons/wizban/banner-export.gif
deleted file mode 100644
index a22549f..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-export.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-import.gif b/org.eclipse.mylyn.commons.ui/icons/wizban/banner-import.gif
deleted file mode 100644
index 39bc01a..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-import.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-screenshot.png b/org.eclipse.mylyn.commons.ui/icons/wizban/banner-screenshot.png
deleted file mode 100644
index c23f8ab..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/wizban/banner-screenshot.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/icons/wizban/keylock.gif b/org.eclipse.mylyn.commons.ui/icons/wizban/keylock.gif
deleted file mode 100644
index 2ed58db..0000000
--- a/org.eclipse.mylyn.commons.ui/icons/wizban/keylock.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.commons.ui/plugin.properties b/org.eclipse.mylyn.commons.ui/plugin.properties
deleted file mode 100644
index 0a3513e..0000000
--- a/org.eclipse.mylyn.commons.ui/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.commons.ui
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Commons UI
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorCanvas.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorCanvas.java
deleted file mode 100644
index de996b0..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorCanvas.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Willian Mitsuda and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Willian Mitsuda - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A tiny control just for color display
- * 
- * @author Willian Mitsuda
- */
-public class ColorCanvas extends Canvas {
-
-	private final Color color;
-
-	public ColorCanvas(Composite parent, int style, RGB rgb) {
-		super(parent, style);
-		color = new Color(parent.getDisplay(), rgb);
-		addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent e) {
-				e.gc.setBackground(color);
-				e.gc.fillRectangle(getClientArea());
-			}
-		});
-		addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				color.dispose();
-			}
-		});
-	}
-
-	public RGB getRGB() {
-		return color.getRGB();
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorSelectionWindow.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorSelectionWindow.java
deleted file mode 100644
index 4bbd375..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/ColorSelectionWindow.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Willian Mitsuda and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Willian Mitsuda - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Popup window for color selection
- * 
- * @author Willian Mitsuda
- */
-public class ColorSelectionWindow extends Window {
-
-	private ColorCanvas[] colors;
-
-	public ColorSelectionWindow(Shell shell) {
-		super(shell);
-		setShellStyle(SWT.BORDER);
-	}
-
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.addShellListener(new ShellAdapter() {
-
-			@Override
-			public void shellDeactivated(ShellEvent e) {
-				close();
-			}
-
-		});
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Composite colorComposite = new Composite(parent, SWT.NONE);
-		colorComposite.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_BLACK));
-		colorComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
-		colorComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(8).spacing(1, 1).margins(1, 1).equalWidth(
-				true).create());
-
-		// EGA classic palette
-		colors = new ColorCanvas[16];
-		colors[0] = createColorCanvas(colorComposite, new RGB(0, 0, 0));
-		colors[1] = createColorCanvas(colorComposite, new RGB(0, 0, 170));
-		colors[2] = createColorCanvas(colorComposite, new RGB(0, 170, 0));
-		colors[3] = createColorCanvas(colorComposite, new RGB(0, 170, 170));
-		colors[4] = createColorCanvas(colorComposite, new RGB(170, 0, 0));
-		colors[5] = createColorCanvas(colorComposite, new RGB(170, 0, 170));
-		colors[6] = createColorCanvas(colorComposite, new RGB(170, 85, 0));
-		colors[7] = createColorCanvas(colorComposite, new RGB(170, 170, 170));
-		colors[8] = createColorCanvas(colorComposite, new RGB(85, 85, 85));
-		colors[9] = createColorCanvas(colorComposite, new RGB(85, 85, 255));
-		colors[10] = createColorCanvas(colorComposite, new RGB(85, 255, 85));
-		colors[11] = createColorCanvas(colorComposite, new RGB(85, 255, 255));
-		colors[12] = createColorCanvas(colorComposite, new RGB(255, 85, 85));
-		colors[13] = createColorCanvas(colorComposite, new RGB(255, 85, 255));
-		colors[14] = createColorCanvas(colorComposite, new RGB(255, 255, 85));
-		colors[15] = createColorCanvas(colorComposite, new RGB(255, 255, 255));
-
-		Button closeButton = new Button(parent, SWT.PUSH);
-		closeButton.setText(Messages.ColorSelectionWindow_Close);
-		closeButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
-		closeButton.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				close();
-			}
-
-		});
-		return parent;
-	}
-
-	private ColorCanvas createColorCanvas(Composite parent, RGB rgb) {
-		final ColorCanvas canvas = new ColorCanvas(parent, SWT.NONE, rgb);
-		canvas.setLayoutData(GridDataFactory.fillDefaults().hint(16, 16).create());
-		canvas.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseDown(MouseEvent e) {
-				selectedRGB = canvas.getRGB();
-				close();
-			}
-
-		});
-		return canvas;
-	}
-
-	private RGB selectedRGB;
-
-	public RGB getSelectedRGB() {
-		return selectedRGB;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CommonsUiPlugin.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CommonsUiPlugin.java
deleted file mode 100644
index 03975ed..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CommonsUiPlugin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- */
-public class CommonsUiPlugin extends AbstractUIPlugin {
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.commons.ui"; //$NON-NLS-1$
-
-	private static CommonsUiPlugin plugin;
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	public static CommonsUiPlugin getDefault() {
-		return plugin;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeContainerImageDescriptor.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeContainerImageDescriptor.java
deleted file mode 100644
index f06f317..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeContainerImageDescriptor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Mik Kersten
- */
-public class CompositeContainerImageDescriptor extends CompositeImageDescriptor {
-
-	private final ImageData base;
-
-	private ImageData overlay;
-
-	protected Point size;
-
-	public CompositeContainerImageDescriptor(ImageDescriptor icon, ImageDescriptor overlay, boolean wide) {
-		this.base = getImageData(icon);
-		if (overlay != null) {
-			this.overlay = getImageData(overlay);
-		}
-		int width = CompositeElementImageDescriptor.WIDTH_ICON;
-		if (wide) {
-			width += CompositeElementImageDescriptor.OFFSET_DECORATION;
-		}
-		this.size = new Point(width, base.height);
-	}
-
-	@Override
-	protected void drawCompositeImage(int width, int height) {
-		drawImage(base, 0, 0);
-		if (overlay != null) {
-			drawImage(overlay, base.width + 2, 0);
-		}
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData();
-		// see bug 51965: getImageData can return null
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-
-	@Override
-	protected Point getSize() {
-		return new Point(size.x, size.y);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeElementImageDescriptor.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeElementImageDescriptor.java
deleted file mode 100644
index c0948c5..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeElementImageDescriptor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Mik Kersten
- */
-public class CompositeElementImageDescriptor extends CompositeImageDescriptor {
-
-	private final ImageData base;
-
-	private ImageData kind;
-
-	protected Point size;
-
-	public static final int OFFSET_DECORATION = 6;
-
-	static final int WIDTH_ICON = 16;
-
-	private int offset = 0;
-
-	public CompositeElementImageDescriptor(ImageDescriptor icon, ImageDescriptor overlayKind, boolean wide) {
-		this.base = getImageData(icon);
-		if (overlayKind != null) {
-			this.kind = getImageData(overlayKind);
-		}
-		int width = WIDTH_ICON;
-		if (wide) {
-			width += OFFSET_DECORATION;
-			offset = OFFSET_DECORATION;
-		}
-		this.size = new Point(width, base.height);
-	}
-
-	@Override
-	protected void drawCompositeImage(int width, int height) {
-		drawImage(base, offset, 1);
-		if (kind != null) {
-			drawImage(kind, offset + 5, 6);
-		}
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData();
-		// see bug 51965: getImageData can return null
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-
-	@Override
-	protected Point getSize() {
-		return new Point(size.x, size.y);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeSyncImageDescriptor.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeSyncImageDescriptor.java
deleted file mode 100644
index 93c1716..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/CompositeSyncImageDescriptor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Mik Kersten
- */
-public class CompositeSyncImageDescriptor extends CompositeImageDescriptor {
-
-	private final ImageData base;
-
-	private final ImageData background;
-
-	private final boolean fillBackground;
-
-	protected Point size;
-
-	static int WIDTH;
-
-	public CompositeSyncImageDescriptor(ImageDescriptor icon, boolean fillBackground) {
-		this.base = getImageData(icon);
-		this.background = getImageData(CommonImages.OVERLAY_WHITE);
-		this.size = new Point(background.width, background.height);
-		this.fillBackground = fillBackground;
-	}
-
-	@Override
-	protected void drawCompositeImage(int width, int height) {
-		if (fillBackground) {
-			drawImage(background, 0, 0);
-		}
-		drawImage(base, 3, 2);
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData();
-		// see bug 51965: getImageData can return null
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-
-	@Override
-	protected Point getSize() {
-		return new Point(size.x, size.y);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/Messages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/Messages.java
deleted file mode 100644
index 414d002..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/Messages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.commons.ui.messages"; //$NON-NLS-1$
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String WorkbenchUtil_Browser_Initialization_Failed;
-
-	public static String WorkbenchUtil_Invalid_URL_Error;
-
-	public static String WorkbenchUtil_No_URL_Error;
-
-	public static String WorkbenchUtil_Open_Location_Title;
-
-	public static String ColorSelectionWindow_Close;
-
-	public static String SwtUtil_Fading;
-
-	public static String AbstractFilteredTree_Clear;
-
-	public static String AbstractFilteredTree_Find;
-
-	public static String AbstractNotificationPopup_Close_Notification_Job;
-
-	public static String AbstractNotificationPopup_Notification;
-
-	public static String DatePicker_Choose_Date;
-
-	public static String DateSelectionDialog_Clear;
-
-	public static String DateSelectionDialog_Date_Selection;
-
-	public static String ScreenshotCreationPage_After_capturing;
-
-	public static String ScreenshotCreationPage_Annotate;
-
-	public static String ScreenshotCreationPage_Capture_Desktop;
-
-	public static String ScreenshotCreationPage_Capture_Desktop_C;
-
-	public static String ScreenshotCreationPage_CAPTURE_SCRRENSHOT;
-
-	public static String ScreenshotCreationPage_Change_pen_color;
-
-	public static String ScreenshotCreationPage_Clear_all_annotations_made_on_screenshot_image;
-
-	public static String ScreenshotCreationPage_Clear_Annotations;
-
-	public static String ScreenshotCreationPage_Crop;
-
-	public static String ScreenshotCreationPage_Crop_R;
-
-	public static String ScreenshotCreationPage_DRAW_ANNOTATION_ON_SCREENSHOT_IMAGE;
-
-	public static String ScreenshotCreationPage_Fit_Image;
-
-	public static String ScreenshotCreationPage_Fit_Image_F;
-
-	public static String ScreenshotCreationPage_NOTE_THAT_YOU_CONTINUTE;
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/NotificationPopupColors.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/NotificationPopupColors.java
deleted file mode 100644
index b81f617..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/NotificationPopupColors.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Benjamin Pasero - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotificationPopup;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Helper Class to create the colors for the {@link AbstractNotificationPopup}.
- * <p>
- * Note: Copied from FormColors of UI Forms.
- * </p>
- * 
- * @author Benjamin Pasero (initial contribution from RSSOwl, see bug 177974)
- * @author Mik Kersten
- */
-public class NotificationPopupColors {
-
-	private final Display display;
-
-	private Color titleText;
-
-	private Color gradientBegin;
-
-	private Color gradientEnd;
-
-	private Color border;
-
-	private final ResourceManager resourceManager;
-
-	public NotificationPopupColors(Display display, ResourceManager resourceManager) {
-		this.display = display;
-		this.resourceManager = resourceManager;
-
-		createColors();
-	}
-
-	private void createColors() {
-		createBorderColor();
-		createGradientColors();
-		// previously used SWT.COLOR_TITLE_INACTIVE_FOREGROUND, but too light on Windows XP
-		titleText = getColor(resourceManager, getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-	}
-
-	public Color getGradientBegin() {
-		return gradientBegin;
-	}
-
-	public Color getGradientEnd() {
-		return gradientEnd;
-	}
-
-	public Color getBorder() {
-		return border;
-	}
-
-	public Color getTitleText() {
-		return titleText;
-	}
-
-	private void createBorderColor() {
-		RGB tbBorder = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
-		RGB bg = getImpliedBackground().getRGB();
-
-		// Group 1
-		// Rule: If at least 2 of the RGB values are equal to or between 180 and
-		// 255, then apply specified opacity for Group 1
-		// Examples: Vista, XP Silver, Wn High Con #2
-		// Keyline = TITLE_BACKGROUND @ 70% Opacity over LIST_BACKGROUND
-		if (testTwoPrimaryColors(tbBorder, 179, 256)) {
-			tbBorder = blend(tbBorder, bg, 70);
-		} else if (testTwoPrimaryColors(tbBorder, 120, 180)) {
-			tbBorder = blend(tbBorder, bg, 50);
-		} else {
-			tbBorder = blend(tbBorder, bg, 30);
-		}
-
-		border = getColor(resourceManager, tbBorder);
-	}
-
-	private void createGradientColors() {
-		RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
-		Color bgColor = getImpliedBackground();
-		RGB bg = bgColor.getRGB();
-		RGB bottom, top;
-
-		// Group 1
-		// Rule: If at least 2 of the RGB values are equal to or between 180 and
-		// 255, then apply specified opacity for Group 1
-		// Examples: Vista, XP Silver, Wn High Con #2
-		// Gradient Bottom = TITLE_BACKGROUND @ 30% Opacity over LIST_BACKGROUND
-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
-		if (testTwoPrimaryColors(titleBg, 179, 256)) {
-			bottom = blend(titleBg, bg, 30);
-			top = bg;
-		}
-
-		// Group 2
-		// Rule: If at least 2 of the RGB values are equal to or between 121 and
-		// 179, then apply specified opacity for Group 2
-		// Examples: XP Olive, OSX Graphite, Linux GTK, Wn High Con Black
-		// Gradient Bottom = TITLE_BACKGROUND @ 20% Opacity over LIST_BACKGROUND
-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
-		else if (testTwoPrimaryColors(titleBg, 120, 180)) {
-			bottom = blend(titleBg, bg, 20);
-			top = bg;
-		}
-
-		// Group 3
-		// Rule: If at least 2 of the RGB values are equal to or between 0 and
-		// 120, then apply specified opacity for Group 3
-		// Examples: XP Default, Wn Classic Standard, Wn Marine, Wn Plum, OSX
-		// Aqua, Wn High Con White, Wn High Con #1
-		// Gradient Bottom = TITLE_BACKGROUND @ 10% Opacity over LIST_BACKGROUND
-		// Gradient Top = TITLE BACKGROUND @ 0% Opacity over LIST_BACKGROUND
-		else {
-			bottom = blend(titleBg, bg, 10);
-			top = bg;
-		}
-
-		gradientBegin = getColor(resourceManager, top);
-		gradientEnd = getColor(resourceManager, bottom);
-	}
-
-	private RGB blend(RGB c1, RGB c2, int ratio) {
-		int r = blend(c1.red, c2.red, ratio);
-		int g = blend(c1.green, c2.green, ratio);
-		int b = blend(c1.blue, c2.blue, ratio);
-		return new RGB(r, g, b);
-	}
-
-	private int blend(int v1, int v2, int ratio) {
-		int b = (ratio * v1 + (100 - ratio) * v2) / 100;
-		return Math.min(255, b);
-	}
-
-	private boolean testTwoPrimaryColors(RGB rgb, int from, int to) {
-		int total = 0;
-		if (testPrimaryColor(rgb.red, from, to)) {
-			total++;
-		}
-		if (testPrimaryColor(rgb.green, from, to)) {
-			total++;
-		}
-		if (testPrimaryColor(rgb.blue, from, to)) {
-			total++;
-		}
-		return total >= 2;
-	}
-
-	private boolean testPrimaryColor(int value, int from, int to) {
-		return value > from && value < to;
-	}
-
-	private RGB getSystemColor(int code) {
-		return getDisplay().getSystemColor(code).getRGB();
-	}
-
-	private Color getImpliedBackground() {
-		return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-	}
-
-	private Display getDisplay() {
-		return display;
-	}
-
-	private Color getColor(ResourceManager manager, RGB rgb) {
-		try {
-			return manager.createColor(rgb);
-		} catch (DeviceResourceException e) {
-			return manager.getDevice().getSystemColor(SWT.COLOR_BLACK);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SwtUtil.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SwtUtil.java
deleted file mode 100644
index 280eb26..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/SwtUtil.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-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.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class SwtUtil {
-
-	public static final long FADE_RESCHEDULE_DELAY = 80;
-
-	public static final int FADE_IN_INCREMENT = 15;
-
-	public static final int FADE_OUT_INCREMENT = -20;
-
-	public static void collectItemData(TreeItem[] items, Set<Object> allVisible) {
-		for (TreeItem item : items) {
-			allVisible.add(item.getData());
-			collectItemData(item.getItems(), allVisible);
-		}
-	}
-
-	// TODO e3.4 get rid of reflection on 3.4 branch
-	public static boolean setAlpha(Shell shell, int value) {
-		Method method = null;
-		try {
-			method = shell.getClass().getMethod("setAlpha", new Class[] { int.class }); //$NON-NLS-1$
-			method.setAccessible(true);
-			//shell.setAlpha(value);
-			method.invoke(shell, new Object[] { value });
-			return true;
-		} catch (Exception e) {
-			// ignore, not supported on Eclipse 3.3
-			return false;
-		}
-	}
-
-	// TODO e3.4 get rid of reflection on 3.4 branch
-	public static int getAlpha(Shell shell) {
-		Method method = null;
-		try {
-			method = shell.getClass().getMethod("getAlpha"); //$NON-NLS-1$
-			method.setAccessible(true);
-			return (Integer) method.invoke(shell);
-		} catch (Exception e) {
-			return 0xFF;
-		}
-	}
-
-	public static FadeJob fastFadeIn(Shell shell, IFadeListener listener) {
-		return new FadeJob(shell, 2 * FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
-	}
-
-	public static FadeJob fadeIn(Shell shell, IFadeListener listener) {
-		return new FadeJob(shell, FADE_IN_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
-	}
-
-	public static FadeJob fadeOut(Shell shell, IFadeListener listener) {
-		return new FadeJob(shell, FADE_OUT_INCREMENT, FADE_RESCHEDULE_DELAY, listener);
-	}
-
-	// TODO e3.4 get rid of reflection on 3.4 branch
-	public static void fade(Shell shell, boolean fadeIn, int increment, int speed) {
-		try {
-			Method method = shell.getClass().getMethod("setAlpha", new Class[] { int.class }); //$NON-NLS-1$
-			method.setAccessible(true);
-
-			if (fadeIn) {
-				for (int i = 0; i <= 255; i += increment) {
-					// shell.setAlpha(i);
-					method.invoke(shell, new Object[] { i });
-					try {
-						Thread.sleep(speed);
-					} catch (InterruptedException e) {
-						// ignore
-					}
-				}
-				// shell.setAlpha(255);
-				method.invoke(shell, new Object[] { 255 });
-			} else {
-				for (int i = 244; i >= 0; i -= increment) {
-					// shell.setAlpha(i);
-					method.invoke(shell, new Object[] { i });
-					try {
-						Thread.sleep(speed);
-					} catch (InterruptedException e) {
-						// ignore
-					}
-				}
-				// shell.setAlpha(0);
-				method.invoke(shell, new Object[] { 0 });
-			}
-		} catch (Exception e) {
-			// ignore, not supported on Eclipse 3.3
-		}
-	}
-
-	public static class FadeJob extends Job {
-
-		private final Shell shell;
-
-		private final int increment;
-
-		private volatile boolean stopped;
-
-		private volatile int currentAlpha;
-
-		private final long delay;
-
-		private final IFadeListener fadeListener;
-
-		public FadeJob(Shell shell, int increment, long delay, IFadeListener fadeListener) {
-			super(Messages.SwtUtil_Fading);
-			if (increment < -255 || increment == 0 || increment > 255) {
-				throw new IllegalArgumentException("-255 <= increment <= 255 && increment != 0"); //$NON-NLS-1$
-			}
-			if (delay < 1) {
-				throw new IllegalArgumentException("delay must be > 0"); //$NON-NLS-1$
-			}
-			this.currentAlpha = getAlpha(shell);
-			this.shell = shell;
-			this.increment = increment;
-			this.delay = delay;
-			this.fadeListener = fadeListener;
-
-			setSystem(true);
-			schedule(delay);
-		}
-
-		@Override
-		protected void canceling() {
-			stopped = true;
-		}
-
-		private void reschedule() {
-			if (stopped) {
-				return;
-			}
-			schedule(delay);
-		}
-
-		public void cancelAndWait(final boolean setAlpha) {
-			if (stopped) {
-				return;
-			}
-			cancel();
-			Display.getDefault().syncExec(new Runnable() {
-				public void run() {
-					if (setAlpha) {
-						SwtUtil.setAlpha(shell, getLastAlpha());
-					}
-				}
-			});
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			if (stopped) {
-				return Status.OK_STATUS;
-			}
-
-			currentAlpha += increment;
-			if (currentAlpha <= 0) {
-				currentAlpha = 0;
-			} else if (currentAlpha >= 255) {
-				currentAlpha = 255;
-			}
-
-			Display.getDefault().syncExec(new Runnable() {
-				public void run() {
-					if (stopped) {
-						return;
-					}
-
-					if (shell.isDisposed()) {
-						stopped = true;
-						return;
-					}
-
-					if (!SwtUtil.setAlpha(shell, currentAlpha)) {
-						// just in case it failed for some other reason than lack of support on the platform
-						currentAlpha = getLastAlpha();
-						SwtUtil.setAlpha(shell, currentAlpha);
-						stopped = true;
-					}
-
-					if (fadeListener != null) {
-						fadeListener.faded(shell, currentAlpha);
-					}
-				}
-			});
-
-			if (currentAlpha == 0 || currentAlpha == 255) {
-				stopped = true;
-			}
-
-			reschedule();
-			return Status.OK_STATUS;
-		}
-
-		private int getLastAlpha() {
-			return (increment < 0) ? 0 : 255;
-		}
-
-	}
-
-	public static interface IFadeListener {
-
-		public void faded(Shell shell, int alpha);
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskListImageDescriptor.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskListImageDescriptor.java
deleted file mode 100644
index cd2b5e2..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/TaskListImageDescriptor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.commons.ui;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Mik Kersten
- */
-public class TaskListImageDescriptor extends CompositeImageDescriptor {
-
-	private final ImageData base;
-
-	private ImageData overlay;
-
-	private boolean top;
-
-	private boolean left;
-
-	protected Point size;
-
-	public TaskListImageDescriptor(ImageDescriptor baseDesc, ImageDescriptor overlayDesc, boolean top, boolean left) {
-		this.base = getImageData(baseDesc);
-		this.top = top;
-		this.left = left;
-		if (overlayDesc != null) {
-			this.overlay = getImageData(overlayDesc);
-		}
-		Point size = new Point(base.width, base.height);
-		setImageSize(size);
-	}
-
-	public TaskListImageDescriptor(ImageDescriptor baseDesc, Point size) {
-		this.base = getImageData(baseDesc);
-		setImageSize(size);
-	}
-
-	@Override
-	protected void drawCompositeImage(int width, int height) {
-		drawImage(base, 0, 0);
-		int x = 0;
-		int y = 0;
-		if (!left) {
-			x = 8;// base.width - overlay.width;
-		}
-		if (!top) {
-			y = 8;// base.height - overlay.height;
-		}
-		if (overlay != null) {
-			drawImage(overlay, x, y);
-		}
-	}
-
-	private ImageData getImageData(ImageDescriptor descriptor) {
-		ImageData data = descriptor.getImageData();
-		// see bug 51965: getImageData can return null
-		if (data == null) {
-			data = DEFAULT_IMAGE_DATA;
-		}
-		return data;
-	}
-
-	public void setImageSize(Point size) {
-		this.size = size;
-	}
-
-	@Override
-	protected Point getSize() {
-		return new Point(size.x, size.y);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/messages.properties b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/messages.properties
deleted file mode 100644
index a053174..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/commons/ui/messages.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-WorkbenchUtil_Browser_Initialization_Failed=Browser initialization failed.
-WorkbenchUtil_Invalid_URL_Error=Invalid URL specified: ''{0}''.
-WorkbenchUtil_No_URL_Error=No URL specified when opening browser.
-WorkbenchUtil_Open_Location_Title=Open Location
-
-ColorSelectionWindow_Close=&Close
-
-SwtUtil_Fading=Fading
-
-AbstractFilteredTree_Clear=Clear
-AbstractFilteredTree_Find=\ Find:
-
-AbstractNotificationPopup_Close_Notification_Job=Close Notification Job
-AbstractNotificationPopup_Notification=Notification
-
-DatePicker_Choose_Date=Choose Date
-
-DateSelectionDialog_Clear=Clear
-DateSelectionDialog_Date_Selection=Date Selection
-
-ScreenshotCreationPage_After_capturing=After capturing, you can crop the image and make drawings on it. This window will not be captured. 
-ScreenshotCreationPage_Annotate=&Annotate
-ScreenshotCreationPage_Capture_Desktop=Capture Desktop
-ScreenshotCreationPage_Capture_Desktop_C=&Capture Desktop
-ScreenshotCreationPage_CAPTURE_SCRRENSHOT=Capture Screenshot
-ScreenshotCreationPage_Change_pen_color=Change pen color
-ScreenshotCreationPage_Clear_all_annotations_made_on_screenshot_image=Clear all annotations made on screenshot image
-ScreenshotCreationPage_Clear_Annotations=C&lear Annotations
-ScreenshotCreationPage_Crop=Crop
-ScreenshotCreationPage_Crop_R=C&rop
-ScreenshotCreationPage_DRAW_ANNOTATION_ON_SCREENSHOT_IMAGE=Draw annotations on screenshot image
-ScreenshotCreationPage_Fit_Image=Fit Image
-ScreenshotCreationPage_Fit_Image_F=&Fit Image
-ScreenshotCreationPage_NOTE_THAT_YOU_CONTINUTE=Note that you can continue to interact with the workbench in order to set up the screenshot.
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractFilteredTree.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractFilteredTree.java
deleted file mode 100644
index af281d1..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractFilteredTree.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.Field;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-
-/**
- * @author Mik Kersten
- */
-public abstract class AbstractFilteredTree extends FilteredTree {
-
-	private static final int filterWidth = 69;
-
-	public static final String LABEL_FIND = Messages.AbstractFilteredTree_Find;
-
-	private Job refreshJob;
-
-	private AdaptiveRefreshPolicy refreshPolicy;
-
-	private Composite progressComposite;
-
-	private Composite searchComposite;
-
-	private boolean showProgress = false;
-
-	/**
-	 * XXX: using reflection to gain access
-	 * 
-	 * @param parent
-	 * @param treeStyle
-	 * @param filter
-	 */
-	public AbstractFilteredTree(Composite parent, int treeStyle, PatternFilter filter) {
-		super(parent, treeStyle, filter);
-		try {
-			// TODO e3.4 override doCreateRefreshJob() instead
-			Field refreshField = FilteredTree.class.getDeclaredField("refreshJob"); //$NON-NLS-1$
-			refreshField.setAccessible(true);
-			refreshJob = (Job) refreshField.get(this);
-			refreshPolicy = new AdaptiveRefreshPolicy(refreshJob);
-		} catch (Exception e) {
-			CommonsUiPlugin.getDefault().getLog().log(
-					new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Could not get refresh job", e)); //$NON-NLS-1$
-		}
-		setInitialText(""); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createControl(Composite parent, int treeStyle) {
-		super.createControl(parent, treeStyle);
-
-		// Override superclass layout settings...
-		GridLayout layout = (GridLayout) getLayout();
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-	}
-
-	@Override
-	protected Control createTreeControl(Composite parent, int style) {
-		progressComposite = createProgressComposite(parent);
-//		progressComposite.setVisible(false);
-//		((GridData) progressComposite.getLayoutData()).exclude = true;
-
-		searchComposite = createSearchComposite(parent);
-		if (searchComposite != null) {
-			searchComposite.setVisible(false);
-			((GridData) searchComposite.getLayoutData()).exclude = true;
-		}
-
-		return super.createTreeControl(parent, style);
-	}
-
-	@Override
-	protected Composite createFilterControls(Composite parent) {
-		GridLayout gridLayout = new GridLayout(4, false);
-		gridLayout.marginWidth = 0;
-		gridLayout.marginHeight = 2;
-		gridLayout.verticalSpacing = 0;
-		parent.setLayout(gridLayout);
-
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(LABEL_FIND);
-
-		// from super
-		createFilterText(parent);
-		createClearText(parent);
-		if (filterToolBar != null) {
-			filterToolBar.update(false);
-			// initially there is no text to clear
-			filterToolBar.getControl().setVisible(false);
-		}
-
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		gd.minimumWidth = filterWidth;
-		filterText.setLayoutData(gd);
-		filterText.addKeyListener(new KeyAdapter() {
-
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.character == SWT.ESC) {
-					setFilterText(""); //$NON-NLS-1$
-				}
-			}
-		});
-
-		Composite superComposite = new Composite(parent, SWT.NONE);
-		GridLayout superLayout = new GridLayout(4, false);
-		GridData superLayoutData = new GridData(SWT.LEFT, SWT.CENTER, true, false);
-		superComposite.setLayout(superLayout);
-		superComposite.setLayoutData(superLayoutData);
-
-		Composite workingSetComposite = createActiveWorkingSetComposite(superComposite);
-		workingSetComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-
-		Composite activeTaskComposite = createActiveTaskComposite(superComposite);
-		activeTaskComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
-		parent.layout();
-		return parent;
-	}
-
-	private void createClearText(Composite parent) {
-		// only create the button if the text widget doesn't support one
-		// natively
-		if ((filterText.getStyle() & SWT.CANCEL) == 0) {
-			filterToolBar = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
-			filterToolBar.createControl(parent);
-
-			IAction clearTextAction = new Action("", IAction.AS_PUSH_BUTTON) {//$NON-NLS-1$
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.jface.action.Action#run()
-				 */
-				@Override
-				public void run() {
-					clearText();
-				}
-			};
-
-			clearTextAction.setToolTipText(Messages.AbstractFilteredTree_Clear);
-			clearTextAction.setImageDescriptor(CommonImages.FIND_CLEAR);
-			clearTextAction.setDisabledImageDescriptor(CommonImages.FIND_CLEAR_DISABLED);
-			filterToolBar.add(clearTextAction);
-		}
-	}
-
-	protected abstract Composite createProgressComposite(Composite container);
-
-	protected abstract Composite createActiveWorkingSetComposite(Composite container);
-
-	protected abstract Composite createActiveTaskComposite(Composite container);
-
-	protected Composite createSearchComposite(Composite container) {
-		return null;
-	}
-
-	@Override
-	protected void textChanged() {
-		// this call allows the filtered tree to preserve the selection when the clear button is used.
-		// It is necessary to correctly set the private narrowingDown flag in the super class. 
-		// Note that the scheduling of the refresh job that is done in the super class will be overridden 
-		// by the call to refreshPolicy.textChanged().
-		super.textChanged();
-
-		if (refreshPolicy != null) {
-			refreshPolicy.textChanged(getFilterString());
-		}
-		// bug 165353 work-around for premature return at FilteredTree.java:374
-		updateToolbar(true);
-	}
-
-	@Deprecated
-	protected Job getRefreshJob() {
-		return refreshJob;
-	}
-
-	public AdaptiveRefreshPolicy getRefreshPolicy() {
-		return refreshPolicy;
-	}
-
-	public boolean isShowProgress() {
-		return showProgress;
-	}
-
-	public void setShowProgress(boolean showProgress) {
-		this.showProgress = showProgress;
-		progressComposite.setVisible(showProgress);
-		((GridData) progressComposite.getLayoutData()).exclude = !showProgress;
-		getParent().getParent().layout(true, true);
-	}
-
-	public void setShowSearch(boolean showSearch) {
-		if (searchComposite != null) {
-			searchComposite.setVisible(showSearch);
-			((GridData) searchComposite.getLayoutData()).exclude = !showSearch;
-			getParent().getParent().layout(true, true);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotification.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotification.java
deleted file mode 100644
index acb6e6e..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotification.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.Date;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Rob Elves
- * @author Mik Kersten
- */
-public abstract class AbstractNotification implements Comparable<AbstractNotification>, IAdaptable {
-
-	public abstract void open();
-
-	public abstract String getDescription();
-
-	public abstract String getLabel();
-
-	public abstract Image getNotificationImage();
-
-	public abstract Image getNotificationKindImage();
-
-	public abstract Date getDate();
-
-	public abstract void setDate(Date date);
-
-	public Object getToken() {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotificationPopup.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotificationPopup.java
deleted file mode 100644
index 80a4df0..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AbstractNotificationPopup.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Benjamin Pasero - intial API and implementation
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.core.runtime.IProduct;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.mylyn.internal.commons.ui.NotificationPopupColors;
-import org.eclipse.mylyn.internal.commons.ui.SwtUtil;
-import org.eclipse.mylyn.internal.commons.ui.SwtUtil.FadeJob;
-import org.eclipse.mylyn.internal.commons.ui.SwtUtil.IFadeListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Region;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Monitor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Benjamin Pasero
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public abstract class AbstractNotificationPopup extends Window {
-
-	private static final int TITLE_HEIGHT = 24;
-
-	private static final String LABEL_NOTIFICATION = Messages.AbstractNotificationPopup_Notification;
-
-	private static final String LABEL_JOB_CLOSE = Messages.AbstractNotificationPopup_Close_Notification_Job;
-
-	private static final int MAX_WIDTH = 400;
-
-	private static final int MIN_HEIGHT = 100;
-
-	private static final long DEFAULT_DELAY_CLOSE = 8 * 1000;
-
-	private static final int PADDING_EDGE = 5;
-
-	private long delayClose = DEFAULT_DELAY_CLOSE;
-
-	protected LocalResourceManager resources;
-
-	private NotificationPopupColors color;
-
-	private final Display display;
-
-	private Shell shell;
-
-	private Region lastUsedRegion;
-
-	private Image lastUsedBgImage;
-
-	private final Job closeJob = new Job(LABEL_JOB_CLOSE) {
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			if (!display.isDisposed()) {
-				display.asyncExec(new Runnable() {
-					public void run() {
-						Shell shell = AbstractNotificationPopup.this.getShell();
-						if (shell == null || shell.isDisposed()) {
-							return;
-						}
-
-						if (isMouseOver(shell)) {
-							scheduleAutoClose();
-							return;
-						}
-
-						AbstractNotificationPopup.this.closeFade();
-					}
-
-				});
-			}
-			if (monitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-
-			return Status.OK_STATUS;
-		}
-	};
-
-	private final boolean respectDisplayBounds = true;
-
-	private final boolean respectMonitorBounds = true;
-
-	private FadeJob fadeJob;
-
-	private boolean supportsFading;
-
-	private boolean fadingEnabled;
-
-	public AbstractNotificationPopup(Display display) {
-		this(display, SWT.NO_TRIM | SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
-	}
-
-	public AbstractNotificationPopup(Display display, int style) {
-		super(new Shell(display));
-		setShellStyle(style);
-
-		this.display = display;
-		resources = new LocalResourceManager(JFaceResources.getResources());
-		initResources();
-
-		closeJob.setSystem(true);
-	}
-
-	public boolean isFadingEnabled() {
-		return fadingEnabled;
-	}
-
-	public void setFadingEnabled(boolean fadingEnabled) {
-		this.fadingEnabled = fadingEnabled;
-	}
-
-	/**
-	 * Override to return a customized name. Default is to return the name of the product, specified by the -name (e.g.
-	 * "Eclipse SDK") command line parameter that's associated with the product ID (e.g. "org.eclipse.sdk.ide"). Strips
-	 * the trailing "SDK" for any name, since this part of the label is considered visual noise.
-	 * 
-	 * @return the name to be used in the title of the popup.
-	 */
-	protected String getPopupShellTitle() {
-		IProduct product = Platform.getProduct();
-		if (product != null) {
-			String productName = product.getName();
-			String LABEL_SDK = "SDK"; //$NON-NLS-1$
-			if (productName.endsWith(LABEL_SDK)) {
-				productName = productName.substring(0, productName.length() - LABEL_SDK.length());
-			}
-			return productName + " " + LABEL_NOTIFICATION; //$NON-NLS-1$
-		} else {
-			return LABEL_NOTIFICATION;
-		}
-	}
-
-	protected Image getPopupShellImage(int maximumHeight) {
-		// always use the launching workbench window
-		IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-		if (windows != null && windows.length > 0) {
-			IWorkbenchWindow workbenchWindow = windows[0];
-			if (workbenchWindow != null && !workbenchWindow.getShell().isDisposed()) {
-				Image image = getShell().getImage();
-				int diff = Integer.MAX_VALUE;
-				if (image != null && image.getBounds().height <= maximumHeight) {
-					diff = maximumHeight - image.getBounds().height;
-				} else {
-					image = null;
-				}
-
-				Image[] images = getShell().getImages();
-				if (images != null && images.length > 0) {
-					// find the icon that is closest in size, but not larger than maximumHeight 
-					for (Image image2 : images) {
-						int newDiff = maximumHeight - image2.getBounds().height;
-						if (newDiff >= 0 && newDiff <= diff) {
-							diff = newDiff;
-							image = image2;
-						}
-					}
-				}
-
-				return image;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Override to populate with notifications.
-	 * 
-	 * @param parent
-	 */
-	protected void createContentArea(Composite parent) {
-		// empty by default
-	}
-
-	/**
-	 * Override to customize the title bar
-	 */
-	protected void createTitleArea(Composite parent) {
-		((GridData) parent.getLayoutData()).heightHint = TITLE_HEIGHT;
-
-		Label titleImageLabel = new Label(parent, SWT.NONE);
-		titleImageLabel.setImage(getPopupShellImage(TITLE_HEIGHT));
-
-		Label titleTextLabel = new Label(parent, SWT.NONE);
-		titleTextLabel.setText(getPopupShellTitle());
-		titleTextLabel.setFont(CommonFonts.BOLD);
-		titleTextLabel.setForeground(color.getTitleText());
-		titleTextLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-		titleTextLabel.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
-
-		final Label button = new Label(parent, SWT.NONE);
-		button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
-		button.addMouseTrackListener(new MouseTrackAdapter() {
-			@Override
-			public void mouseEnter(MouseEvent e) {
-				button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE_HOVER));
-			}
-
-			@Override
-			public void mouseExit(MouseEvent e) {
-				button.setImage(CommonImages.getImage(CommonImages.NOTIFICATION_CLOSE));
-			}
-		});
-		button.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				close();
-				setReturnCode(CANCEL);
-			}
-
-		});
-	}
-
-	private void initResources() {
-		color = new NotificationPopupColors(display, resources);
-	}
-
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-
-		shell = newShell;
-		newShell.setBackground(color.getBorder());
-	}
-
-	@Override
-	public void create() {
-		super.create();
-		addRegion(shell);
-	}
-
-	private void addRegion(Shell shell) {
-		Region region = new Region();
-		Point s = shell.getSize();
-
-		/* Add entire Shell */
-		region.add(0, 0, s.x, s.y);
-
-		/* Subtract Top-Left Corner */
-		region.subtract(0, 0, 5, 1);
-		region.subtract(0, 1, 3, 1);
-		region.subtract(0, 2, 2, 1);
-		region.subtract(0, 3, 1, 1);
-		region.subtract(0, 4, 1, 1);
-
-		/* Subtract Top-Right Corner */
-		region.subtract(s.x - 5, 0, 5, 1);
-		region.subtract(s.x - 3, 1, 3, 1);
-		region.subtract(s.x - 2, 2, 2, 1);
-		region.subtract(s.x - 1, 3, 1, 1);
-		region.subtract(s.x - 1, 4, 1, 1);
-
-		/* Subtract Bottom-Left Corner */
-		region.subtract(0, s.y, 5, 1);
-		region.subtract(0, s.y - 1, 3, 1);
-		region.subtract(0, s.y - 2, 2, 1);
-		region.subtract(0, s.y - 3, 1, 1);
-		region.subtract(0, s.y - 4, 1, 1);
-
-		/* Subtract Bottom-Right Corner */
-		region.subtract(s.x - 5, s.y - 0, 5, 1);
-		region.subtract(s.x - 3, s.y - 1, 3, 1);
-		region.subtract(s.x - 2, s.y - 2, 2, 1);
-		region.subtract(s.x - 1, s.y - 3, 1, 1);
-		region.subtract(s.x - 1, s.y - 4, 1, 1);
-
-		/* Dispose old first */
-		if (shell.getRegion() != null) {
-			shell.getRegion().dispose();
-		}
-
-		/* Apply Region */
-		shell.setRegion(region);
-
-		/* Remember to dispose later */
-		lastUsedRegion = region;
-	}
-
-	private boolean isMouseOver(Shell shell) {
-		if (display.isDisposed()) {
-			return false;
-		}
-		return shell.getBounds().contains(display.getCursorLocation());
-	}
-
-	@Override
-	public int open() {
-		if (shell == null || shell.isDisposed()) {
-			shell = null;
-			create();
-		}
-
-		constrainShellSize();
-		shell.setLocation(fixupDisplayBounds(shell.getSize(), shell.getLocation()));
-
-		if (isFadingEnabled()) {
-			supportsFading = SwtUtil.setAlpha(shell, 0);
-		} else {
-			supportsFading = false;
-		}
-		shell.setVisible(true);
-		if (supportsFading) {
-			fadeJob = SwtUtil.fadeIn(shell, new IFadeListener() {
-				public void faded(Shell shell, int alpha) {
-					if (shell.isDisposed()) {
-						return;
-					}
-
-					if (alpha == 255) {
-						scheduleAutoClose();
-					}
-				}
-			});
-		} else {
-			scheduleAutoClose();
-		}
-
-		return Window.OK;
-	}
-
-	protected void scheduleAutoClose() {
-		if (delayClose > 0) {
-			closeJob.schedule(delayClose);
-		}
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		((GridLayout) parent.getLayout()).marginWidth = 1;
-		((GridLayout) parent.getLayout()).marginHeight = 1;
-
-		/* Outer Composite holding the controls */
-		final Composite outerCircle = new Composite(parent, SWT.NO_FOCUS);
-		outerCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		outerCircle.setBackgroundMode(SWT.INHERIT_FORCE);
-
-		outerCircle.addControlListener(new ControlAdapter() {
-
-			@Override
-			public void controlResized(ControlEvent e) {
-				Rectangle clArea = outerCircle.getClientArea();
-				lastUsedBgImage = new Image(outerCircle.getDisplay(), clArea.width, clArea.height);
-				GC gc = new GC(lastUsedBgImage);
-
-				/* Gradient */
-				drawGradient(gc, clArea);
-
-				/* Fix Region Shape */
-				fixRegion(gc, clArea);
-
-				gc.dispose();
-
-				Image oldBGImage = outerCircle.getBackgroundImage();
-				outerCircle.setBackgroundImage(lastUsedBgImage);
-
-				if (oldBGImage != null) {
-					oldBGImage.dispose();
-				}
-			}
-
-			private void drawGradient(GC gc, Rectangle clArea) {
-				gc.setForeground(color.getGradientBegin());
-				gc.setBackground(color.getGradientEnd());
-				gc.fillGradientRectangle(clArea.x, clArea.y, clArea.width, clArea.height, true);
-			}
-
-			private void fixRegion(GC gc, Rectangle clArea) {
-				gc.setForeground(color.getBorder());
-
-				/* Fill Top Left */
-				gc.drawPoint(2, 0);
-				gc.drawPoint(3, 0);
-				gc.drawPoint(1, 1);
-				gc.drawPoint(0, 2);
-				gc.drawPoint(0, 3);
-
-				/* Fill Top Right */
-				gc.drawPoint(clArea.width - 4, 0);
-				gc.drawPoint(clArea.width - 3, 0);
-				gc.drawPoint(clArea.width - 2, 1);
-				gc.drawPoint(clArea.width - 1, 2);
-				gc.drawPoint(clArea.width - 1, 3);
-
-				/* Fill Bottom Left */
-				gc.drawPoint(2, clArea.height - 0);
-				gc.drawPoint(3, clArea.height - 0);
-				gc.drawPoint(1, clArea.height - 1);
-				gc.drawPoint(0, clArea.height - 2);
-				gc.drawPoint(0, clArea.height - 3);
-
-				/* Fill Bottom Right */
-				gc.drawPoint(clArea.width - 4, clArea.height - 0);
-				gc.drawPoint(clArea.width - 3, clArea.height - 0);
-				gc.drawPoint(clArea.width - 2, clArea.height - 1);
-				gc.drawPoint(clArea.width - 1, clArea.height - 2);
-				gc.drawPoint(clArea.width - 1, clArea.height - 3);
-			}
-		});
-
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.verticalSpacing = 0;
-
-		outerCircle.setLayout(layout);
-
-		/* Title area containing label and close button */
-		final Composite titleCircle = new Composite(outerCircle, SWT.NO_FOCUS);
-		titleCircle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		titleCircle.setBackgroundMode(SWT.INHERIT_FORCE);
-
-		layout = new GridLayout(4, false);
-		layout.marginWidth = 3;
-		layout.marginHeight = 0;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 3;
-
-		titleCircle.setLayout(layout);
-
-		/* Create Title Area */
-		createTitleArea(titleCircle);
-
-		/* Outer composite to hold content controlls */
-		Composite outerContentCircle = new Composite(outerCircle, SWT.NONE);
-		outerContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);
-
-		layout = new GridLayout(1, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-
-		outerContentCircle.setLayout(layout);
-		outerContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		outerContentCircle.setBackground(outerCircle.getBackground());
-
-		/* Middle composite to show a 1px black line around the content controls */
-		Composite middleContentCircle = new Composite(outerContentCircle, SWT.NO_FOCUS);
-		middleContentCircle.setBackgroundMode(SWT.INHERIT_FORCE);
-
-		layout = new GridLayout(1, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.marginTop = 1;
-
-		middleContentCircle.setLayout(layout);
-		middleContentCircle.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		middleContentCircle.setBackground(color.getBorder());
-
-		/* Inner composite containing the content controls */
-		Composite innerContent = new Composite(middleContentCircle, SWT.NO_FOCUS);
-		innerContent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		innerContent.setBackgroundMode(SWT.INHERIT_FORCE);
-
-		layout = new GridLayout(1, false);
-		layout.marginWidth = 0;
-		layout.marginHeight = 5;
-		layout.marginLeft = 5;
-		layout.marginRight = 5;
-		innerContent.setLayout(layout);
-
-		innerContent.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-
-		/* Content Area */
-		createContentArea(innerContent);
-
-		setNullBackground(outerCircle);
-
-		return outerCircle;
-	}
-
-	private void setNullBackground(final Composite outerCircle) {
-		for (Control c : outerCircle.getChildren()) {
-			c.setBackground(null);
-			if (c instanceof Composite) {
-				setNullBackground((Composite) c);
-			}
-		}
-	}
-
-	@Override
-	protected void initializeBounds() {
-		Rectangle clArea = getPrimaryClientArea();
-		Point initialSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		int height = Math.max(initialSize.y, MIN_HEIGHT);
-		int width = Math.min(initialSize.x, MAX_WIDTH);
-
-		Point size = new Point(width, height);
-		shell.setLocation(clArea.width + clArea.x - size.x - PADDING_EDGE, clArea.height + clArea.y - size.y
-				- PADDING_EDGE);
-		shell.setSize(size);
-	}
-
-	private Rectangle getPrimaryClientArea() {
-		Monitor primaryMonitor = shell.getDisplay().getPrimaryMonitor();
-		return (primaryMonitor != null) ? primaryMonitor.getClientArea() : shell.getDisplay().getClientArea();
-	}
-
-	public void closeFade() {
-		if (fadeJob != null) {
-			fadeJob.cancelAndWait(false);
-		}
-		if (supportsFading) {
-			fadeJob = SwtUtil.fadeOut(getShell(), new IFadeListener() {
-				public void faded(Shell shell, int alpha) {
-					if (!shell.isDisposed()) {
-						if (alpha == 0) {
-							shell.close();
-						} else if (isMouseOver(shell)) {
-							if (fadeJob != null) {
-								fadeJob.cancelAndWait(false);
-							}
-							fadeJob = SwtUtil.fastFadeIn(shell, new IFadeListener() {
-								public void faded(Shell shell, int alpha) {
-									if (shell.isDisposed()) {
-										return;
-									}
-
-									if (alpha == 255) {
-										scheduleAutoClose();
-									}
-								}
-							});
-						}
-					}
-				}
-			});
-		} else {
-			shell.close();
-		}
-	}
-
-	@Override
-	public boolean close() {
-		resources.dispose();
-		if (lastUsedRegion != null) {
-			lastUsedRegion.dispose();
-		}
-		if (lastUsedBgImage != null && !lastUsedBgImage.isDisposed()) {
-			lastUsedBgImage.dispose();
-		}
-		return super.close();
-	}
-
-	public long getDelayClose() {
-		return delayClose;
-	}
-
-	public void setDelayClose(long delayClose) {
-		this.delayClose = delayClose;
-	}
-
-	private Point fixupDisplayBounds(Point tipSize, Point location) {
-		if (respectDisplayBounds) {
-			Rectangle bounds;
-			Point rightBounds = new Point(tipSize.x + location.x, tipSize.y + location.y);
-
-			if (respectMonitorBounds) {
-				bounds = shell.getDisplay().getPrimaryMonitor().getBounds();
-			} else {
-				bounds = getPrimaryClientArea();
-			}
-
-			if (!(bounds.contains(location) && bounds.contains(rightBounds))) {
-				if (rightBounds.x > bounds.x + bounds.width) {
-					location.x -= rightBounds.x - (bounds.x + bounds.width);
-				}
-
-				if (rightBounds.y > bounds.y + bounds.height) {
-					location.y -= rightBounds.y - (bounds.y + bounds.height);
-				}
-
-				if (location.x < bounds.x) {
-					location.x = bounds.x;
-				}
-
-				if (location.y < bounds.y) {
-					location.y = bounds.y;
-				}
-			}
-		}
-
-		return location;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AdaptiveRefreshPolicy.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AdaptiveRefreshPolicy.java
deleted file mode 100644
index 95e77d7..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/AdaptiveRefreshPolicy.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class AdaptiveRefreshPolicy {
-
-	private int refreshDelay = 1500;
-
-	private final Set<IFilteredTreeListener> listeners = new HashSet<IFilteredTreeListener>();
-
-	private String oldText = ""; //$NON-NLS-1$
-
-	protected Job refreshJob;
-
-	@Deprecated
-	public AdaptiveRefreshPolicy(Job refreshJob, Text filterText) {
-		this(refreshJob);
-	}
-
-	public AdaptiveRefreshPolicy(Job refreshJob) {
-		Assert.isNotNull(refreshJob);
-		this.refreshJob = refreshJob;
-		refreshJob.addJobChangeListener(REFRESH_JOB_LISTENER);
-	}
-
-	public void dispose() {
-		refreshJob.removeJobChangeListener(REFRESH_JOB_LISTENER);
-	}
-
-	protected final IJobChangeListener REFRESH_JOB_LISTENER = new IJobChangeListener() {
-
-		public void aboutToRun(IJobChangeEvent event) {
-			// ignore
-		}
-
-		public void awake(IJobChangeEvent event) {
-			// ignore
-		}
-
-		public void done(IJobChangeEvent event) {
-			if (event.getResult().isOK()) {
-				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						for (IFilteredTreeListener listener : listeners) {
-							listener.filterTextChanged(oldText);
-						}
-					}
-				});
-			}
-		}
-
-		public void running(IJobChangeEvent event) {
-			// ignore
-		}
-
-		public void scheduled(IJobChangeEvent event) {
-			// ignore
-		}
-
-		public void sleeping(IJobChangeEvent event) {
-			// ignore
-		}
-	};
-
-	public void textChanged(String text) {
-		if (text == null || text.equals(oldText)) {
-			return;
-		}
-
-		refreshJob.cancel();
-		int delay = 0;
-		int textLength = text.length();
-		if (textLength > 0) {
-			delay = (int) (this.refreshDelay / (textLength * 0.6));
-		}
-		refreshJob.schedule(delay);
-
-		this.oldText = text;
-	}
-
-	/**
-	 * for testing purposes only
-	 */
-	public void internalForceRefresh() {
-		((WorkbenchJob) refreshJob).runInUIThread(new NullProgressMonitor());
-	}
-
-	public void addListener(IFilteredTreeListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeListener(IFilteredTreeListener listener) {
-		listeners.remove(listener);
-	}
-
-	public void setRefreshDelay(int refreshDelay) {
-		this.refreshDelay = refreshDelay;
-	}
-
-	public int getRefreshDelay() {
-		return refreshDelay;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonColors.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonColors.java
deleted file mode 100644
index fdc7273..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonColors.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public class CommonColors {
-
-	public static final Color CONTEXT_ACTIVE = new Color(Display.getDefault(), 36, 22, 50);
-
-	public static final Color HYPERLINK_WIDGET = new Color(Display.getDefault(), 12, 81, 172);
-
-	public static final Color TEXT_QUOTED = new Color(Display.getDefault(), 38, 86, 145);
-
-	public static final Color TEXT_SPELLING_ERROR = new Color(Display.getDefault(), 255, 0, 0);
-
-	public static final Color GRAY_MID = new Color(Display.getDefault(), 100, 100, 100);
-
-	/**
-	 * NOTE: disposal of JFaceResources fonts handled by registry.
-	 */
-	public static void dispose() {
-		CONTEXT_ACTIVE.dispose();
-		HYPERLINK_WIDGET.dispose();
-		TEXT_QUOTED.dispose();
-		TEXT_SPELLING_ERROR.dispose();
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFonts.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFonts.java
deleted file mode 100644
index 3638453..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFonts.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.Field;
-
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public class CommonFonts {
-
-	public static Font BOLD;
-
-	public static Font ITALIC;
-
-	public static Font BOLD_ITALIC;
-
-	public static Font STRIKETHROUGH = null;
-
-	public static boolean HAS_STRIKETHROUGH;
-
-	static {
-		if (Display.getCurrent() != null) {
-			init();
-		} else {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					init();
-				}
-			});
-		}
-	}
-
-	private static void init() {
-		BOLD = JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
-		ITALIC = JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);
-		BOLD_ITALIC = new Font(Display.getCurrent(), getModifiedFontData(ITALIC.getFontData(), SWT.BOLD | SWT.ITALIC));
-
-		Font defaultFont = JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
-		FontData[] defaultData = defaultFont.getFontData();
-		if (defaultData != null && defaultData.length == 1) {
-			FontData data = new FontData(defaultData[0].getName(), defaultData[0].getHeight(),
-					defaultData[0].getStyle());
-
-			if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$
-				// NOTE: Windows only, for: data.data.lfStrikeOut = 1;
-				try {
-					Field dataField = data.getClass().getDeclaredField("data"); //$NON-NLS-1$
-					Object dataObject = dataField.get(data);
-					Class<?> clazz = dataObject.getClass().getSuperclass();
-					Field strikeOutFiled = clazz.getDeclaredField("lfStrikeOut"); //$NON-NLS-1$
-					strikeOutFiled.set(dataObject, (byte) 1);
-					CommonFonts.STRIKETHROUGH = new Font(Display.getCurrent(), data);
-				} catch (Throwable t) {
-					// ignore
-				}
-			}
-		}
-		if (CommonFonts.STRIKETHROUGH == null) {
-			CommonFonts.HAS_STRIKETHROUGH = false;
-			CommonFonts.STRIKETHROUGH = defaultFont;
-		} else {
-			CommonFonts.HAS_STRIKETHROUGH = true;
-		}
-	}
-
-	/**
-	 * NOTE: disposal of JFaceResources fonts handled by registry.
-	 */
-	public static void dispose() {
-		if (CommonFonts.STRIKETHROUGH != null && !CommonFonts.STRIKETHROUGH.isDisposed()) {
-			CommonFonts.STRIKETHROUGH.dispose();
-			CommonFonts.BOLD_ITALIC.dispose();
-		}
-	}
-
-	/**
-	 * Copied from {@link FontRegistry}
-	 */
-	private static FontData[] getModifiedFontData(FontData[] baseData, int style) {
-		FontData[] styleData = new FontData[baseData.length];
-		for (int i = 0; i < styleData.length; i++) {
-			FontData base = baseData[i];
-			styleData[i] = new FontData(base.getName(), base.getHeight(), base.getStyle() | style);
-		}
-
-		return styleData;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFormUtil.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFormUtil.java
deleted file mode 100644
index 5d311f3..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonFormUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.internal.forms.widgets.FormUtil;
-
-/**
- * @author Steffen Pingel
- */
-public class CommonFormUtil {
-
-	public static void disableScrollingOnFocus(ScrolledForm form) {
-		form.setData(FormUtil.FOCUS_SCROLLING, Boolean.FALSE);
-	}
-
-	public static void ensureVisible(Control control) {
-		ScrolledComposite form = FormUtil.getScrolledComposite(control);
-		if (form != null) {
-			FormUtil.ensureVisible(form, control);
-		}
-	}
-
-	/**
-	 * Programmatically expand the provided ExpandableComposite, using reflection to fire the expansion listeners (see
-	 * bug#70358)
-	 * 
-	 * @param comp
-	 */
-	public static void setExpanded(ExpandableComposite comp, boolean expanded) {
-		if (comp.isExpanded() != expanded) {
-			Method method = null;
-			try {
-				method = ExpandableComposite.class.getDeclaredMethod("programmaticToggleState"); //$NON-NLS-1$
-				method.setAccessible(true);
-				method.invoke(comp);
-			} catch (Exception e) {
-				// ignore
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonImages.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonImages.java
deleted file mode 100644
index 454aa1d..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonImages.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.mylyn.internal.commons.ui.CompositeContainerImageDescriptor;
-import org.eclipse.mylyn.internal.commons.ui.CompositeElementImageDescriptor;
-import org.eclipse.mylyn.internal.commons.ui.CompositeSyncImageDescriptor;
-import org.eclipse.mylyn.internal.commons.ui.TaskListImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public class CommonImages {
-
-	private static final URL baseURL = CommonsUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
-
-	private static ImageRegistry imageRegistry;
-
-	private static final String T_ELCL = "elcl16"; //$NON-NLS-1$
-
-	private static final String T_EVIEW = "eview16"; //$NON-NLS-1$
-
-	private static final String T_TOOL = "etool16"; //$NON-NLS-1$
-
-	private static final String T_OBJ = "obj16"; //$NON-NLS-1$
-
-	private static final String T_WIZBAN = "wizban"; //$NON-NLS-1$
-
-	private static final String T_OVR = "ovr16"; //$NON-NLS-1$
-
-	// Priorities
-
-	public static final ImageDescriptor PRIORITY_1 = create(T_OBJ, "priority-1.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_2 = create(T_OBJ, "priority-2.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_3 = create(T_OBJ, "priority-3.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_4 = create(T_OBJ, "priority-4.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRIORITY_5 = create(T_OBJ, "priority-5.gif"); //$NON-NLS-1$
-
-	// 	Calendars, people and notifications
-
-	public static final ImageDescriptor CALENDAR = create(T_TOOL, "calendar.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor CALENDAR_SMALL = create(T_OBJ, "calendar-small.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor SCHEDULE_DAY = create(T_TOOL, "schedule-day.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor SCHEDULE_WEEK = create(T_TOOL, "schedule-week.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PERSON = create(T_TOOL, "person.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PERSON_NARROW = create(T_TOOL, "person-narrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PERSON_ME = create(T_TOOL, "person-me.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PERSON_ME_NARROW = create(T_TOOL, "person-me-narrow.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor NOTIFICATION_CLOSE = create(T_EVIEW, "notification-close.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor NOTIFICATION_CLOSE_HOVER = create(T_EVIEW, "notification-close-active.gif"); //$NON-NLS-1$
-
-	// Date and synchronization overlays
-
-	public static final ImageDescriptor OVERLAY_DATE_DUE = create(T_EVIEW, "overlay-has-due.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_DATE_OVERDUE = create(T_EVIEW, "overlay-overdue.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_IN_PROGRESS = create(T_EVIEW, "overlay-synchronizing.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_INCOMMING = create(T_EVIEW, "overlay-incoming.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_INCOMMING_NEW = create(T_EVIEW, "overlay-incoming-new.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_OUTGOING = create(T_EVIEW, "overlay-outgoing.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_OUTGOING_NEW = create(T_EVIEW, "overlay-outgoing-new.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_CONFLICT = create(T_EVIEW, "overlay-conflict.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_WARNING = create(T_OVR, "overlay-warning.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_OLD_INCOMMING = create(T_EVIEW, "overlay-synch-incoming.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_OLD_INCOMMING_NEW = create(T_EVIEW,
-			"overlay-synch-incoming-new.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_SYNC_OLD_OUTGOING = create(T_EVIEW, "overlay-synch-outgoing.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_CLEAR = create(T_OVR, "overlay-blank.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor OVERLAY_WHITE = create(T_OVR, "solid-white.gif"); //$NON-NLS-1$
-
-	// Wizard banners
-
-	public static final ImageDescriptor BANNER_SCREENSHOT = create(T_WIZBAN, "banner-screenshot.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor BANNER_IMPORT = create(T_WIZBAN, "banner-import.gif"); //$NON-NLS-1$
-
-	// Miscellaneous
-	// TODO: some of the common images below come from the workbench
-
-	public static final ImageDescriptor COMPLETE = create(T_OBJ, "complete.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor REMOVE = create(T_ELCL, "remove.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DELETE = create(T_ELCL, "delete.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor WARNING = create(T_ELCL, "warning.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILTER_COMPLETE = create(T_ELCL, "filter-complete.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILTER_ARCHIVE = create(T_ELCL, "filter-archive.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILTER_PRIORITY = create(T_ELCL, "filter-priority.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor COLOR_PALETTE = create(T_ELCL, "color-palette.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FILTER = create(T_TOOL, "view-filter.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FIND_CLEAR = create(T_TOOL, "find-clear.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FIND_CLEAR_DISABLED = create(T_TOOL, "find-clear-disabled.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor BROWSER_SMALL = create(T_OBJ, "browser-small.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor BROWSER_OPEN_TASK = create(T_TOOL, "open-browser.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor TOOLBAR_ARROW_RIGHT = create(T_TOOL, "toolbar-arrow-right.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor TOOLBAR_ARROW_DOWN = create(T_TOOL, "toolbar-arrow-down.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor LINK_EDITOR = create(T_TOOL, "link-editor.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor CLEAR = create(T_TOOL, "clear.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EDIT = create(T_TOOL, "edit.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor CUT = create(T_TOOL, "cut.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor STATUS_NORMAL = create(T_EVIEW, "status-normal.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor STATUS_CONTEXT = create(T_EVIEW, "status-server-context.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PRESENTATION = create(T_TOOL, "presentation.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor GROUPING = create(T_TOOL, "grouping.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor COPY = create(T_TOOL, "copy.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor GO_UP = create(T_TOOL, "go-up.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor GO_INTO = create(T_TOOL, "go-into.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor REFRESH = create(T_ELCL, "refresh.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor REFRESH_SMALL = create(T_ELCL, "refresh-small.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor COLLAPSE_ALL = create(T_ELCL, "collapseall.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor COLLAPSE_ALL_SMALL = create(T_ELCL, "collapseall-small.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EXPAND_ALL = create(T_ELCL, "expandall.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor EXPAND_ALL_SMALL = create(T_ELCL, "expandall-small.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor BLANK = create(T_ELCL, "blank.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor IMAGE_CAPTURE = create(T_TOOL, "capture-screen.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor IMAGE_FIT = create(T_TOOL, "capture-fit.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor IMAGE_FILE = create(T_OBJ, "file-image.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor QUESTION = create(T_OBJ, "question.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor SEPARATOR_LIST = create(T_TOOL, "content-assist-separator.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PART_MAXIMIZE = create(T_TOOL, "maximize.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor PREVIEW_WEB = create(T_TOOL, "preview-web.png"); //$NON-NLS-1$
-
-	public static final ImageDescriptor FIND = create(T_TOOL, "find.gif"); //$NON-NLS-1$
-
-	private static ImageDescriptor create(String prefix, String name) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-
-	/**
-	 * Lazily initializes image map.
-	 * 
-	 * @param imageDescriptor
-	 * @return Image
-	 */
-	public static Image getImage(ImageDescriptor imageDescriptor) {
-		ImageRegistry imageRegistry = getImageRegistry();
-		Image image = imageRegistry.get("" + imageDescriptor.hashCode()); //$NON-NLS-1$
-		if (image == null) {
-			image = imageDescriptor.createImage(true);
-			imageRegistry.put("" + imageDescriptor.hashCode(), image); //$NON-NLS-1$
-		}
-		return image;
-	}
-
-	public static Image getImageWithOverlay(ImageDescriptor icon, ImageDescriptor overlay, boolean top, boolean left) {
-		if (icon == null) {
-			return null;
-		}
-		String key = "" + icon.hashCode(); //$NON-NLS-1$
-		if (overlay != null) {
-			key += overlay.hashCode();
-		}
-		key += new Boolean(top).hashCode();
-		key += new Boolean(left).hashCode();
-
-		Image image = getImageRegistry().get(key);
-
-		if (image == null) {
-			TaskListImageDescriptor imageDescriptor = new TaskListImageDescriptor(icon, overlay, top, left);
-			image = imageDescriptor.createImage(true);
-			getImageRegistry().put(key, image);
-		}
-		return image;
-	}
-
-	/**
-	 * Lazily initializes image map.
-	 * 
-	 * @param icon
-	 *            cannot be null
-	 * @param overlayKind
-	 * @param wide
-	 * @return Image
-	 */
-	public static Image getCompositeTaskImage(ImageDescriptor icon, ImageDescriptor overlayKind, boolean wide) {
-		if (icon == null) {
-			return null;
-		}
-		String key = "" + icon.hashCode(); //$NON-NLS-1$
-		if (overlayKind != null) {
-			key += overlayKind.hashCode();
-		}
-		if (wide) {
-			key += ".wide"; //$NON-NLS-1$
-		}
-		Image image = getImageRegistry().get(key);
-
-		if (image == null) {
-			CompositeElementImageDescriptor imageDescriptor = new CompositeElementImageDescriptor(icon, overlayKind,
-					wide);
-			image = imageDescriptor.createImage(true);
-			getImageRegistry().put(key, image);
-		}
-		return image;
-	}
-
-	public static Image getCompositeContainerImage(ImageDescriptor icon, boolean wide) {
-		if (icon == null) {
-			return null;
-		}
-		String key = "" + icon.hashCode(); //$NON-NLS-1$
-		if (wide) {
-			key += ".wide"; //$NON-NLS-1$
-		}
-		Image image = getImageRegistry().get(key);
-		if (image == null) {
-			CompositeContainerImageDescriptor imageDescriptor = new CompositeContainerImageDescriptor(icon,
-					OVERLAY_CLEAR, wide);
-			image = imageDescriptor.createImage(true);
-			getImageRegistry().put(key, image);
-		}
-		return image;
-	}
-
-	public static Image getCompositeSynchImage(ImageDescriptor icon, boolean background) {
-		String key = "" + icon.hashCode(); //$NON-NLS-1$
-		if (background) {
-			key += ".background"; //$NON-NLS-1$
-		}
-
-		Image image = getImageRegistry().get(key);
-		if (image == null) {
-			CompositeSyncImageDescriptor imageDescriptor = new CompositeSyncImageDescriptor(icon, background);
-			image = imageDescriptor.createImage(true);
-			getImageRegistry().put(key, image);
-		}
-		return image;
-	}
-
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-
-		return imageRegistry;
-	}
-
-	private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
-		if (baseURL == null) {
-			throw new MalformedURLException();
-		}
-
-		StringBuffer buffer = new StringBuffer(prefix);
-		buffer.append('/');
-		buffer.append(name);
-		return new URL(baseURL, buffer.toString());
-	}
-
-	private static Image[] progressImages;
-
-	public static Image[] getProgressImages() {
-
-		if (progressImages != null) {
-			return progressImages;
-		}
-
-		progressImages = new Image[8];
-
-		for (int i = 1; i <= 8; i++) {
-			ImageDescriptor imageDescriptor = create(T_EVIEW + "/progress", i + ".png"); //$NON-NLS-1$ //$NON-NLS-2$
-			progressImages[i - 1] = getImage(imageDescriptor);
-		}
-
-		return progressImages;
-
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonTextSupport.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonTextSupport.java
deleted file mode 100644
index c8037e0..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonTextSupport.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.commands.ActionHandler;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.TextEvent;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.source.AnnotationModel;
-import org.eclipse.jface.text.source.IAnnotationAccess;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.ActiveShellExpression;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.handlers.IHandlerActivation;
-import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.texteditor.AnnotationPreference;
-import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
-import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
-
-/**
- * Utility class that enables edit actions, content assist and quick fixing for {@link TextViewer} and
- * {@link SourceViewer} controls.
- * 
- * @author Steffen Pingel
- */
-public class CommonTextSupport {
-
-	private class TextViewerFocusListener implements FocusListener {
-
-		private final boolean spellCheck;
-
-		private final TextViewer viewer;
-
-		public TextViewerFocusListener(TextViewer viewer, boolean spellCheck) {
-			this.viewer = viewer;
-			this.spellCheck = spellCheck;
-		}
-
-		public void focusGained(FocusEvent e) {
-			if (selectionChangedListener != null) {
-				selectionChangedListener.selectionChanged(new SelectionChangedEvent(viewer, viewer.getSelection()));
-			}
-			activateHandlers(viewer, spellCheck);
-		}
-
-		public void focusLost(FocusEvent e) {
-			deactivateHandlers();
-			if (selectionChangedListener != null) {
-				// make sure selection no text is selected when control looses focus
-				StyledText st = (StyledText) e.widget;
-				st.setSelectionRange(st.getCaretOffset(), 0);
-				// update action enablement
-				selectionChangedListener.selectionChanged(new SelectionChangedEvent(viewer, StructuredSelection.EMPTY));
-			}
-		}
-	}
-
-	private static final String KEY_TEXT_VIEWER = "textViewer"; //$NON-NLS-1$
-
-	private static boolean canDoGlobalAction(String actionId, TextViewer textViewer) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.CUT);
-		} else if (actionId.equals(ActionFactory.COPY.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.COPY);
-		} else if (actionId.equals(ActionFactory.PASTE.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.PASTE);
-		} else if (actionId.equals(ActionFactory.DELETE.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.DELETE);
-		} else if (actionId.equals(ActionFactory.UNDO.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.UNDO);
-		} else if (actionId.equals(ActionFactory.REDO.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.REDO);
-		} else if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			return textViewer.canDoOperation(ITextOperationTarget.SELECT_ALL);
-		}
-		return false;
-	}
-
-	public static boolean canPerformAction(String actionId, Control focusControl) {
-		TextViewer viewer = getTextViewer(focusControl);
-		if (viewer != null) {
-			return canDoGlobalAction(actionId, viewer);
-		}
-		if (actionId.equals(ActionFactory.UNDO.getId()) || actionId.equals(ActionFactory.REDO.getId())) {
-			return false;
-		}
-		return true;
-	}
-
-	private static boolean canPerformDirectly(String id, Control control) {
-		if (control instanceof Text) {
-			Text text = (Text) control;
-			if (id.equals(ActionFactory.CUT.getId())) {
-				text.cut();
-				return true;
-			}
-			if (id.equals(ActionFactory.COPY.getId())) {
-				text.copy();
-				return true;
-			}
-			if (id.equals(ActionFactory.PASTE.getId())) {
-				text.paste();
-				return true;
-			}
-			if (id.equals(ActionFactory.SELECT_ALL.getId())) {
-				text.selectAll();
-				return true;
-			}
-			if (id.equals(ActionFactory.DELETE.getId())) {
-				int count = text.getSelectionCount();
-				if (count == 0) {
-					int caretPos = text.getCaretPosition();
-					text.setSelection(caretPos, caretPos + 1);
-				}
-				text.insert(""); //$NON-NLS-1$
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static void doAction(String actionId, Control focusControl) {
-		if (canPerformDirectly(actionId, focusControl)) {
-			return;
-		}
-		TextViewer viewer = getTextViewer(focusControl);
-		if (viewer != null) {
-			doGlobalAction(actionId, viewer);
-		}
-	}
-
-	private static boolean doGlobalAction(String actionId, TextViewer textViewer) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			textViewer.doOperation(ITextOperationTarget.CUT);
-			return true;
-		} else if (actionId.equals(ActionFactory.COPY.getId())) {
-			textViewer.doOperation(ITextOperationTarget.COPY);
-			return true;
-		} else if (actionId.equals(ActionFactory.PASTE.getId())) {
-			textViewer.doOperation(ITextOperationTarget.PASTE);
-			return true;
-		} else if (actionId.equals(ActionFactory.DELETE.getId())) {
-			textViewer.doOperation(ITextOperationTarget.DELETE);
-			return true;
-		} else if (actionId.equals(ActionFactory.UNDO.getId())) {
-			textViewer.doOperation(ITextOperationTarget.UNDO);
-			return true;
-		} else if (actionId.equals(ActionFactory.REDO.getId())) {
-			textViewer.doOperation(ITextOperationTarget.REDO);
-			return true;
-		} else if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			textViewer.doOperation(ITextOperationTarget.SELECT_ALL);
-			return true;
-		}
-		return false;
-	}
-
-	public static TextViewer getTextViewer(Widget widget) {
-		if (widget instanceof StyledText) {
-			Object data = widget.getData(KEY_TEXT_VIEWER);
-			if (data instanceof TextViewer) {
-				return (TextViewer) data;
-			}
-		}
-		return null;
-	}
-
-	public static void setTextViewer(Widget widget, TextViewer textViewer) {
-		widget.setData(KEY_TEXT_VIEWER, textViewer);
-	}
-
-	public IHandlerActivation contentAssistHandlerActivation;
-
-	private final IHandlerService handlerService;
-
-	private IHandlerActivation quickAssistHandlerActivation;
-
-	private ISelectionChangedListener selectionChangedListener;
-
-	public CommonTextSupport(IHandlerService handlerService) {
-		this.handlerService = handlerService;
-	}
-
-	private IHandlerActivation activateHandler(TextViewer viewer, int operation, String actionDefinitionId) {
-		IHandler handler = createActionHandler(viewer, operation, actionDefinitionId);
-		return handlerService.activateHandler(actionDefinitionId, handler, //
-				new ActiveShellExpression(viewer.getTextWidget().getShell()));
-	}
-
-	private void activateHandlers(TextViewer viewer, boolean spellCheck) {
-		deactivateHandlers();
-		if (spellCheck) {
-			quickAssistHandlerActivation = activateHandler(viewer, ISourceViewer.QUICK_ASSIST,
-					ITextEditorActionDefinitionIds.QUICK_ASSIST);
-		}
-		contentAssistHandlerActivation = activateHandler(viewer, ISourceViewer.CONTENTASSIST_PROPOSALS,
-				ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-	}
-
-	public void configure(final TextViewer viewer, Document document, boolean spellCheck) {
-		if (spellCheck && viewer instanceof ISourceViewer) {
-			configureAsEditor((ISourceViewer) viewer, document);
-		} else {
-			viewer.setDocument(document);
-		}
-		install(viewer, spellCheck);
-	}
-
-	/** Configures annotation model for spell checking. */
-	private void configureAsEditor(ISourceViewer viewer, Document document) {
-		IAnnotationAccess annotationAccess = new DefaultMarkerAnnotationAccess();
-		final SourceViewerDecorationSupport support = new SourceViewerDecorationSupport(viewer, null, annotationAccess,
-				EditorsUI.getSharedTextColors());
-		Iterator<?> e = new MarkerAnnotationPreferences().getAnnotationPreferences().iterator();
-		while (e.hasNext()) {
-			support.setAnnotationPreference((AnnotationPreference) e.next());
-		}
-		support.install(EditorsUI.getPreferenceStore());
-		viewer.getTextWidget().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				support.uninstall();
-			}
-		});
-		AnnotationModel annotationModel = new AnnotationModel();
-		viewer.setDocument(document, annotationModel);
-	}
-
-	private IHandler createActionHandler(final ITextOperationTarget viewer, final int operation,
-			String actionDefinitionId) {
-		Action action = new Action() {
-			@Override
-			public void run() {
-				if (viewer.canDoOperation(operation)) {
-					viewer.doOperation(operation);
-				}
-			}
-		};
-		action.setActionDefinitionId(actionDefinitionId);
-		return new ActionHandler(action);
-	}
-
-	private void deactivateHandlers() {
-		if (quickAssistHandlerActivation != null) {
-			handlerService.deactivateHandler(quickAssistHandlerActivation);
-			quickAssistHandlerActivation = null;
-		}
-		if (contentAssistHandlerActivation != null) {
-			handlerService.deactivateHandler(contentAssistHandlerActivation);
-			contentAssistHandlerActivation = null;
-		}
-	}
-
-	public void dispose() {
-		deactivateHandlers();
-	}
-
-	public ISelectionChangedListener getSelectionChangedListener() {
-		return selectionChangedListener;
-	}
-
-	public void install(final TextViewer viewer, boolean spellCheck) {
-		viewer.getControl().addFocusListener(new TextViewerFocusListener(viewer, spellCheck));
-		if (selectionChangedListener != null) {
-			viewer.addSelectionChangedListener(selectionChangedListener);
-			viewer.addTextListener(new ITextListener() {
-				public void textChanged(TextEvent event) {
-					if (selectionChangedListener != null) {
-						selectionChangedListener.selectionChanged(new SelectionChangedEvent(viewer,
-								viewer.getSelection()));
-					}
-				}
-			});
-		}
-		setTextViewer(viewer.getControl(), viewer);
-	}
-
-	public void setSelectionChangedListener(ISelectionChangedListener selectionChangedListener) {
-		this.selectionChangedListener = selectionChangedListener;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonThemes.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonThemes.java
deleted file mode 100644
index dccbdce..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonThemes.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-/**
- * @author Mik Kersten
- * @since 3.0
- */
-public class CommonThemes {
-
-	public static final String COLOR_INCOMING_BACKGROUND = "org.eclipse.mylyn.tasks.ui.colors.incoming.background"; //$NON-NLS-1$
-
-	public static final String COLOR_SCHEDULED_PAST = "org.eclipse.mylyn.tasks.ui.colors.foreground.past.scheduled"; //$NON-NLS-1$
-
-	public static final String COLOR_OVERDUE = "org.eclipse.mylyn.tasks.ui.colors.foreground.past.due"; //$NON-NLS-1$
-
-	public static final String COLOR_SCHEDULED_THIS_WEEK = "org.eclipse.mylyn.tasks.ui.colors.foreground.thisweek.scheduled"; //$NON-NLS-1$
-
-	public static final String COLOR_COMPLETED = "org.eclipse.mylyn.tasks.ui.colors.foreground.completed"; //$NON-NLS-1$
-
-	public static final String COLOR_SCHEDULED_TODAY = "org.eclipse.mylyn.tasks.ui.colors.foreground.today.scheduled"; //$NON-NLS-1$
-
-	public static final String COLOR_COMPLETED_TODAY = "org.eclipse.mylyn.tasks.ui.colors.foreground.today.completed"; //$NON-NLS-1$
-
-	public static final String COLOR_CATEGORY_GRADIENT_START = "org.eclipse.mylyn.tasks.ui.colors.category.gradient.start"; //$NON-NLS-1$
-
-	public static final String COLOR_CATEGORY_GRADIENT_END = "org.eclipse.mylyn.tasks.ui.colors.category.gradient.end"; //$NON-NLS-1$
-
-	public static final String COLOR_CATEGORY = COLOR_CATEGORY_GRADIENT_END;
-
-	public static final String FONT_EDITOR_COMMENT = "org.eclipse.mylyn.tasks.ui.fonts.task.editor.comment"; //$NON-NLS-1$
-
-	public static boolean isCommonTheme(String property) {
-		if (property == null) {
-			return false;
-		} else {
-			return property.equals(COLOR_CATEGORY) || property.equals(COLOR_OVERDUE)
-					|| property.equals(COLOR_SCHEDULED_PAST) || property.equals(COLOR_COMPLETED_TODAY)
-					|| property.equals(COLOR_SCHEDULED_TODAY) || property.equals(COLOR_SCHEDULED_THIS_WEEK)
-					|| property.equals(COLOR_INCOMING_BACKGROUND) || property.equals(COLOR_CATEGORY_GRADIENT_START)
-					|| property.equals(COLOR_CATEGORY_GRADIENT_END);
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonUiUtil.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonUiUtil.java
deleted file mode 100644
index 21ad3bd..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonUiUtil.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- */
-public class CommonUiUtil {
-
-	private static final String KEY_DISABLED = "org.eclipse.mylyn.commons.ui.disabled"; //$NON-NLS-1$
-
-	public static void busyCursorWhile(final ICoreRunnable runnable) throws OperationCanceledException, CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runner);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void run(IRunnableContext context, final ICoreRunnable runnable) throws CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			context.run(true, true, runner);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void runInUi(ICoreRunnable runnable, ISchedulingRule rule) throws CoreException {
-		runInUi(PlatformUI.getWorkbench().getProgressService(), runnable, rule);
-	}
-
-	public static void runInUi(IRunnableContext context, final ICoreRunnable runnable, ISchedulingRule rule)
-			throws CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().runInUI(context, runner, rule);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void setMessage(DialogPage page, IStatus status) {
-		String message = status.getMessage();
-		switch (status.getSeverity()) {
-		case IStatus.OK:
-			page.setMessage(null, IMessageProvider.NONE);
-			break;
-		case IStatus.INFO:
-			page.setMessage(message, IMessageProvider.INFORMATION);
-			break;
-		case IStatus.WARNING:
-			page.setMessage(message, IMessageProvider.WARNING);
-			break;
-		default:
-			page.setMessage(message, IMessageProvider.ERROR);
-			break;
-		}
-	}
-
-	/**
-	 * Recursively sets the menu of all children of <code>composite</code>.
-	 */
-	public static void setMenu(Composite composite, Menu menu) {
-		if (!composite.isDisposed()) {
-			composite.setMenu(menu);
-			for (Control child : composite.getChildren()) {
-				child.setMenu(menu);
-				if (child instanceof Composite) {
-					setMenu((Composite) child, menu);
-				}
-			}
-		}
-	}
-
-	public static void setEnabled(Composite composite, boolean enabled) {
-		if (enabled) {
-			enable(composite);
-		} else {
-			disable(composite);
-		}
-	}
-
-	private static void disable(Composite composite) {
-		if (!composite.isDisposed()) {
-			if (!composite.getEnabled()) {
-				composite.setData(KEY_DISABLED, Boolean.TRUE);
-			} else {
-				composite.setEnabled(false);
-			}
-			for (Control control : composite.getChildren()) {
-				if (control instanceof Composite) {
-					disable((Composite) control);
-				} else {
-					if (!control.getEnabled()) {
-						control.setData(KEY_DISABLED, Boolean.TRUE);
-					} else {
-						control.setEnabled(false);
-					}
-				}
-			}
-		}
-	}
-
-	private static void enable(Composite composite) {
-		if (!composite.isDisposed()) {
-			if (composite.getData(KEY_DISABLED) == null) {
-				composite.setEnabled(true);
-			} else {
-				composite.setData(KEY_DISABLED, null);
-			}
-			for (Control control : composite.getChildren()) {
-				if (control instanceof Composite) {
-					enable((Composite) control);
-				} else {
-					if (control.getData(KEY_DISABLED) == null) {
-						control.setEnabled(true);
-					} else {
-						control.setData(KEY_DISABLED, null);
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonsUiUtil.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonsUiUtil.java
deleted file mode 100644
index ebe7369..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/CommonsUiUtil.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Steffen Pingel
- * @deprecated use {@link CommonUiUtil} instead
- */
-@Deprecated
-public class CommonsUiUtil {
-
-	public static void busyCursorWhile(final ICoreRunnable runnable) throws OperationCanceledException, CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runner);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void run(IRunnableContext context, final ICoreRunnable runnable) throws CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			context.run(true, true, runner);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void runInUi(ICoreRunnable runnable, ISchedulingRule rule) throws CoreException {
-		runInUi(PlatformUI.getWorkbench().getProgressService(), runnable, rule);
-	}
-
-	public static void runInUi(IRunnableContext context, final ICoreRunnable runnable, ISchedulingRule rule)
-			throws CoreException {
-		try {
-			IRunnableWithProgress runner = new IRunnableWithProgress() {
-				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					try {
-						runnable.run(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} catch (OperationCanceledException e) {
-						throw new InterruptedException();
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			PlatformUI.getWorkbench().getProgressService().runInUI(context, runner, rule);
-		} catch (InvocationTargetException e) {
-			if (e.getCause() instanceof CoreException) {
-				throw (CoreException) e.getCause();
-			} else {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Unexpected exception", e)); //$NON-NLS-1$
-			}
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException();
-		}
-	}
-
-	public static void setMessage(DialogPage page, IStatus status) {
-		String message = status.getMessage();
-		switch (status.getSeverity()) {
-		case IStatus.OK:
-			page.setMessage(null, IMessageProvider.NONE);
-			break;
-		case IStatus.INFO:
-			page.setMessage(message, IMessageProvider.INFORMATION);
-			break;
-		case IStatus.WARNING:
-			page.setMessage(message, IMessageProvider.WARNING);
-			break;
-		default:
-			page.setMessage(message, IMessageProvider.ERROR);
-			break;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePicker.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePicker.java
deleted file mode 100644
index 222fa48..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePicker.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Temporary date picker from patch posted to: https://bugs.eclipse.org/bugs/show_bug.cgi?taskId=19945
- * 
- * see bug# 19945
- * 
- * TODO: remove this class when an SWT date picker is added
- * 
- * @author Bahadir Yagan
- * @author Mik Kersten
- * @since 1.0
- */
-public class DatePicker extends Composite {
-
-	public final static String TITLE_DIALOG = Messages.DatePicker_Choose_Date;
-
-	public static final String LABEL_CHOOSE = Messages.DatePicker_Choose_Date;
-
-	private Text dateText;
-
-	private Button pickButton;
-
-	private Calendar date;
-
-	private final List<SelectionListener> pickerListeners = new LinkedList<SelectionListener>();
-
-	private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT);
-
-	private String initialText = LABEL_CHOOSE;
-
-	private final boolean includeTimeOfday;
-
-	private final int hourOfDay = 0;
-
-	private int selectedHourOfDay = 0;
-
-	public DatePicker(Composite parent, int style, String initialText, boolean includeHours, int selectedHourOfDay) {
-		super(parent, style);
-		this.initialText = initialText;
-		this.includeTimeOfday = includeHours;
-		this.selectedHourOfDay = selectedHourOfDay;
-		initialize((style & SWT.FLAT) != 0 ? SWT.FLAT : 0);
-	}
-
-	public DateFormat getDateFormat() {
-		return dateFormat;
-	}
-
-	public void setDatePattern(String pattern) {
-		this.dateFormat = new SimpleDateFormat(pattern);
-	}
-
-	public void setDateFormat(DateFormat dateFormat) {
-		this.dateFormat = dateFormat;
-	}
-
-	private void initialize(int style) {
-		GridLayout gridLayout = new GridLayout(2, false);
-		gridLayout.horizontalSpacing = 0;
-		gridLayout.verticalSpacing = 0;
-		gridLayout.marginWidth = 0;
-		gridLayout.marginHeight = 0;
-		this.setLayout(gridLayout);
-
-		dateText = new Text(this, style);
-		GridData dateTextGridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-		dateTextGridData.grabExcessHorizontalSpace = true;
-		dateTextGridData.verticalAlignment = SWT.FILL;
-
-		dateText.setLayoutData(dateTextGridData);
-		dateText.setText(initialText);
-		dateText.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				// key listener used because setting of date picker text causes
-				// modify listener to fire which results in perpetual dirty
-				// editor
-				notifyPickerListeners();
-			}
-		});
-
-		dateText.addFocusListener(new FocusAdapter() {
-			Calendar calendar = Calendar.getInstance();
-
-			@Override
-			public void focusLost(FocusEvent e) {
-				Date reminderDate;
-				try {
-					reminderDate = dateFormat.parse(dateText.getText());
-					calendar.setTime(reminderDate);
-					date = calendar;
-					updateDateText();
-				} catch (ParseException e1) {
-					updateDateText();
-				}
-
-			}
-		});
-
-		pickButton = new Button(this, style | SWT.ARROW | SWT.DOWN);
-		GridData pickButtonGridData = new GridData(SWT.RIGHT, SWT.FILL, false, true);
-		pickButtonGridData.verticalIndent = 0;
-		pickButton.setLayoutData(pickButtonGridData);
-		pickButton.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent arg0) {
-				Calendar newCalendar = Calendar.getInstance();
-				newCalendar.set(Calendar.HOUR_OF_DAY, hourOfDay);
-				newCalendar.set(Calendar.MINUTE, 0);
-				newCalendar.set(Calendar.SECOND, 0);
-				newCalendar.set(Calendar.MILLISECOND, 0);
-				if (date != null) {
-					newCalendar.setTime(date.getTime());
-				}
-
-				Shell shell = null;
-				if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
-					shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				} else {
-					shell = new Shell(PlatformUI.getWorkbench().getDisplay());
-				}
-				DateSelectionDialog dialog = new DateSelectionDialog(shell, newCalendar, DatePicker.TITLE_DIALOG,
-						includeTimeOfday, selectedHourOfDay);
-				pickButton.setEnabled(false);
-				dateText.setEnabled(false);
-
-				int dialogResponse = dialog.open();
-				if (dialog.getDate() != null) {
-					newCalendar.setTime(dialog.getDate());
-				} else {
-					newCalendar = null;
-				}
-				dateSelected(dialogResponse == Window.CANCEL, newCalendar);
-
-				// Display display = Display.getCurrent();
-				// showDatePicker((display.getCursorLocation().x),
-				// (display.getCursorLocation().y));
-			}
-		});
-
-		pack();
-	}
-
-	public void addPickerSelectionListener(SelectionListener listener) {
-		pickerListeners.add(listener);
-	}
-
-	/**
-	 * must check for null return value
-	 * 
-	 * @return Calendar
-	 */
-	public Calendar getDate() {
-		return date;
-	}
-
-	@Override
-	public void setBackground(Color backgroundColor) {
-		dateText.setBackground(backgroundColor);
-		pickButton.setBackground(backgroundColor);
-		super.setBackground(backgroundColor);
-	}
-
-	public void setDate(Calendar date) {
-		this.date = date;
-		updateDateText();
-	}
-
-	// private void showDatePicker(int x, int y) {
-	// pickerShell = new Shell(SWT.APPLICATION_MODAL);//| SWT.ON_TOP
-	// pickerShell.setText("Shell");
-	// pickerShell.setLayout(new FillLayout());
-	// if (date == null) {
-	// date = new GregorianCalendar();
-	// }
-	// // datePickerPanel.setDate(date);
-	// datePickerPanel = new DatePickerPanel(pickerShell, SWT.NONE, date);
-	// datePickerPanel.addSelectionChangedListener(new
-	// ISelectionChangedListener() {
-	//
-	// public void selectionChanged(SelectionChangedEvent event) {
-	// if(!event.getSelection().isEmpty()) {
-	// dateSelected(event.getSelection().isEmpty(),
-	// ((DateSelection)event.getSelection()).getDate());
-	// } else {
-	// dateSelected(false, null);
-	// }
-	// }});
-	//				
-	// pickerShell.setSize(new Point(240, 180));
-	// pickerShell.setLocation(new Point(x, y));
-	//
-	// datePickerPanel.addKeyListener(new KeyListener() {
-	// public void keyPressed(KeyEvent e) {
-	// if (e.keyCode == SWT.ESC) {
-	// dateSelected(true, null);
-	// }
-	// }
-	//
-	// public void keyReleased(KeyEvent e) {
-	// }
-	// });
-	//		
-	// pickerShell.addFocusListener(new FocusListener() {
-	//
-	// public void focusGained(FocusEvent e) {
-	//				
-	// }
-	//
-	// public void focusLost(FocusEvent e) {
-	//				
-	// }});
-	//		
-	// pickerShell.pack();
-	// pickerShell.open();
-	// }
-
-	/** Called when the user has selected a date */
-	protected void dateSelected(boolean canceled, Calendar selectedDate) {
-
-		if (!canceled) {
-			this.date = selectedDate != null ? selectedDate : null;
-			updateDateText();
-			notifyPickerListeners();
-		}
-
-		pickButton.setEnabled(true);
-		dateText.setEnabled(true);
-	}
-
-	private void notifyPickerListeners() {
-		for (SelectionListener listener : pickerListeners) {
-			listener.widgetSelected(null);
-		}
-	}
-
-	private void updateDateText() {
-		if (date != null) {
-			Date currentDate = new Date(date.getTimeInMillis());
-			dateText.setText(dateFormat.format(currentDate));
-		} else {
-			dateText.setEnabled(false);
-			dateText.setText(LABEL_CHOOSE);
-			dateText.setEnabled(true);
-		}
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		dateText.setEnabled(enabled);
-		pickButton.setEnabled(enabled);
-		super.setEnabled(enabled);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePickerPanel.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePickerPanel.java
deleted file mode 100644
index 2bff691..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DatePickerPanel.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Bahadir Yagan - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DateTime;
-
-/**
- * @author Bahadir Yagan
- * @author Mik Kersten
- * @author Rob Elves
- */
-public class DatePickerPanel extends Composite implements KeyListener, ISelectionProvider {
-
-	private org.eclipse.swt.widgets.List timeList = null;
-
-	private ISelection selection = null;
-
-	private Calendar date = null;
-
-	private DateTime calendar = null;
-
-	private final List<ISelectionChangedListener> selectionListeners = new ArrayList<ISelectionChangedListener>();
-
-	private int hourOfDay = 0;
-
-	public DatePickerPanel(Composite parent, int style, Calendar initialDate, boolean includeTime, int hourOfDay) {
-		super(parent, style);
-		this.date = initialDate;
-		this.hourOfDay = hourOfDay;
-		initialize(includeTime);
-		setDate(date);
-		//this.setBackground()
-	}
-
-	private void initialize(boolean includeTime) {
-		if (date == null) {
-			date = Calendar.getInstance();
-			date.set(Calendar.HOUR_OF_DAY, hourOfDay);
-			date.set(Calendar.MINUTE, 0);
-			date.set(Calendar.SECOND, 0);
-			date.set(Calendar.MILLISECOND, 0);
-		}
-
-		GridLayout gridLayout = new GridLayout();
-		if (includeTime) {
-			gridLayout.numColumns = 2;
-		} else {
-			gridLayout.numColumns = 2;
-		}
-		this.setLayout(gridLayout);
-
-		calendar = new DateTime(this, SWT.CALENDAR);
-		calendar.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				date.set(Calendar.YEAR, calendar.getYear());
-				date.set(Calendar.MONTH, calendar.getMonth());
-				date.set(Calendar.DAY_OF_MONTH, calendar.getDay());
-				setSelection(new DateSelection(date));
-				notifyListeners(new SelectionChangedEvent(DatePickerPanel.this, getSelection()));
-			}
-		});
-
-		if (includeTime) {
-			createTimeList(this);
-		}
-	}
-
-	/**
-	 * This method initializes the month combo
-	 * 
-	 */
-	private void createTimeList(Composite composite) {
-
-		DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT);
-		Calendar tempCalendar = Calendar.getInstance();
-		tempCalendar.set(Calendar.MINUTE, 0);
-		tempCalendar.set(Calendar.SECOND, 0);
-		String[] times = new String[24];
-		for (int x = 0; x < 24; x++) {
-			tempCalendar.set(Calendar.HOUR_OF_DAY, x);
-			String timeString = dateFormat.format(tempCalendar.getTime());
-			times[x] = timeString;
-		}
-
-		ListViewer listViewer = new ListViewer(composite);
-
-		listViewer.setContentProvider(new ArrayContentProvider());
-		listViewer.setInput(times);
-
-		timeList = listViewer.getList();
-
-		listViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				date.set(Calendar.HOUR_OF_DAY, timeList.getSelectionIndex());
-				date.set(Calendar.MINUTE, 0);
-				setSelection(new DateSelection(date));
-				notifyListeners(new SelectionChangedEvent(DatePickerPanel.this, getSelection()));
-			}
-		});
-
-		GridDataFactory.fillDefaults().hint(SWT.DEFAULT, 150).grab(false, true).applyTo(timeList);
-		if (date != null) {
-			listViewer.setSelection(new StructuredSelection(times[date.get(Calendar.HOUR_OF_DAY)]), true);
-		} else {
-			listViewer.setSelection(new StructuredSelection(times[8]), true);
-		}
-		timeList.addKeyListener(this);
-	}
-
-	public void setDate(Calendar date) {
-		this.date = date;
-		calendar.setYear(date.get(Calendar.YEAR));
-		calendar.setMonth(date.get(Calendar.MONTH));
-		calendar.setDay(date.get(Calendar.DAY_OF_MONTH));
-	}
-
-	public void keyPressed(KeyEvent e) {
-		if (e.keyCode == SWT.ESC) {
-			SelectionChangedEvent changeEvent = new SelectionChangedEvent(this, new ISelection() {
-				public boolean isEmpty() {
-					return true;
-				}
-			});
-			notifyListeners(changeEvent);
-		}
-	}
-
-	public void keyReleased(KeyEvent e) {
-	}
-
-	private void notifyListeners(SelectionChangedEvent event) {
-		for (ISelectionChangedListener listener : selectionListeners) {
-			listener.selectionChanged(event);
-		}
-	}
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionListeners.add(listener);
-	}
-
-	public ISelection getSelection() {
-		return selection;
-	}
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionListeners.remove(listener);
-	}
-
-	public void setSelection(ISelection selection) {
-		this.selection = selection;
-	}
-
-	public class DateSelection implements ISelection {
-		private final Calendar date;
-
-		public DateSelection(Calendar calendar) {
-			date = calendar;
-		}
-
-		public boolean isEmpty() {
-			return date == null;
-		}
-
-		public Calendar getDate() {
-			return date;
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DateSelectionDialog.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DateSelectionDialog.java
deleted file mode 100644
index f81252b..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DateSelectionDialog.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.mylyn.internal.provisional.commons.ui.DatePickerPanel.DateSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Ken Sueda
- * @author Mik Kersten
- * @author Rob Elves
- */
-public class DateSelectionDialog extends Dialog {
-
-	private Date selectedDate = null;
-
-	private String title = Messages.DateSelectionDialog_Date_Selection;
-
-	private final Calendar initialCalendar = Calendar.getInstance();
-
-	private boolean includeTime = true;
-
-	private int hourOfDay = 0;
-
-	public DateSelectionDialog(Shell parentShell, Calendar initialDate, String title, boolean includeTime, int hourOfDay) {
-		super(parentShell);
-		this.includeTime = includeTime;
-		this.hourOfDay = hourOfDay;
-		if (title != null) {
-			this.title = title;
-		}
-		if (initialDate != null) {
-			this.initialCalendar.setTime(initialDate.getTime());
-		}
-		selectedDate = initialCalendar.getTime();
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText(title);
-		final DatePickerPanel datePanel = new DatePickerPanel(parent, SWT.NULL, initialCalendar, includeTime, hourOfDay);
-		datePanel.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					DateSelection dateSelection = (DateSelection) event.getSelection();
-					selectedDate = dateSelection.getDate().getTime();
-				}
-			}
-		});
-
-		datePanel.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
-
-		applyDialogFont(datePanel);
-		return datePanel;
-	}
-
-	@Override
-	public boolean close() {
-		return super.close();
-	}
-
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.CLIENT_ID + 1, Messages.DateSelectionDialog_Clear, false);
-		super.createButtonsForButtonBar(parent);
-	}
-
-	@Override
-	protected void buttonPressed(int buttonId) {
-		super.buttonPressed(buttonId);
-		if (buttonId == IDialogConstants.CLIENT_ID + 1) {
-			selectedDate = null;
-			okPressed();
-		}
-	}
-
-	public Date getDate() {
-		return selectedDate;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DelayedRefreshJob.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DelayedRefreshJob.java
deleted file mode 100644
index a637627..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/DelayedRefreshJob.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-
-import org.eclipse.core.runtime.Assert;
-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.jface.viewers.StructuredViewer;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * TODO use extensible deltas instead of Objects for refresh
- * 
- * @author Steffen Pingel
- * @author Mik Kersten
- */
-public abstract class DelayedRefreshJob extends WorkbenchJob {
-
-	static final long REFRESH_DELAY_DEFAULT = 200;
-
-	static final long REFRESH_DELAY_MAX = REFRESH_DELAY_DEFAULT * 2;
-
-	// FIXME make private
-	protected final StructuredViewer viewer;
-
-	private static final int NOT_SCHEDULED = -1;
-
-	private final LinkedHashSet<Object> queue = new LinkedHashSet<Object>();
-
-	private long scheduleTime = NOT_SCHEDULED;
-
-	public DelayedRefreshJob(StructuredViewer viewer, String name) {
-		super(name);
-		Assert.isNotNull(viewer);
-		this.viewer = viewer;
-		setSystem(true);
-	}
-
-	// XXX needs to be called from UI thread
-	public void refreshNow() {
-		queue.add(null);
-		runInUIThread(new NullProgressMonitor());
-	}
-
-	public synchronized void refresh() {
-		refreshElement(null);
-	}
-
-	public synchronized void refreshElements(Object[] elements) {
-		queue.addAll(Arrays.asList(elements));
-		if (scheduleTime == NOT_SCHEDULED) {
-			scheduleTime = System.currentTimeMillis();
-			schedule(REFRESH_DELAY_DEFAULT);
-		} else if (System.currentTimeMillis() - scheduleTime < REFRESH_DELAY_MAX - REFRESH_DELAY_DEFAULT) {
-			// reschedule to aggregate more refreshes
-			cancel();
-			schedule(REFRESH_DELAY_DEFAULT);
-		}
-	}
-
-	public synchronized void refreshElement(Object element) {
-		refreshElements(new Object[] { element });
-	}
-
-	@Override
-	public IStatus runInUIThread(IProgressMonitor monitor) {
-		if (viewer.getControl() == null || viewer.getControl().isDisposed()) {
-			return Status.CANCEL_STATUS;
-		}
-
-		final Object[] items;
-		synchronized (this) {
-			if (queue.contains(null)) {
-				items = null;
-			} else {
-				items = queue.toArray(new Object[0]);
-			}
-			queue.clear();
-			scheduleTime = NOT_SCHEDULED;
-		}
-
-		doRefresh(items);
-
-		return Status.OK_STATUS;
-	}
-
-	protected abstract void doRefresh(final Object[] items);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientCanvas.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientCanvas.java
deleted file mode 100644
index fe46788..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/GradientCanvas.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Tasktop Technologies - extracted FormHeading implementation for Mylyn
- *******************************************************************************/
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.Hashtable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.forms.IFormColors;
-
-/**
- * Based on {@link org.eclipse.ui.internal.forms.widgets.FormHeading}.
- */
-@SuppressWarnings("restriction")
-public class GradientCanvas extends Canvas {
-
-	private static final int SEPARATOR = 1 << 1;
-
-	private static final int BOTTOM_SEPARATOR = 1 << 2;
-
-	private static final int BACKGROUND_IMAGE_TILED = 1 << 3;
-
-	public static final String COLOR_BASE_BG = "baseBg"; //$NON-NLS-1$
-
-	private Image backgroundImage;
-
-	private Image gradientImage;
-
-	@SuppressWarnings("unchecked")
-	Hashtable colors = new Hashtable();
-
-	private int flags;
-
-	private GradientInfo gradientInfo;
-
-	private class GradientInfo {
-		Color[] gradientColors;
-
-		int[] percents;
-
-		boolean vertical;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#forceFocus()
-	 */
-	@Override
-	public boolean forceFocus() {
-		return false;
-	}
-
-	/**
-	 * Creates the form content control as a child of the provided parent.
-	 * 
-	 * @param parent
-	 *            the parent widget
-	 */
-	public GradientCanvas(Composite parent, int style) {
-		super(parent, style);
-		setBackgroundMode(SWT.INHERIT_DEFAULT);
-		setSeparatorAlignment(SWT.BOTTOM);
-		addListener(SWT.Paint, new Listener() {
-			public void handleEvent(Event e) {
-				onPaint(e.gc);
-			}
-		});
-		addListener(SWT.Dispose, new Listener() {
-			public void handleEvent(Event e) {
-				if (gradientImage != null) {
-					// TODO e3.4 FormImages.getInstance().markFinished(gradientImage);
-					gradientImage.dispose();
-					gradientImage = null;
-				}
-			}
-		});
-		addListener(SWT.Resize, new Listener() {
-			public void handleEvent(Event e) {
-				if (gradientInfo != null || (backgroundImage != null && !isBackgroundImageTiled())) {
-					updateGradientImage();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Sets the background color of the header.
-	 */
-	@Override
-	public void setBackground(Color bg) {
-		super.setBackground(bg);
-		internalSetBackground(bg);
-	}
-
-	private void internalSetBackground(Color bg) {
-		putColor(COLOR_BASE_BG, bg);
-	}
-
-	public void setBackgroundGradient(Color[] gradientColors, int[] percents, boolean vertical) {
-		if (gradientColors != null) {
-			gradientInfo = new GradientInfo();
-			gradientInfo.gradientColors = gradientColors;
-			gradientInfo.percents = percents;
-			gradientInfo.vertical = vertical;
-			setBackground(null);
-			updateGradientImage();
-		} else {
-			// reset
-			gradientInfo = null;
-			if (gradientImage != null) {
-				// TODO e3.4 FormImages.getInstance().markFinished(gradientImage);
-				gradientImage.dispose();
-				gradientImage = null;
-				setBackgroundImage(null);
-			}
-		}
-	}
-
-	public void setHeadingBackgroundImage(Image image) {
-		this.backgroundImage = image;
-		if (image != null) {
-			setBackground(null);
-		}
-		if (isBackgroundImageTiled()) {
-			setBackgroundImage(image);
-		} else {
-			updateGradientImage();
-		}
-	}
-
-	public Image getHeadingBackgroundImage() {
-		return backgroundImage;
-	}
-
-	public void setBackgroundImageTiled(boolean tiled) {
-		if (tiled) {
-			flags |= BACKGROUND_IMAGE_TILED;
-		} else {
-			flags &= ~BACKGROUND_IMAGE_TILED;
-		}
-		setHeadingBackgroundImage(this.backgroundImage);
-	}
-
-	public boolean isBackgroundImageTiled() {
-		return (flags & BACKGROUND_IMAGE_TILED) != 0;
-	}
-
-	@Override
-	public void setBackgroundImage(Image image) {
-		super.setBackgroundImage(image);
-		if (image != null) {
-			internalSetBackground(null);
-		}
-	}
-
-	private void onPaint(GC gc) {
-		if (!isSeparatorVisible() && getBackgroundImage() == null) {
-			return;
-		}
-		Rectangle carea = getClientArea();
-		Image buffer = new Image(getDisplay(), carea.width, carea.height);
-		buffer.setBackground(getBackground());
-		GC igc = new GC(buffer);
-		igc.setBackground(getBackground());
-		igc.fillRectangle(0, 0, carea.width, carea.height);
-		if (getBackgroundImage() != null) {
-			if (gradientInfo != null) {
-				drawBackground(igc, carea.x, carea.y, carea.width, carea.height);
-			} else {
-				Image bgImage = getBackgroundImage();
-				Rectangle ibounds = bgImage.getBounds();
-				drawBackground(igc, carea.x, carea.y, ibounds.width, ibounds.height);
-			}
-		}
-
-		if (isSeparatorVisible()) {
-			// bg separator
-			if (hasColor(IFormColors.H_BOTTOM_KEYLINE1)) {
-				igc.setForeground(getColor(IFormColors.H_BOTTOM_KEYLINE1));
-			} else {
-				igc.setForeground(getBackground());
-			}
-			if (getSeparatorAlignment() == SWT.BOTTOM) {
-				igc.drawLine(carea.x, carea.height - 2, carea.x + carea.width - 1, carea.height - 2);
-			} else {
-				igc.drawLine(carea.x, 1, carea.x + carea.width - 1, 1);
-			}
-			if (hasColor(IFormColors.H_BOTTOM_KEYLINE2)) {
-				igc.setForeground(getColor(IFormColors.H_BOTTOM_KEYLINE2));
-			} else {
-				igc.setForeground(getForeground());
-			}
-			if (getSeparatorAlignment() == SWT.BOTTOM) {
-				igc.drawLine(carea.x, carea.height - 1, carea.x + carea.width - 1, carea.height - 1);
-			} else {
-				igc.drawLine(carea.x, 0, carea.x + carea.width - 1, 0);
-			}
-		}
-		igc.dispose();
-		gc.drawImage(buffer, carea.x, carea.y);
-		buffer.dispose();
-	}
-
-	private void updateGradientImage() {
-		Rectangle rect = getBounds();
-		if (gradientImage != null) {
-			// TODO e3.4 FormImages.getInstance().markFinished(gradientImage);
-			gradientImage.dispose();
-			gradientImage = null;
-		}
-		if (gradientInfo != null) {
-			// TODO e3.4 use FormImages
-//			gradientImage = FormImages.getInstance().getGradient(gradientInfo.gradientColors, gradientInfo.percents,
-//					gradientInfo.vertical ? rect.height : rect.width, gradientInfo.vertical, getColor(COLOR_BASE_BG));
-			boolean vertical = gradientInfo.vertical;
-			int width = vertical ? 1 : rect.width;
-			int height = vertical ? rect.height : 1;
-			gradientImage = new Image(getDisplay(), Math.max(width, 1), Math.max(height, 1));
-			GC gc = new GC(gradientImage);
-			drawTextGradient(gc, width, height);
-			gc.dispose();
-		} else if (backgroundImage != null && !isBackgroundImageTiled()) {
-			gradientImage = new Image(getDisplay(), Math.max(rect.width, 1), Math.max(rect.height, 1));
-			gradientImage.setBackground(getBackground());
-			GC gc = new GC(gradientImage);
-			gc.drawImage(backgroundImage, 0, 0);
-			gc.dispose();
-		}
-		setBackgroundImage(gradientImage);
-	}
-
-	// TODO e3.4 remove, use FormImages
-	private void drawTextGradient(GC gc, int width, int height) {
-		final Color oldBackground = gc.getBackground();
-		if (gradientInfo.gradientColors.length == 1) {
-			if (gradientInfo.gradientColors[0] != null) {
-				gc.setBackground(gradientInfo.gradientColors[0]);
-			}
-			gc.fillRectangle(0, 0, width, height);
-		} else {
-			final Color oldForeground = gc.getForeground();
-			Color lastColor = gradientInfo.gradientColors[0];
-			if (lastColor == null) {
-				lastColor = oldBackground;
-			}
-			int pos = 0;
-			for (int i = 0; i < gradientInfo.percents.length; ++i) {
-				gc.setForeground(lastColor);
-				lastColor = gradientInfo.gradientColors[i + 1];
-				if (lastColor == null) {
-					lastColor = oldBackground;
-				}
-				gc.setBackground(lastColor);
-				if (gradientInfo.vertical) {
-					final int gradientHeight = (gradientInfo.percents[i] * height / 100) - pos;
-					gc.fillGradientRectangle(0, pos, width, gradientHeight, true);
-					pos += gradientHeight;
-				} else {
-					final int gradientWidth = (gradientInfo.percents[i] * width / 100) - pos;
-					gc.fillGradientRectangle(pos, 0, gradientWidth, height, false);
-					pos += gradientWidth;
-				}
-			}
-			if (gradientInfo.vertical && pos < height) {
-				gc.setBackground(getColor(COLOR_BASE_BG));
-				gc.fillRectangle(0, pos, width, height - pos);
-			}
-			if (!gradientInfo.vertical && pos < width) {
-				gc.setBackground(getColor(COLOR_BASE_BG));
-				gc.fillRectangle(pos, 0, width - pos, height);
-			}
-			gc.setForeground(oldForeground);
-		}
-	}
-
-	public boolean isSeparatorVisible() {
-		return (flags & SEPARATOR) != 0;
-	}
-
-	public void setSeparatorVisible(boolean addSeparator) {
-		if (addSeparator) {
-			flags |= SEPARATOR;
-		} else {
-			flags &= ~SEPARATOR;
-		}
-	}
-
-	public void setSeparatorAlignment(int alignment) {
-		if (alignment == SWT.BOTTOM) {
-			flags |= BOTTOM_SEPARATOR;
-		} else {
-			flags &= ~BOTTOM_SEPARATOR;
-		}
-	}
-
-	public int getSeparatorAlignment() {
-		return (flags & BOTTOM_SEPARATOR) != 0 ? SWT.BOTTOM : SWT.TOP;
-	}
-
-	@SuppressWarnings("unchecked")
-	public void putColor(String key, Color color) {
-		if (color == null) {
-			colors.remove(key);
-		} else {
-			colors.put(key, color);
-		}
-	}
-
-	public Color getColor(String key) {
-		return (Color) colors.get(key);
-	}
-
-	public boolean hasColor(String key) {
-		return colors.containsKey(key);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ICoreRunnable.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ICoreRunnable.java
deleted file mode 100644
index a999e73..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ICoreRunnable.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author Steffen Pingel
- */
-public interface ICoreRunnable {
-
-	public void run(IProgressMonitor monitor) throws CoreException;
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/IFilteredTreeListener.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/IFilteredTreeListener.java
deleted file mode 100644
index 5f17b30..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/IFilteredTreeListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-/**
- * @author Mik Kersten
- */
-public interface IFilteredTreeListener {
-
-	public void filterTextChanged(String text);
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScalingHyperlink.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScalingHyperlink.java
deleted file mode 100644
index ebe8a1c..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScalingHyperlink.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-
-/**
- * Enhanced {@link ImageHyperlink} that truncates the link text at the end rather than the middle if it is wider than
- * the available space. Also provides default color and underline on hover.
- * 
- * @author Leo Dos Santos
- * @author Mik Kersten
- * @since 3.0
- */
-public class ScalingHyperlink extends ImageHyperlink {
-
-	private boolean strikeThrough;
-
-	protected final MouseTrackListener MOUSE_TRACK_LISTENER = new MouseTrackListener() {
-
-		public void mouseEnter(MouseEvent e) {
-			setUnderlined(true);
-		}
-
-		public void mouseExit(MouseEvent e) {
-			setUnderlined(false);
-		}
-
-		public void mouseHover(MouseEvent e) {
-		}
-	};
-
-	public ScalingHyperlink(Composite parent, int style) {
-		super(parent, style);
-	}
-
-	@Override
-	public void dispose() {
-		removeMouseTrackListener(MOUSE_TRACK_LISTENER);
-		super.dispose();
-	}
-
-	public boolean isStrikeThrough() {
-		return strikeThrough;
-	}
-
-	@Override
-	protected void paintText(GC gc, Rectangle bounds) {
-		super.paintText(gc, bounds);
-		if (strikeThrough) {
-			Point totalSize = computeTextSize(SWT.DEFAULT, SWT.DEFAULT);
-			int textWidth = Math.min(bounds.width, totalSize.x);
-			int textHeight = totalSize.y;
-
-			//			int descent = gc.getFontMetrics().getDescent();
-			int lineY = bounds.y + (textHeight / 2); // - descent + 1;
-			gc.drawLine(bounds.x, lineY, bounds.x + textWidth, lineY);
-		}
-	}
-
-	public void setStrikeThrough(boolean strikethrough) {
-		this.strikeThrough = strikethrough;
-	}
-
-	@Override
-	protected String shortenText(GC gc, String t, int width) {
-		if (t == null) {
-			return null;
-		}
-
-		if ((getStyle() & SWT.SHORT) != 0) {
-			return t;
-		}
-
-		String returnText = t;
-		if (gc.textExtent(t).x > width) {
-			for (int i = t.length(); i > 0; i--) {
-				String test = t.substring(0, i);
-				test = test + "..."; //$NON-NLS-1$
-				if (gc.textExtent(test).x < width) {
-					returnText = test;
-					break;
-				}
-			}
-		}
-		return returnText;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScreenshotCreationPage.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScreenshotCreationPage.java
deleted file mode 100644
index b623f8a..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/ScreenshotCreationPage.java
+++ /dev/null
@@ -1,923 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Balazs Brinkus - initial API and implementation
- *     Tasktop Technologies - improvements
- *     Willian Mitsuda - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylyn.internal.commons.ui.ColorSelectionWindow;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Region;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * NOTE: this class exposes a lot of implementation detial and is likely to change.
- * 
- * A wizard page to create a screenshot from the display.
- * 
- * @author Balazs Brinkus (bug 160572)
- * @author Mik Kersten
- * @author Willian Mitsuda
- */
-public class ScreenshotCreationPage extends WizardPage {
-
-	private IAction captureAction;
-
-	private IAction fitAction;
-
-	private IAction cropAction;
-
-	private IAction markAction;
-
-	private IAction colorAction;
-
-	private Image colorIcon;
-
-	private Color markColor;
-
-	private IAction clearAction;
-
-	private boolean imageDirty;
-
-	/**
-	 * Original screenshot image; used for backup purposes
-	 */
-	private Image originalImage;
-
-	/**
-	 * Copy of {@link #originalImage original} image; all drawing operations are done here; base for the result image
-	 */
-	private Image workImage;
-
-	/**
-	 * Used to draw into {@link #workImage}
-	 */
-	private GC workImageGC;
-
-	private Canvas canvas;
-
-	private ScrolledComposite scrolledComposite;
-
-	/**
-	 * Stores the selection rectangle; this value is normalized to real image coordinates, no matter the zoom level (see
-	 * {@link #scaleFactor})
-	 */
-	private Rectangle currentSelection;
-
-	/**
-	 * Stores the original selection rectangle, before a selection resize/move operation starts
-	 */
-	private Rectangle originalSelection;
-
-	/**
-	 * Temporary storage for selection start point, selection resizing initial reference point or previous mark point
-	 * (it depends on current tool); this value is normalized to real image coordinates, no matter the zoom level (see
-	 * {@link #scaleFactor})
-	 */
-	private Point startPoint;
-
-	/**
-	 * What sides I'm resizing when doing an selection {@link EditorAction#RESIZING_SELECTION resize}
-	 */
-	private Set<SelectionSide> resizableSides = EnumSet.noneOf(SelectionSide.class);
-
-	/**
-	 * Scale factor of displayed image compared to the original image
-	 */
-	private double scaleFactor = 1.0;
-
-	/**
-	 * Manages allocated cursors
-	 */
-	private final Map<Integer, Cursor> cursors = new HashMap<Integer, Cursor>();
-
-	/**
-	 * Available actions for the screenshot editor
-	 */
-	private static enum EditorAction {
-
-		CROPPING, SELECTING, RESIZING_SELECTION, MOVING_SELECTION, MARKING;
-
-	};
-
-	/**
-	 * What am I doing now?
-	 */
-	private EditorAction currentAction = EditorAction.CROPPING;
-
-	public ScreenshotCreationPage() {
-		super("ScreenShotAttachment"); //$NON-NLS-1$
-		setTitle(Messages.ScreenshotCreationPage_CAPTURE_SCRRENSHOT);
-		setDescription(Messages.ScreenshotCreationPage_After_capturing
-				+ Messages.ScreenshotCreationPage_NOTE_THAT_YOU_CONTINUTE);
-	}
-
-	public void createControl(Composite parent) {
-		ViewForm vf = new ViewForm(parent, SWT.BORDER | SWT.FLAT);
-		vf.horizontalSpacing = 0;
-		vf.verticalSpacing = 0;
-		setControl(vf);
-		vf.setLayoutData(GridDataFactory.fillDefaults().create());
-
-		allocateCursors();
-
-		// TODO: need disabled versions of all toolbar icons
-		ToolBarManager tbm = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL | SWT.RIGHT);
-		captureAction = new Action(Messages.ScreenshotCreationPage_Capture_Desktop_C, IAction.AS_PUSH_BUTTON) {
-
-			private boolean isFirstCapture = true;
-
-			@Override
-			public void run() {
-				captureScreenshotContent();
-				setErrorMessage(null);
-				if (isFirstCapture) {
-					isFirstCapture = false;
-					fitAction.setEnabled(true);
-					cropAction.setEnabled(true);
-					cropAction.setChecked(true);
-					markAction.setEnabled(true);
-					clearAction.setEnabled(false);
-				}
-			}
-
-		};
-		captureAction.setToolTipText(Messages.ScreenshotCreationPage_Capture_Desktop);
-		captureAction.setImageDescriptor(ImageDescriptor.createFromImage(CommonImages.getImage(CommonImages.IMAGE_CAPTURE)));
-
-//		captureDelayedButton = new Button(buttonsComposite, SWT.PUSH);
-//		final String captureIn = "Capture in ";
-//		final int secondsDelay = 1;
-//		captureDelayedButton.setText(captureIn + secondsDelay +" seconds");
-//		captureDelayedButton.setImage(TasksUiImages.getImage(TasksUiImages.IMAGE_CAPTURE));
-//		captureDelayedButton.addSelectionListener(new SelectionListener() {
-//
-//			public void widgetSelected(SelectionEvent e) {
-//				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-//					public void run() {
-//						getShell().setVisible(false);
-//						for (int i = 1; i <= secondsDelay; i++) {
-//							try {
-//								Thread.sleep(1000);
-////								captureDelayedButton.setText("Capture in " + (secondsDelay-i) + " seconds");
-//							} catch (InterruptedException e1) {
-//								// ignore
-//							}	
-//						}
-//						captureScreenshotContent();
-//						page.setErrorMessage(null);
-//						fitButton.setEnabled(true);
-//						captureDelayedButton.setText(captureIn + secondsDelay +" seconds");			
-//						getShell().setVisible(true);
-//					}
-//				});
-//			}
-//
-//			public void widgetDefaultSelected(SelectionEvent e) {
-//				//ignore
-//			}
-//		});
-
-		fitAction = new Action("", IAction.AS_CHECK_BOX) { //$NON-NLS-1$
-			@Override
-			public void run() {
-				refreshCanvasSize();
-			}
-		};
-		fitAction.setToolTipText(Messages.ScreenshotCreationPage_Fit_Image);
-		fitAction.setText(Messages.ScreenshotCreationPage_Fit_Image_F);
-		fitAction.setImageDescriptor(ImageDescriptor.createFromImage(CommonImages.getImage(CommonImages.IMAGE_FIT)));
-		fitAction.setChecked(true);
-		fitAction.setEnabled(false);
-
-		cropAction = new Action(Messages.ScreenshotCreationPage_Crop_R, IAction.AS_RADIO_BUTTON) {
-			@Override
-			public void run() {
-				currentAction = EditorAction.CROPPING;
-				cropAction.setChecked(true);
-				markAction.setChecked(false);
-				colorAction.setEnabled(false);
-				canvas.redraw();
-			}
-		};
-		cropAction.setToolTipText(Messages.ScreenshotCreationPage_Crop);
-		cropAction.setImageDescriptor(CommonImages.CUT);
-		cropAction.setEnabled(false);
-
-		markAction = new Action(Messages.ScreenshotCreationPage_Annotate, IAction.AS_RADIO_BUTTON) {
-			@Override
-			public void run() {
-				currentAction = EditorAction.MARKING;
-				cropAction.setChecked(false);
-				markAction.setChecked(true);
-				colorAction.setEnabled(true);
-				canvas.redraw();
-			}
-		};
-		markAction.setToolTipText(Messages.ScreenshotCreationPage_DRAW_ANNOTATION_ON_SCREENSHOT_IMAGE);
-		markAction.setImageDescriptor(CommonImages.EDIT);
-//		markAction.setDisabledImageDescriptor(ImageDescriptor.createFromFile(getClass(), "mark_disabled.gif"));
-		markAction.setEnabled(false);
-
-		colorAction = new Action("", IAction.AS_DROP_DOWN_MENU) { //$NON-NLS-1$
-			@Override
-			public void runWithEvent(final Event e) {
-				final ColorSelectionWindow colorWindow = new ColorSelectionWindow(getControl().getShell()) {
-
-					@Override
-					protected Point getInitialLocation(Point initialSize) {
-						ToolItem toolItem = (ToolItem) e.widget;
-						Rectangle itemBounds = toolItem.getBounds();
-						Point location = toolItem.getParent().toDisplay(itemBounds.x + itemBounds.width,
-								itemBounds.y + itemBounds.height);
-						location.x -= initialSize.x;
-						return location;
-					}
-
-				};
-				colorWindow.setBlockOnOpen(true);
-				colorWindow.open();
-				RGB color = colorWindow.getSelectedRGB();
-				if (color != null) {
-					setMarkColor(color);
-				}
-			}
-		};
-		colorAction.setToolTipText(Messages.ScreenshotCreationPage_Change_pen_color);
-		colorIcon = new Image(getShell().getDisplay(), 16, 16);
-		setMarkColor(new RGB(255, 85, 85));
-		colorAction.setEnabled(false);
-
-		clearAction = new Action(Messages.ScreenshotCreationPage_Clear_Annotations, IAction.AS_PUSH_BUTTON) {
-			@Override
-			public void run() {
-				clearAction.setEnabled(false);
-				workImageGC.drawImage(originalImage, 0, 0);
-				canvas.redraw();
-				setImageDirty(true);
-			}
-		};
-		clearAction.setToolTipText(Messages.ScreenshotCreationPage_Clear_all_annotations_made_on_screenshot_image);
-		clearAction.setImageDescriptor(CommonImages.CLEAR);
-		clearAction.setEnabled(false);
-
-		tbm.add(createAndConfigureCI(captureAction));
-		tbm.add(createAndConfigureCI(fitAction));
-		tbm.add(new Separator());
-		tbm.add(createAndConfigureCI(cropAction));
-		tbm.add(createAndConfigureCI(markAction));
-		tbm.add(createAndConfigureCI(colorAction));
-		tbm.add(new Separator());
-		tbm.add(createAndConfigureCI(clearAction));
-
-		scrolledComposite = new ScrolledComposite(vf, SWT.V_SCROLL | SWT.H_SCROLL);
-		canvas = new Canvas(scrolledComposite, SWT.DOUBLE_BUFFERED);
-		scrolledComposite.setContent(canvas);
-		canvas.addPaintListener(new PaintListener() {
-
-			public void paintControl(PaintEvent e) {
-				if (workImage != null) {
-					Rectangle imageBounds = workImage.getBounds();
-					Rectangle canvasBounds = canvas.getClientArea();
-
-					if (fitAction.isChecked()) {
-						e.gc.drawImage(workImage, 0, 0, imageBounds.width, imageBounds.height, 0, 0,
-								canvasBounds.width, canvasBounds.height);
-					} else {
-						e.gc.drawImage(workImage, 0, 0);
-					}
-					drawSelection(e.gc);
-				} else {
-//					page.setErrorMessage("Screenshot required");
-					fitAction.setEnabled(false);
-				}
-			}
-		});
-
-		scrolledComposite.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				if (fitAction.isChecked()) {
-					refreshCanvasSize();
-				}
-			}
-		});
-		scrolledComposite.setEnabled(false);
-
-		vf.setTopLeft(tbm.createControl(vf));
-		vf.setContent(scrolledComposite);
-		registerMouseListeners();
-
-		Dialog.applyDialogFont(vf);
-	}
-
-	private ActionContributionItem createAndConfigureCI(IAction action) {
-		ActionContributionItem ci = new ActionContributionItem(action);
-		ci.setMode(ActionContributionItem.MODE_FORCE_TEXT);
-		return ci;
-	}
-
-	private void setMarkColor(RGB color) {
-		if (markColor != null) {
-			markColor.dispose();
-		}
-		markColor = new Color(getShell().getDisplay(), color);
-		if (workImageGC != null) {
-			workImageGC.setForeground(markColor);
-		}
-
-		GC colorGC = new GC(colorIcon);
-		colorGC.setBackground(markColor);
-		colorGC.fillRectangle(0, 0, 16, 16);
-		colorGC.drawRectangle(0, 0, 15, 15);
-		colorGC.dispose();
-
-		colorAction.setImageDescriptor(ImageDescriptor.createFromImage(colorIcon));
-	}
-
-	@Override
-	public void dispose() {
-		disposeImageResources();
-		if (markColor != null) {
-			markColor.dispose();
-		}
-		if (colorIcon != null) {
-			colorIcon.dispose();
-		}
-
-		canvas.setCursor(null);
-		for (Cursor cursor : cursors.values()) {
-			cursor.dispose();
-		}
-		super.dispose();
-	}
-
-	private void disposeImageResources() {
-		if (originalImage != null) {
-			originalImage.dispose();
-		}
-		if (workImageGC != null) {
-			workImageGC.dispose();
-		}
-		if (workImage != null) {
-			workImage.dispose();
-		}
-	}
-
-	private static final int CURSOR_MARK_TOOL = -1;
-
-	private static final long CAPTURE_DELAY = 400;
-
-	private void allocateCursors() {
-		Display display = getShell().getDisplay();
-		cursors.put(SWT.CURSOR_ARROW, new Cursor(display, SWT.CURSOR_ARROW));
-		cursors.put(SWT.CURSOR_SIZEALL, new Cursor(display, SWT.CURSOR_SIZEALL));
-		cursors.put(SWT.CURSOR_SIZENWSE, new Cursor(display, SWT.CURSOR_SIZENWSE));
-		cursors.put(SWT.CURSOR_SIZENESW, new Cursor(display, SWT.CURSOR_SIZENESW));
-		cursors.put(SWT.CURSOR_SIZENS, new Cursor(display, SWT.CURSOR_SIZENS));
-		cursors.put(SWT.CURSOR_SIZEWE, new Cursor(display, SWT.CURSOR_SIZEWE));
-		cursors.put(SWT.CURSOR_CROSS, new Cursor(display, SWT.CURSOR_CROSS));
-
-		// TODO: allocate custom cursor for "mark" tool
-		cursors.put(CURSOR_MARK_TOOL, new Cursor(display, SWT.CURSOR_HAND));
-	}
-
-	private Rectangle getScaledSelection() {
-		if (currentSelection == null) {
-			return null;
-		}
-		int x = (int) Math.round(currentSelection.x * scaleFactor);
-		int y = (int) Math.round(currentSelection.y * scaleFactor);
-		int right = (int) Math.round((currentSelection.x + currentSelection.width) * scaleFactor);
-		int bottom = (int) Math.round((currentSelection.y + currentSelection.height) * scaleFactor);
-		int width = Math.min(right, (int) Math.round((workImage.getBounds().width - 1) * scaleFactor)) - x;
-		int height = Math.min(bottom, (int) Math.round((workImage.getBounds().height - 1) * scaleFactor)) - y;
-		return new Rectangle(x, y, width, height);
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		return workImage != null;
-	}
-
-	@Override
-	public boolean canFlipToNextPage() {
-		return isPageComplete();
-	}
-
-	private void captureScreenshotContent() {
-		final Display display = getShell().getDisplay();
-		final Shell wizardShell = getWizard().getContainer().getShell();
-		wizardShell.setVisible(false);
-
-		// this code needs to run asynchronously to allow the workbench to refresh before the screen is captured  
-		UIJob job = new UIJob("Capturing Screenshot") { //$NON-NLS-1$
-
-			@Override
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				disposeImageResources();
-				Rectangle displayBounds = display.getBounds();
-				originalImage = new Image(display, displayBounds.width, displayBounds.height);
-				workImage = new Image(display, displayBounds.width, displayBounds.height);
-
-				GC gc = new GC(display);
-				gc.copyArea(originalImage, displayBounds.x, displayBounds.y);
-				gc.copyArea(workImage, displayBounds.x, displayBounds.y);
-				gc.dispose();
-
-				workImageGC = new GC(workImage);
-				workImageGC.setForeground(markColor);
-				workImageGC.setLineWidth(4);
-				workImageGC.setLineCap(SWT.CAP_ROUND);
-
-				scrolledComposite.setEnabled(true);
-				clearSelection();
-				refreshCanvasSize();
-
-				wizardShell.setVisible(true);
-				setPageComplete(true);
-
-				return Status.OK_STATUS;
-			}
-		};
-		// NOTE: need a wait since the shell can take time to disappear (e.g. fade on Vista)
-		job.schedule(CAPTURE_DELAY);
-	}
-
-	/**
-	 * Sets the selection rectangle based on the initial selection start point previously set in {@link #startPoint} and
-	 * the end point passed as parameters to this method
-	 * <p>
-	 * The coordinates are based on the real image coordinates
-	 */
-	private void refreshCurrentSelection(int x, int y) {
-		int startX = Math.min(startPoint.x, x);
-		int startY = Math.min(startPoint.y, y);
-		int width = Math.abs(startPoint.x - x);
-		int height = Math.abs(startPoint.y - y);
-		currentSelection = new Rectangle(startX, startY, width, height);
-
-		// Decreases 1 pixel size from original image because Rectangle.intersect() consider them as right-bottom limit
-		Rectangle imageBounds = workImage.getBounds();
-		imageBounds.width--;
-		imageBounds.height--;
-		currentSelection.intersect(imageBounds);
-	}
-
-	/**
-	 * Create the grab points to resize the selection; this method should be called every time the selection or zoom
-	 * level is changed
-	 */
-	private void setUpGrabPoints() {
-		grabPoints.clear();
-		if (currentSelection == null) {
-			return;
-		}
-
-		Rectangle scaledSelection = getScaledSelection();
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x, scaledSelection.y, SWT.CURSOR_SIZENWSE, EnumSet.of(
-				SelectionSide.LEFT, SelectionSide.TOP)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x + scaledSelection.width / 2, scaledSelection.y,
-				SWT.CURSOR_SIZENS, EnumSet.of(SelectionSide.TOP)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x + scaledSelection.width, scaledSelection.y,
-				SWT.CURSOR_SIZENESW, EnumSet.of(SelectionSide.TOP, SelectionSide.RIGHT)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x, scaledSelection.y + scaledSelection.height / 2,
-				SWT.CURSOR_SIZEWE, EnumSet.of(SelectionSide.LEFT)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x + scaledSelection.width, scaledSelection.y
-				+ scaledSelection.height / 2, SWT.CURSOR_SIZEWE, EnumSet.of(SelectionSide.RIGHT)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x, scaledSelection.y + scaledSelection.height,
-				SWT.CURSOR_SIZENESW, EnumSet.of(SelectionSide.LEFT, SelectionSide.BOTTOM)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x + scaledSelection.width / 2, scaledSelection.y
-				+ scaledSelection.height, SWT.CURSOR_SIZENS, EnumSet.of(SelectionSide.BOTTOM)));
-		grabPoints.add(GrabPoint.createGrabPoint(scaledSelection.x + scaledSelection.width, scaledSelection.y
-				+ scaledSelection.height, SWT.CURSOR_SIZENWSE, EnumSet.of(SelectionSide.BOTTOM, SelectionSide.RIGHT)));
-	}
-
-	private void refreshSelectionResize(int x, int y) {
-		currentSelection = new Rectangle(originalSelection.x, originalSelection.y, originalSelection.width,
-				originalSelection.height);
-		int deltaX = x - startPoint.x;
-		int deltaY = y - startPoint.y;
-		Rectangle imageBounds = workImage.getBounds();
-
-		// Check current selection limits
-		if (resizableSides.contains(SelectionSide.LEFT)) {
-			deltaX = Math.min(deltaX, originalSelection.width);
-			if (originalSelection.x + deltaX < 0) {
-				deltaX = -originalSelection.x;
-			}
-		}
-		if (resizableSides.contains(SelectionSide.RIGHT)) {
-			deltaX = Math.max(deltaX, -originalSelection.width);
-			if (originalSelection.x + originalSelection.width + deltaX - 1 > imageBounds.width) {
-				deltaX = imageBounds.width - (originalSelection.x + originalSelection.width);
-			}
-		}
-		if (resizableSides.contains(SelectionSide.TOP)) {
-			deltaY = Math.min(deltaY, originalSelection.height);
-			if (originalSelection.y + deltaY < 0) {
-				deltaY = -originalSelection.y;
-			}
-		}
-		if (resizableSides.contains(SelectionSide.BOTTOM)) {
-			deltaY = Math.max(deltaY, -originalSelection.height);
-			if (originalSelection.y + originalSelection.height + deltaY - 1 > imageBounds.height) {
-				deltaY = imageBounds.height - (originalSelection.y + originalSelection.height);
-			}
-		}
-
-		// Adjust corresponding sides
-		if (resizableSides.contains(SelectionSide.LEFT)) {
-			currentSelection.x += deltaX;
-			currentSelection.width -= deltaX;
-		}
-		if (resizableSides.contains(SelectionSide.RIGHT)) {
-			currentSelection.width += deltaX;
-		}
-		if (resizableSides.contains(SelectionSide.TOP)) {
-			currentSelection.y += deltaY;
-			currentSelection.height -= deltaY;
-		}
-		if (resizableSides.contains(SelectionSide.BOTTOM)) {
-			currentSelection.height += deltaY;
-		}
-
-		setUpGrabPoints();
-	}
-
-	private void refreshSelectionPosition(int x, int y) {
-		int newX = originalSelection.x + (x - startPoint.x);
-		int newY = originalSelection.y + (y - startPoint.y);
-		if (newX < 0) {
-			newX = 0;
-		}
-		if (newY < 0) {
-			newY = 0;
-		}
-		Rectangle imageBounds = workImage.getBounds();
-		if (newX + originalSelection.width - 1 > imageBounds.width) {
-			newX = imageBounds.width - originalSelection.width;
-		}
-		if (newY + originalSelection.height - 1 > imageBounds.height) {
-			newY = imageBounds.height - originalSelection.height;
-		}
-		currentSelection = new Rectangle(newX, newY, originalSelection.width, originalSelection.height);
-
-		setUpGrabPoints();
-	}
-
-	private void registerMouseListeners() {
-		canvas.addMouseMoveListener(new MouseMoveListener() {
-
-			/**
-			 * If a selection is in course, moving the mouse around refreshes the selection rectangle
-			 */
-			public void mouseMove(MouseEvent e) {
-				int scaledX = (int) Math.round(e.x / scaleFactor);
-				int scaledY = (int) Math.round(e.y / scaleFactor);
-
-				if (currentAction == EditorAction.SELECTING) {
-					refreshCurrentSelection(scaledX, scaledY);
-					canvas.redraw();
-				} else if (currentAction == EditorAction.RESIZING_SELECTION) {
-					refreshSelectionResize(scaledX, scaledY);
-					canvas.redraw();
-				} else if (currentAction == EditorAction.MOVING_SELECTION) {
-					refreshSelectionPosition(scaledX, scaledY);
-					canvas.redraw();
-				} else if (currentAction == EditorAction.CROPPING && currentSelection != null) {
-					boolean cursorSet = false;
-
-					// No selection in course, but have something selected; first test if I'm hovering some grab point
-					for (GrabPoint point : grabPoints) {
-						if (point.grabArea.contains(e.x, e.y)) {
-							canvas.setCursor(cursors.get(point.cursorType));
-							cursorSet = true;
-							break;
-						}
-					}
-
-					// Test if I'm inside selection, so I can move it
-					if (!cursorSet && getScaledSelection().contains(e.x, e.y)) {
-						canvas.setCursor(cursors.get(SWT.CURSOR_SIZEALL));
-						cursorSet = true;
-					}
-
-					// If I'm out, the default cursor for cropping mode is cross
-					Cursor crossCursor = cursors.get(SWT.CURSOR_CROSS);
-					if (!cursorSet && canvas.getCursor() != crossCursor) {
-						canvas.setCursor(crossCursor);
-					}
-				} else if (currentAction == EditorAction.MARKING) {
-					drawMarkLine(scaledX, scaledY);
-
-					Cursor markCursor = cursors.get(CURSOR_MARK_TOOL);
-					if (canvas.getCursor() != markCursor) {
-						canvas.setCursor(markCursor);
-					}
-				}
-			}
-
-		});
-
-		canvas.addMouseListener(new MouseAdapter() {
-
-			/**
-			 * Releasing the mouse button ends the selection or a drawing; compute the selection rectangle and redraw
-			 * the cropped image
-			 */
-			@Override
-			public void mouseUp(MouseEvent e) {
-				if (currentAction == EditorAction.SELECTING || currentAction == EditorAction.RESIZING_SELECTION
-						|| currentAction == EditorAction.MOVING_SELECTION) {
-					int scaledX = (int) Math.round(e.x / scaleFactor);
-					int scaledY = (int) Math.round(e.y / scaleFactor);
-					if (currentAction == EditorAction.SELECTING) {
-						refreshCurrentSelection(scaledX, scaledY);
-					} else if (currentAction == EditorAction.RESIZING_SELECTION) {
-						refreshSelectionResize(scaledX, scaledY);
-					} else if (currentAction == EditorAction.MOVING_SELECTION) {
-						refreshSelectionPosition(scaledX, scaledY);
-					}
-					if (currentSelection.width == 0 && currentSelection.height == 0) {
-						currentSelection = null;
-					}
-					setUpGrabPoints();
-					startPoint = null;
-					currentAction = EditorAction.CROPPING;
-
-					canvas.redraw();
-					setImageDirty(true);
-				} else if (currentAction == EditorAction.MARKING) {
-					startPoint = null;
-					setImageDirty(true);
-				}
-			}
-
-			/**
-			 * Pressing mouse button starts a selection or a drawing; normalizes and marks the start point
-			 */
-			@Override
-			public void mouseDown(MouseEvent e) {
-				int scaledX = (int) (e.x / scaleFactor);
-				int scaledY = (int) (e.y / scaleFactor);
-
-				if (currentAction == EditorAction.MARKING) {
-					startPoint = new Point(scaledX, scaledY);
-					drawMarkLine(scaledX, scaledY);
-					canvas.setCursor(cursors.get(CURSOR_MARK_TOOL));
-					return;
-				} else if (currentAction != EditorAction.CROPPING) {
-					return;
-				}
-
-				// Check the most appropriate action to follow; first check if I'm on some grab point
-				if (currentSelection != null) {
-					for (GrabPoint point : grabPoints) {
-						if (point.grabArea.contains(e.x, e.y)) {
-							originalSelection = currentSelection;
-							currentAction = EditorAction.RESIZING_SELECTION;
-							resizableSides = point.resizableSides;
-							startPoint = new Point(scaledX, scaledY);
-							canvas.redraw();
-							return;
-						}
-					}
-				}
-
-				// Check if I could move the selection
-				if (currentSelection != null && currentSelection.contains(scaledX, scaledY)) {
-					originalSelection = currentSelection;
-					currentAction = EditorAction.MOVING_SELECTION;
-					startPoint = new Point(scaledX, scaledY);
-					canvas.redraw();
-					return;
-				}
-
-				// Do a simple selection
-				canvas.setCursor(cursors.get(SWT.CURSOR_CROSS));
-				currentAction = EditorAction.SELECTING;
-				currentSelection = null;
-				startPoint = new Point(scaledX, scaledY);
-				setUpGrabPoints();
-				canvas.redraw();
-			}
-
-		});
-
-	}
-
-	private void clearSelection() {
-		currentSelection = null;
-		startPoint = null;
-		setImageDirty(true);
-	}
-
-	/**
-	 * Recalculates image canvas size based on "fit on canvas" setting, set up the grab points, and redraws
-	 * <p>
-	 * This method should be called whenever the {@link #workImage image} <strong>visible</strong> size is changed,
-	 * which can happen when:
-	 * <p>
-	 * <ul>
-	 * <li>The "Fit Image" setting is changed, so the image zoom level changes
-	 * <li>The image changes (by recapturing)
-	 * <li>The canvas is resized (indirectly happens by resizing the wizard page) <strong>AND</strong> "Fit Image"
-	 * setting is ON
-	 * </ul>
-	 * <p>
-	 * Calling this method under other circumstances may lead to strange behavior in the scrolled composite
-	 */
-	private void refreshCanvasSize() {
-		if (fitAction.isChecked()) {
-			// This little hack is necessary to get the client area without scrollbars; 
-			// they'll be automatically restored if necessary after Canvas.setBounds()
-			scrolledComposite.getHorizontalBar().setVisible(false);
-			scrolledComposite.getVerticalBar().setVisible(false);
-
-			Rectangle bounds = scrolledComposite.getClientArea();
-			if (workImage != null) {
-				Rectangle imageBounds = workImage.getBounds();
-				if (imageBounds.width > bounds.width || imageBounds.height > bounds.height) {
-					double xRatio = (double) bounds.width / imageBounds.width;
-					double yRatio = (double) bounds.height / imageBounds.height;
-					scaleFactor = Math.min(xRatio, yRatio);
-					bounds.width = (int) Math.round(imageBounds.width * scaleFactor);
-					bounds.height = (int) Math.round(imageBounds.height * scaleFactor);
-				}
-			}
-			canvas.setBounds(bounds);
-		} else {
-			scaleFactor = 1.0;
-			Rectangle bounds = scrolledComposite.getClientArea();
-			if (workImage != null) {
-				Rectangle imageBounds = workImage.getBounds();
-				bounds.width = imageBounds.width;
-				bounds.height = imageBounds.height;
-			}
-			canvas.setBounds(bounds);
-		}
-		setUpGrabPoints();
-		canvas.redraw();
-	}
-
-	/**
-	 * Decorates the screenshot canvas with the selection rectangle, resize grab points and other adornments
-	 */
-	private void drawSelection(GC gc) {
-		if (currentSelection == null) {
-			return;
-		}
-		Rectangle scaledSelection = getScaledSelection();
-
-		// Draw shadow
-		gc.setBackground(CommonColors.GRAY_MID);
-		gc.setAdvanced(true);
-		gc.setAlpha(120);
-
-		Region invertedSelection = new Region();
-		invertedSelection.add(canvas.getClientArea());
-		invertedSelection.subtract(scaledSelection);
-		gc.setClipping(invertedSelection);
-		gc.fillRectangle(canvas.getClientArea());
-		gc.setClipping((Region) null);
-		invertedSelection.dispose();
-
-		gc.setAdvanced(false);
-
-		// Draw selection rectangle
-		gc.setLineStyle(SWT.LINE_SOLID);
-		gc.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
-		gc.drawRectangle(scaledSelection);
-
-		// Draw grab points
-		gc.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		gc.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_BLACK));
-		for (GrabPoint point : grabPoints) {
-			gc.fillRectangle(point.grabArea);
-			gc.drawRectangle(point.grabArea);
-		}
-	}
-
-	/**
-	 * Connects the previous mark point to the new reference point, by drawing a new line
-	 */
-	private void drawMarkLine(int x, int y) {
-		if (startPoint != null) {
-			clearAction.setEnabled(true);
-			workImageGC.drawLine(startPoint.x, startPoint.y, x, y);
-			startPoint.x = x;
-			startPoint.y = y;
-			canvas.redraw();
-		}
-	}
-
-	private static enum SelectionSide {
-
-		LEFT, RIGHT, TOP, BOTTOM;
-
-	};
-
-	private static final int SQUARE_SIZE = 3;
-
-	private static class GrabPoint {
-
-		public Rectangle grabArea;
-
-		public int cursorType;
-
-		public Set<SelectionSide> resizableSides;
-
-		public static GrabPoint createGrabPoint(int x, int y, int cursorType, Set<SelectionSide> resizableSides) {
-			GrabPoint point = new GrabPoint();
-			point.grabArea = new Rectangle(x - SQUARE_SIZE, y - SQUARE_SIZE, SQUARE_SIZE * 2 + 1, SQUARE_SIZE * 2 + 1);
-			point.cursorType = cursorType;
-			point.resizableSides = resizableSides;
-			return point;
-		}
-
-	}
-
-	private final List<GrabPoint> grabPoints = new ArrayList<GrabPoint>(8);
-
-	/**
-	 * Creates the final screenshot
-	 * 
-	 * @return The final screenshot, with all markings, and cropped according to user settings; <strong>The caller is
-	 *         responsible for disposing the returned image</strong>
-	 */
-	public Image createImage() {
-		Image screenshot = new Image(getShell().getDisplay(), currentSelection != null ? currentSelection
-				: workImage.getBounds());
-
-		GC gc = new GC(screenshot);
-		if (currentSelection != null) {
-			gc.drawImage(workImage, currentSelection.x, currentSelection.y, currentSelection.width,
-					currentSelection.height, 0, 0, currentSelection.width, currentSelection.height);
-		} else {
-			gc.drawImage(workImage, 0, 0);
-		}
-		gc.dispose();
-		this.imageDirty = false;
-
-		return screenshot;
-	}
-
-	public void setImageDirty(boolean pageDirty) {
-		this.imageDirty = pageDirty;
-	}
-
-	public boolean isImageDirty() {
-		return imageDirty;
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SelectionProviderAdapter.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SelectionProviderAdapter.java
deleted file mode 100644
index 371f623..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SelectionProviderAdapter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.core.commands.common.EventManager;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
-/**
- * Provides an simple implementation of {@link ISelectionProvider} that propagates selection events to registered
- * listeners.
- * 
- * @author Steffen Pingel
- */
-public class SelectionProviderAdapter extends EventManager implements ISelectionProvider {
-
-	private ISelection selection;
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		addListenerObject(listener);
-	}
-
-	public ISelection getSelection() {
-		return selection;
-	}
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		removeListenerObject(listener);
-	}
-
-	protected void selectionChanged(final SelectionChangedEvent event) {
-		Object[] listeners = getListeners();
-		for (int i = 0; i < listeners.length; ++i) {
-			final ISelectionChangedListener listener = (ISelectionChangedListener) listeners[i];
-			SafeRunner.run(new SafeRunnable() {
-				public void run() {
-					listener.selectionChanged(event);
-				}
-			});
-		}
-	}
-
-	public void setSelection(ISelection selection) {
-		this.selection = selection;
-		selectionChanged(new SelectionChangedEvent(this, selection));
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SubstringPatternFilter.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SubstringPatternFilter.java
deleted file mode 100644
index 809db99..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/SubstringPatternFilter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.ui.dialogs.PatternFilter;
-
-/**
- * @author Mik Kersten
- */
-public class SubstringPatternFilter extends PatternFilter {
-
-	@Override
-	public void setPattern(String patternString) {
-		if (patternString == null || patternString.startsWith("*")) { //$NON-NLS-1$
-			super.setPattern(patternString);
-		} else {
-			super.setPattern("*" + patternString); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchActionSupport.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchActionSupport.java
deleted file mode 100644
index 8bac083..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchActionSupport.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.internal.WorkbenchImages;
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-/**
- * Manages commons workbench actions for editing text.
- * 
- * @author Mik Kersten
- * @author Rob Elves
- * @author Steffen Pingel
- */
-@SuppressWarnings("restriction")
-public class WorkbenchActionSupport implements ISelectionChangedListener {
-
-	private class GlobalAction extends Action {
-
-		private final String actionId;
-
-		public GlobalAction(String actionId) {
-			this.actionId = actionId;
-		}
-
-		@Override
-		public void run() {
-			if (callback != null) {
-				callback.doAction(actionId, callback.getFocusControl());
-				updateActions(callback.getSelection());
-			}
-		}
-
-		public void selectionChanged(ISelection selection) {
-			if (callback != null) {
-				setEnabled(callback.canPerformAction(actionId, callback.getFocusControl()));
-			} else {
-				setEnabled(false);
-			}
-		}
-	}
-
-	public static class WorkbenchActionCallback {
-
-		public boolean canPerformAction(String actionId, Control control) {
-			return CommonTextSupport.canPerformAction(actionId, control);
-		}
-
-		public void doAction(String actionId, Control control) {
-			CommonTextSupport.doAction(actionId, control);
-		}
-
-		public Control getFocusControl() {
-			return Display.getDefault().getFocusControl();
-		}
-
-		public ISelection getSelection() {
-			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			if (window != null && window.getSelectionService() != null) {
-				return window.getSelectionService().getSelection();
-			}
-			return null;
-		}
-
-	}
-
-	private WorkbenchActionCallback callback;
-
-	private final GlobalAction copyAction;
-
-	private final GlobalAction cutAction;
-
-	private final GlobalAction findAction;
-
-	private final GlobalAction pasteAction;
-
-	private final GlobalAction redoAction;
-
-	private final GlobalAction selectAllAction;
-
-	private final GlobalAction undoAction;
-
-	public WorkbenchActionSupport() {
-		cutAction = new GlobalAction(ActionFactory.CUT.getId());
-		cutAction.setText(WorkbenchMessages.Workbench_cut);
-		cutAction.setToolTipText(WorkbenchMessages.Workbench_cutToolTip);
-		cutAction.setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-		cutAction.setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
-		cutAction.setDisabledImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT_DISABLED));
-		cutAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.CUT);
-
-		pasteAction = new GlobalAction(ActionFactory.PASTE.getId());
-		pasteAction.setText(WorkbenchMessages.Workbench_paste);
-		pasteAction.setToolTipText(WorkbenchMessages.Workbench_pasteToolTip);
-		pasteAction.setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-		pasteAction.setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
-		pasteAction.setDisabledImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED));
-		pasteAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.PASTE);
-
-		copyAction = new GlobalAction(ActionFactory.COPY.getId());
-		copyAction.setText(WorkbenchMessages.Workbench_copy);
-		copyAction.setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		copyAction.setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
-		copyAction.setDisabledImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
-		copyAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.COPY);
-
-		undoAction = new GlobalAction(ActionFactory.UNDO.getId());
-		undoAction.setText(WorkbenchMessages.Workbench_undo);
-		undoAction.setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-		undoAction.setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
-		undoAction.setDisabledImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED));
-		undoAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.UNDO);
-
-		redoAction = new GlobalAction(ActionFactory.REDO.getId());
-		redoAction.setText(WorkbenchMessages.Workbench_redo);
-		redoAction.setImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-		redoAction.setHoverImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
-		redoAction.setDisabledImageDescriptor(WorkbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_REDO_DISABLED));
-		redoAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.REDO);
-
-		selectAllAction = new GlobalAction(ActionFactory.SELECT_ALL.getId());
-		selectAllAction.setText(WorkbenchMessages.Workbench_selectAll);
-		selectAllAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL);
-		selectAllAction.setEnabled(true);
-
-		findAction = new GlobalAction(ActionFactory.FIND.getId());
-		findAction.setText(WorkbenchMessages.Workbench_findReplace);
-		findAction.setImageDescriptor(CommonImages.FIND);
-		findAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.FIND_REPLACE);
-	}
-
-	public void contributeActions(IMenuManager manager) {
-		manager.add(undoAction);
-		manager.add(redoAction);
-		manager.add(new Separator());
-		manager.add(cutAction);
-		manager.add(copyAction);
-		manager.add(pasteAction);
-		manager.add(selectAllAction);
-		manager.add(new Separator());
-	}
-
-	public void forceEditActionsEnabled() {
-		cutAction.setEnabled(true);
-		copyAction.setEnabled(true);
-		pasteAction.setEnabled(true);
-		selectAllAction.setEnabled(true);
-		undoAction.setEnabled(false);
-		redoAction.setEnabled(false);
-	}
-
-	public WorkbenchActionCallback getCallback() {
-		return callback;
-	}
-
-	public Action getCopyAction() {
-		return copyAction;
-	}
-
-	public Action getCutAction() {
-		return cutAction;
-	}
-
-	public Action getFindAction() {
-		return findAction;
-	}
-
-	public Action getPasteAction() {
-		return pasteAction;
-	}
-
-	public Action getRedoAction() {
-		return redoAction;
-	}
-
-	public Action getSelectAllAction() {
-		return selectAllAction;
-	}
-
-	public Action getUndoAction() {
-		return undoAction;
-	}
-
-	public void install(IActionBars bars) {
-		bars.setGlobalActionHandler(ActionFactory.CUT.getId(), cutAction);
-		bars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction);
-		bars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
-		bars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undoAction);
-		bars.setGlobalActionHandler(ActionFactory.REDO.getId(), redoAction);
-		bars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), selectAllAction);
-		bars.setGlobalActionHandler(ActionFactory.FIND.getId(), findAction);
-		bars.updateActionBars();
-	}
-
-	public void selectionChanged(SelectionChangedEvent event) {
-		ISelection selection = event.getSelection();
-		if (selection instanceof TextSelection) {
-			// only update global actions
-			updateActions(event.getSelection());
-		} else if (selection.isEmpty()) {
-			// XXX a styled text widget has lost focus, re-enable all edit actions
-			forceEditActionsEnabled();
-		}
-	}
-
-	public void setCallback(WorkbenchActionCallback callback) {
-		this.callback = callback;
-	}
-
-	public void uninstall(IActionBars bars) {
-		bars.setGlobalActionHandler(ActionFactory.CUT.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.PASTE.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.COPY.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.UNDO.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.REDO.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), null);
-		bars.setGlobalActionHandler(ActionFactory.FIND.getId(), null);
-		bars.updateActionBars();
-	}
-
-	public void updateActions(ISelection selection) {
-		cutAction.selectionChanged(selection);
-		copyAction.selectionChanged(selection);
-		pasteAction.selectionChanged(selection);
-		undoAction.selectionChanged(selection);
-		redoAction.selectionChanged(selection);
-		selectAllAction.selectionChanged(selection);
-		findAction.selectionChanged(selection);
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchUtil.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchUtil.java
deleted file mode 100644
index fc6ab9b..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/WorkbenchUtil.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     IBM Corporation - helper methods from 
- *       org.eclipse.wst.common.frameworks.internal.ui.WTPActivityHelper 
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Calendar;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.mylyn.internal.commons.ui.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.internal.browser.WebBrowserPreference;
-import org.eclipse.ui.internal.browser.WorkbenchBrowserSupport;
-
-/**
- * @author Mik Kersten
- * @author Steffen Pingel
- */
-public class WorkbenchUtil {
-
-//	public static IViewPart getFromActivePerspective(String viewId) {
-//		if (PlatformUI.isWorkbenchRunning()) {
-//			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-//			if (activePage != null) {
-//				return activePage.findView(viewId);
-//			}
-//		}
-//		return null;
-//	}
-
-//	public static IViewPart openInActivePerspective(String viewId) throws PartInitException {
-//		if (PlatformUI.isWorkbenchRunning() && PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null) {
-//			IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-//			if (activePage != null) {
-//				return activePage.showView(viewId);
-//			}
-//		}
-//		return null;
-//	}
-
-	/**
-	 * Return the modal shell that is currently open. If there isn't one then return null.
-	 * <p>
-	 * <b>Note: Applied from patch on bug 99472.</b>
-	 * 
-	 * @param shell
-	 *            A shell to exclude from the search. May be <code>null</code>.
-	 * @return Shell or <code>null</code>.
-	 */
-	private static Shell getModalShellExcluding(Shell shell) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		Shell[] shells = workbench.getDisplay().getShells();
-		int modal = SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL | SWT.PRIMARY_MODAL;
-		for (Shell shell2 : shells) {
-			if (shell2.equals(shell)) {
-				break;
-			}
-			// Do not worry about shells that will not block the user.
-			if (shell2.isVisible()) {
-				int style = shell2.getStyle();
-				if ((style & modal) != 0) {
-					return shell2;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Utility method to get the best parenting possible for a dialog. If there is a modal shell create it so as to
-	 * avoid two modal dialogs. If not then return the shell of the active workbench window. If neither can be found
-	 * return null.
-	 * <p>
-	 * <b>Note: Applied from patch on bug 99472.</b>
-	 * 
-	 * @return Shell or <code>null</code>
-	 */
-	public static Shell getShell() {
-		if (!PlatformUI.isWorkbenchRunning() || PlatformUI.getWorkbench().isClosing()) {
-			return null;
-		}
-		Shell modal = getModalShellExcluding(null);
-		if (modal != null) {
-			return modal;
-		}
-		return getNonModalShell();
-	}
-
-	/**
-	 * Get the active non modal shell. If there isn't one return null.
-	 * <p>
-	 * <b>Note: Applied from patch on bug 99472.</b>
-	 * 
-	 * @return Shell
-	 */
-	private static Shell getNonModalShell() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) {
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-			if (windows.length > 0) {
-				return windows[0].getShell();
-			}
-		} else {
-			return window.getShell();
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return whether the UI is set up to filter contributions (has defined activity categories).
-	 */
-	public static final boolean isFiltering() {
-		return !PlatformUI.getWorkbench().getActivitySupport().getActivityManager().getDefinedActivityIds().isEmpty();
-	}
-
-	public static boolean allowUseOf(Object object) {
-		if (!isFiltering()) {
-			return true;
-		}
-		if (object instanceof IPluginContribution) {
-			IPluginContribution contribution = (IPluginContribution) object;
-			if (contribution.getPluginId() != null) {
-				IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
-				IIdentifier identifier = workbenchActivitySupport.getActivityManager().getIdentifier(
-						createUnifiedId(contribution));
-				return identifier.isEnabled();
-			}
-		}
-		if (object instanceof String) {
-			IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
-			IIdentifier identifier = workbenchActivitySupport.getActivityManager().getIdentifier((String) object);
-			return identifier.isEnabled();
-		}
-		return true;
-	}
-
-	private static final String createUnifiedId(IPluginContribution contribution) {
-		if (contribution.getPluginId() != null) {
-			return contribution.getPluginId() + '/' + contribution.getLocalId();
-		}
-		return contribution.getLocalId();
-	}
-
-	/**
-	 * Opens <code>location</code> in a web-browser according to the Eclipse workbench preferences.
-	 * 
-	 * @param location
-	 *            the url to open
-	 * @see #openUrl(String, int)
-	 */
-	public static void openUrl(String location) {
-		openUrl(location, SWT.NONE);
-	}
-
-	/**
-	 * Opens <code>location</code> in a web-browser according to the Eclipse workbench preferences.
-	 * 
-	 * @param location
-	 *            the url to open
-	 * @param customFlags
-	 *            additional flags that are passed to {@link IWorkbenchBrowserSupport}, pass
-	 *            {@link IWorkbenchBrowserSupport#AS_EXTERNAL} to force opening external browser
-	 */
-	public static void openUrl(String location, int customFlags) {
-		try {
-			URL url = null;
-			if (location != null) {
-				url = new URL(location);
-			}
-			if (WebBrowserPreference.getBrowserChoice() == WebBrowserPreference.EXTERNAL
-					|| (customFlags & IWorkbenchBrowserSupport.AS_EXTERNAL) != 0) {
-				try {
-					IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
-					support.getExternalBrowser().openURL(url);
-				} catch (PartInitException e) {
-					Status status = new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN,
-							Messages.WorkbenchUtil_Browser_Initialization_Failed);
-					MessageDialog.openError(getShell(), Messages.WorkbenchUtil_Open_Location_Title, status.getMessage());
-				}
-			} else {
-				IWebBrowser browser = null;
-				int flags = customFlags;
-				if (WorkbenchBrowserSupport.getInstance().isInternalWebBrowserAvailable()) {
-					flags |= IWorkbenchBrowserSupport.AS_EDITOR | IWorkbenchBrowserSupport.LOCATION_BAR
-							| IWorkbenchBrowserSupport.NAVIGATION_BAR;
-				} else {
-					flags |= IWorkbenchBrowserSupport.AS_EXTERNAL | IWorkbenchBrowserSupport.LOCATION_BAR
-							| IWorkbenchBrowserSupport.NAVIGATION_BAR;
-				}
-
-				String generatedId = "org.eclipse.mylyn.web.browser-" + Calendar.getInstance().getTimeInMillis(); //$NON-NLS-1$
-				browser = WorkbenchBrowserSupport.getInstance().createBrowser(flags, generatedId, null, null);
-				browser.openURL(url);
-			}
-		} catch (PartInitException e) {
-			Status status = new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN,
-					Messages.WorkbenchUtil_Browser_Initialization_Failed, e);
-			CommonsUiPlugin.getDefault().getLog().log(status);
-			MessageDialog.openError(getShell(), Messages.WorkbenchUtil_Open_Location_Title, status.getMessage());
-		} catch (MalformedURLException e) {
-			if (location != null && location.trim().equals("")) { //$NON-NLS-1$
-				Status status = new Status(IStatus.WARNING, CommonsUiPlugin.ID_PLUGIN,
-						Messages.WorkbenchUtil_No_URL_Error, e);
-				MessageDialog.openWarning(getShell(), Messages.WorkbenchUtil_Open_Location_Title, status.getMessage());
-			} else {
-				Status status = new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, NLS.bind(
-						Messages.WorkbenchUtil_Invalid_URL_Error, location), e);
-				MessageDialog.openError(getShell(), Messages.WorkbenchUtil_Open_Location_Title, status.getMessage());
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/EditorBusyIndicator.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/EditorBusyIndicator.java
deleted file mode 100644
index 979209a..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/EditorBusyIndicator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui.editor;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.internal.commons.ui.CommonsUiPlugin;
-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Provides a spinner animation for the tab title of an editor.
- * 
- * @author Shawn Minto
- * @author Steffen Pingel
- */
-public class EditorBusyIndicator {
-
-	private class Animator implements Runnable {
-
-		int imageDataIndex = 0;
-
-		private final Image[] images;
-
-		private boolean stopped;
-
-		public Animator(Image[] images) {
-			this.images = images;
-		}
-
-		public void run() {
-			if (stopped) {
-				return;
-			}
-
-			try {
-				Image image = images[imageDataIndex];
-				imageDataIndex = (imageDataIndex + 1) % images.length;
-
-				if (updateTitleImage(image)) {
-					PlatformUI.getWorkbench().getDisplay().timerExec(UPDATE_INTERVAL, this);
-				}
-			} catch (Exception e) {
-				CommonsUiPlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Failed to update animation", e)); //$NON-NLS-1$
-			}
-		}
-
-		public void stop() {
-			stopped = true;
-		}
-	}
-
-	private static final int UPDATE_INTERVAL = 90;
-
-	private Animator animator;
-
-	private final IBusyEditor editor;
-
-	private Image[] images;
-
-	private Image oldImage;
-
-	public EditorBusyIndicator(IBusyEditor editor) {
-		this.editor = editor;
-	}
-
-	/**
-	 * Starts the busy indication.
-	 * 
-	 * @see #stop()
-	 */
-	public void start() {
-		if (animator != null) {
-			stop();
-		}
-
-		try {
-			if (images == null) {
-				images = CommonImages.getProgressImages();
-				// if image fails to load do not continue
-				if (images == null) {
-					return;
-				}
-			}
-
-			oldImage = editor.getTitleImage();
-
-			if (images.length > 1) {
-				animator = new Animator(images);
-				animator.run();
-			}
-		} catch (SWTException e) {
-			CommonsUiPlugin.getDefault().getLog().log(
-					new Status(IStatus.ERROR, CommonsUiPlugin.ID_PLUGIN, "Failed to start animation", e)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Stops the animation.
-	 * 
-	 * @see #start()
-	 */
-	public void stop() {
-		if (animator != null) {
-			animator.stop();
-			animator = null;
-
-			updateTitleImage(oldImage);
-			oldImage = null;
-		}
-	}
-
-	private boolean updateTitleImage(final Image image) {
-		if (!PlatformUI.getWorkbench().isClosing()) {
-			if (image != null && !image.isDisposed()) {
-				editor.setTitleImage(image);
-				return true;
-			} else {
-				if (oldImage != null && !oldImage.isDisposed()) {
-					editor.setTitleImage(oldImage);
-				}
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/IBusyEditor.java b/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/IBusyEditor.java
deleted file mode 100644
index b21099f..0000000
--- a/org.eclipse.mylyn.commons.ui/src/org/eclipse/mylyn/internal/provisional/commons/ui/editor/IBusyEditor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.provisional.commons.ui.editor;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.part.WorkbenchPart;
-
-/**
- * A callback for modifying the title image of an editor. Clients that provide busy animations should implement this
- * interface and delegate to the respective methods in {@link WorkbenchPart}.
- * 
- * @author Shawn Minto
- * @see EditorBusyIndicator
- */
-public interface IBusyEditor {
-
-	/**
-	 * Updates the title image of the editor to <code>image</code>.
-	 * 
-	 * @param image
-	 *            the image
-	 */
-	public void setTitleImage(Image image);
-
-	/**
-	 * Returns the current title image of the editor.
-	 */
-	public Image getTitleImage();
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/.classpath b/org.eclipse.mylyn.monitor.core/.classpath
deleted file mode 100644
index 41e559d..0000000
--- a/org.eclipse.mylyn.monitor.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/core/internal/runtime/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.monitor.core/.cvsignore b/org.eclipse.mylyn.monitor.core/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.monitor.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.monitor.core/.project b/org.eclipse.mylyn.monitor.core/.project
deleted file mode 100644
index 003236e..0000000
--- a/org.eclipse.mylyn.monitor.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.monitor.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.monitor.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.monitor.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.monitor.core/META-INF/MANIFEST.MF
deleted file mode 100644
index bbbe3e1..0000000
--- a/org.eclipse.mylyn.monitor.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.mylyn.internal.monitor.core;x-friends:="org.eclipse.mylyn.monitor.ui",
- org.eclipse.mylyn.internal.monitor.core.collection;x-friends:="org.eclipse.mylyn.monitor.ui",
- org.eclipse.mylyn.monitor.core
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-ClassPath: .
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.monitor.core/about.html b/org.eclipse.mylyn.monitor.core/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.monitor.core/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.core/build.properties b/org.eclipse.mylyn.monitor.core/build.properties
deleted file mode 100644
index 08efb18..0000000
--- a/org.eclipse.mylyn.monitor.core/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-bin.includes = about.html,\
-               META-INF/,\
-               .,\
-               plugin.properties
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.monitor.core/plugin.properties b/org.eclipse.mylyn.monitor.core/plugin.properties
deleted file mode 100644
index ae1b5b8..0000000
--- a/org.eclipse.mylyn.monitor.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.monitor.core
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Monitor Core
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/IMonitorCoreConstants.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/IMonitorCoreConstants.java
deleted file mode 100644
index e2cf087..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/IMonitorCoreConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core;
-
-/**
- * @author Steffen Pingel
- */
-public interface IMonitorCoreConstants {
-
-	public static String ID_PLUGIN = "org.eclipse.mylyn.monitor.core"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/CommandUsageCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/CommandUsageCollector.java
deleted file mode 100644
index 061bd65..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/CommandUsageCollector.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @author Leah Findlater
- */
-public class CommandUsageCollector implements IUsageCollector {
-
-	private final InteractionByTypeSummary commands = new InteractionByTypeSummary();
-
-	private final Set<Integer> userIdSet = new HashSet<Integer>();
-
-	public void consumeEvent(InteractionEvent event, int userId) {
-		userIdSet.add(userId);
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			commands.setUserCount(userId, InteractionEventUtil.getCleanOriginId(event), commands.getUserCount(userId,
-					InteractionEventUtil.getCleanOriginId(event)) + 1);
-		}
-	}
-
-	public List<String> getReport() {
-		return Collections.emptyList();
-	}
-
-	public String getReportTitle() {
-		return Messages.CommandUsageCollector_Command_Usage;
-	}
-
-	public void exportAsCSVFile(String directoryName) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public InteractionByTypeSummary getCommands() {
-		return commands;
-	}
-
-	public List<String> getPlainTextReport() {
-		return Collections.emptyList();
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
deleted file mode 100644
index 1a02190..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DataOverviewCollector.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class DataOverviewCollector implements IUsageCollector {
-
-	private static long FIVEMININMS = 5 * 60 * 1000;
-
-	private final Map<Integer, Integer> interactionHistorySizes = new HashMap<Integer, Integer>();
-
-	private final Map<Integer, List<Date>> interactionHistoryRanges = new HashMap<Integer, List<Date>>();
-
-	private final Map<Integer, Long> interactionHistoryActiveDuration = new HashMap<Integer, Long>();
-
-	// For calculating active milliseconds
-	private int currentUser = -1;
-
-	private InteractionEvent lastUserEvent;
-
-	private static int startDatePosition = 0;
-
-	private static int endDatePosition = 1;
-
-	private String filePrefix = ""; //$NON-NLS-1$
-
-	public DataOverviewCollector(String prefix) {
-		filePrefix = prefix;
-	}
-
-	public String getReportTitle() {
-		return Messages.DataOverviewCollector_Data_Overview;
-	}
-
-	public void consumeEvent(InteractionEvent event, int userId) {
-
-		// Add to size of history
-		if (!interactionHistorySizes.containsKey(userId)) {
-			interactionHistorySizes.put(userId, 0);
-		}
-		interactionHistorySizes.put(userId, interactionHistorySizes.get(userId) + 1);
-
-		// Record start and end date of history
-		List<Date> dateRange;
-		if (!interactionHistoryRanges.containsKey(userId)) {
-			// There are two positions in the array: start and end date
-			dateRange = new ArrayList<Date>(2);
-			interactionHistoryRanges.put(userId, dateRange);
-		}
-		dateRange = interactionHistoryRanges.get(userId);
-		if (dateRange.size() == 0) {
-			dateRange.add(event.getDate());
-		} else if (dateRange.size() == 1) {
-			dateRange.add(event.getDate());
-		} else {
-			dateRange.set(endDatePosition, event.getDate());
-		}
-
-		// Accumulate active duration -- assumes see all of events of a user in
-		// order
-		if (currentUser == -1 || currentUser != userId) {
-			lastUserEvent = event;
-			currentUser = userId;
-		}
-		// Restart accumulation if greater than 5 min has elapsed between events
-		long elapsed = event.getDate().getTime() - lastUserEvent.getDate().getTime();
-		if (elapsed < FIVEMININMS) {
-			if (!interactionHistoryActiveDuration.containsKey(userId)) {
-				interactionHistoryActiveDuration.put(userId, new Long(0));
-			}
-			interactionHistoryActiveDuration.put(userId, interactionHistoryActiveDuration.get(userId) + elapsed);
-		}
-		lastUserEvent = event;
-
-	}
-
-	public List<String> getReport() {
-		List<String> report = new ArrayList<String>();
-		report.add(Messages.DataOverviewCollector__h4_Data_Overview_h4_);
-		report.add(Messages.DataOverviewCollector_Number_of_Users_ + interactionHistorySizes.keySet().size() + "<br>"); //$NON-NLS-1$
-		for (Map.Entry<Integer, Integer> entry : interactionHistorySizes.entrySet()) {
-			report.add(entry.getKey() + ": " + entry.getValue() + Messages.DataOverviewCollector_events); //$NON-NLS-1$
-			report.add(InteractionEventClassifier.formatDuration(interactionHistoryActiveDuration.get(entry.getKey()))
-					+ Messages.DataOverviewCollector_active_use);
-			List<Date> dateRange = interactionHistoryRanges.get(entry.getKey());
-			long duration = dateRange.get(endDatePosition).getTime() - dateRange.get(startDatePosition).getTime();
-			report.add(MessageFormat.format(Messages.DataOverviewCollector_TO_PERIOD_OF_HOURS,
-					dateRange.get(startDatePosition), dateRange.get(endDatePosition),
-					InteractionEventClassifier.formatDuration(duration)));
-
-			report.add("<br><br>"); //$NON-NLS-1$
-		}
-		return report;
-	}
-
-	public void exportAsCSVFile(String directory) {
-
-		String filename = directory + File.separator + filePrefix + "baseLine.csv"; //$NON-NLS-1$
-
-		try {
-			BufferedWriter writer = new BufferedWriter(new FileWriter(new File(filename)));
-
-			// Write the header
-			writer.write(Messages.DataOverviewCollector_CSV_USER);
-			writer.write(","); //$NON-NLS-1$
-			writer.write(Messages.DataOverviewCollector_CSV_EVENTS);
-			writer.write(","); //$NON-NLS-1$
-			writer.write(Messages.DataOverviewCollector_CSV_START);
-			writer.write(","); //$NON-NLS-1$
-			writer.write(Messages.DataOverviewCollector_CSV_END);
-			writer.write(","); //$NON-NLS-1$
-			writer.write(Messages.DataOverviewCollector_CSV_ACTIVE_USE);
-			writer.write(","); //$NON-NLS-1$
-			writer.write(Messages.DataOverviewCollector_CSV_ELAPSED_USE);
-			writer.newLine();
-
-			// Writer the rows
-			for (Map.Entry<Integer, Integer> entry : interactionHistorySizes.entrySet()) {
-				writer.write(entry.getKey().toString());
-				writer.write(","); //$NON-NLS-1$
-				writer.write(entry.getValue().toString());
-				writer.write(","); //$NON-NLS-1$
-				List<Date> dateRange = interactionHistoryRanges.get(entry.getKey());
-				writer.write(dateRange.get(startDatePosition).toString());
-				writer.write(","); //$NON-NLS-1$
-				writer.write(dateRange.get(endDatePosition).toString());
-				writer.write(","); //$NON-NLS-1$
-				long elapsed = interactionHistoryActiveDuration.get(entry.getKey());
-				writer.write(InteractionEventClassifier.formatDuration(elapsed));
-				writer.write(","); //$NON-NLS-1$
-				long duration = dateRange.get(endDatePosition).getTime() - dateRange.get(startDatePosition).getTime();
-				writer.write(InteractionEventClassifier.formatDuration(duration));
-				writer.newLine();
-			}
-
-			writer.flush();
-			writer.close();
-
-		} catch (IOException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, "org.eclipse.mylyn.monitor.core", "Unable to write CVS file <" //$NON-NLS-1$//$NON-NLS-2$
-					+ filename + ">", e)); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * For testing - return active use of a user
-	 */
-	public long getActiveUseOfUser(int userid) {
-		if (interactionHistoryActiveDuration.containsKey(userid)) {
-			return interactionHistoryActiveDuration.get(userid);
-		}
-		return -1;
-	}
-
-	/**
-	 * For testing - return number of users
-	 */
-	public int getNumberOfUsers() {
-		return interactionHistorySizes.size();
-	}
-
-	/**
-	 * For testing - return duration of use
-	 */
-	public long getDurationUseOfUser(int userid) {
-		if (interactionHistoryRanges.containsKey(userid)) {
-			List<Date> dateRange = interactionHistoryRanges.get(userid);
-			return (dateRange.get(endDatePosition).getTime() - dateRange.get(startDatePosition).getTime());
-		}
-		return -1;
-	}
-
-	/**
-	 * For testing - return size of interaction history
-	 */
-	public int getSizeOfHistory(int userid) {
-		if (interactionHistorySizes.containsKey(userid)) {
-			return interactionHistorySizes.get(userid);
-		}
-		return -1;
-	}
-
-	public List<String> getPlainTextReport() {
-		List<String> report = new ArrayList<String>();
-		report.add(Messages.DataOverviewCollector_Data_Overview);
-		report.add(Messages.DataOverviewCollector_Number_of_Users_ + interactionHistorySizes.keySet().size());
-		for (Map.Entry<Integer, Integer> entry : interactionHistorySizes.entrySet()) {
-			report.add(entry.getKey() + ": " + entry.getValue() + Messages.DataOverviewCollector_events); //$NON-NLS-1$
-			report.add(InteractionEventClassifier.formatDuration(interactionHistoryActiveDuration.get(entry.getKey()))
-					+ Messages.DataOverviewCollector_active_use);
-			List<Date> dateRange = interactionHistoryRanges.get(entry.getKey());
-			long duration = dateRange.get(endDatePosition).getTime() - dateRange.get(startDatePosition).getTime();
-			report.add(MessageFormat.format(Messages.DataOverviewCollector_TO_PERIOD_OF_HOURS,
-					dateRange.get(startDatePosition), dateRange.get(endDatePosition),
-					InteractionEventClassifier.formatDuration(duration)));
-
-		}
-		return report;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DelegatingUsageCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DelegatingUsageCollector.java
deleted file mode 100644
index 3606960..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/DelegatingUsageCollector.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class DelegatingUsageCollector implements IUsageCollector {
-
-	protected List<IUsageScanner> scanners = new ArrayList<IUsageScanner>();
-
-	public void addScanner(IUsageScanner aScanner) {
-		scanners.add(aScanner);
-	}
-
-	private List<IUsageCollector> delegates = new ArrayList<IUsageCollector>();
-
-	private String reportTitle = ""; //$NON-NLS-1$
-
-	public List<IUsageCollector> getDelegates() {
-		return delegates;
-	}
-
-	public void setDelegates(List<IUsageCollector> delegates) {
-		this.delegates = delegates;
-	}
-
-	public void consumeEvent(InteractionEvent event, int userId) {
-		for (IUsageCollector collector : delegates) {
-			collector.consumeEvent(event, userId);
-		}
-	}
-
-	public List<String> getReport() {
-		List<String> combinedReports = new ArrayList<String>();
-		for (IUsageCollector collector : delegates) {
-			combinedReports.add("<h3>" + collector.getReportTitle() + "</h3>"); //$NON-NLS-1$ //$NON-NLS-2$
-			combinedReports.addAll(collector.getReport());
-		}
-		return combinedReports;
-	}
-
-	public void exportAsCSVFile(String directory) {
-
-	}
-
-	public String getReportTitle() {
-		return reportTitle;
-	}
-
-	public void setReportTitle(String reportTitle) {
-		this.reportTitle = reportTitle;
-	}
-
-	public List<String> getPlainTextReport() {
-		List<String> combinedReports = new ArrayList<String>();
-		for (IUsageCollector collector : delegates) {
-			combinedReports.add(collector.getReportTitle());
-			combinedReports.addAll(collector.getPlainTextReport());
-		}
-		return combinedReports;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageCollector.java
deleted file mode 100644
index ee1d37e..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageCollector.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.List;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @author Leah Findlater
- */
-public interface IUsageCollector {
-
-	public String getReportTitle();
-
-	public abstract void consumeEvent(InteractionEvent event, int userId);
-
-	/**
-	 * TODO: return report as HTML
-	 * 
-	 * @return a list corresponding to all of the lines of the report
-	 */
-	public abstract List<String> getReport();
-
-	/**
-	 * return report as plain text
-	 * 
-	 * @return a list corresponding to all of the lines of the report
-	 */
-	public abstract List<String> getPlainTextReport();
-
-	/**
-	 * Implementors will need to generate a unique filename given the directory in which to place the file
-	 * 
-	 * @param directory
-	 */
-	public abstract void exportAsCSVFile(String directory);
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageScanner.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageScanner.java
deleted file mode 100644
index b1e6c61..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/IUsageScanner.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.Set;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * A usage scanner will see all events for a user before any consumers
- * 
- * @author Gail Murphy
- */
-public interface IUsageScanner {
-
-	public void scanEvent(InteractionEvent event, int userId);
-
-	public boolean accept(int userId);
-
-	public Set<Integer> acceptedUsers();
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionByTypeSummary.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionByTypeSummary.java
deleted file mode 100644
index 14edf89..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionByTypeSummary.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Leah Findlater - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * @author Leah Findlater
- */
-public class InteractionByTypeSummary {
-	HashMap<String, HashMap<Integer, Integer>> usageMap;
-
-	public InteractionByTypeSummary() {
-		usageMap = new HashMap<String, HashMap<Integer, Integer>>();
-	}
-
-	public void setUserCount(int userId, String originId, int count) {
-		if (!usageMap.containsKey(originId)) {
-			usageMap.put(originId, new HashMap<Integer, Integer>());
-		}
-		usageMap.get(originId).put(userId, count);
-	}
-
-	public int getUserCount(int userId, String originId) {
-		if (usageMap.containsKey(originId) && usageMap.get(originId).containsKey(userId)) {
-			return usageMap.get(originId).get(userId);
-		} else {
-			return 0;
-		}
-	}
-
-	public int getTotalCount(String originId) {
-		int count = 0;
-		for (Integer userId : usageMap.get(originId).keySet()) {
-			count = count + usageMap.get(originId).get(userId);
-		}
-
-		return count;
-	}
-
-	public void printOut(Set<Integer> allUserIdsList) {
-		System.out.print("EventId"); //$NON-NLS-1$
-		// Collections.sort(allUserIdsList);
-		for (Integer userId : allUserIdsList) {
-			System.out.print("\t" + userId); //$NON-NLS-1$
-		}
-		System.out.println();
-
-		for (String originId : usageMap.keySet()) {
-			System.out.print(originId);
-			Set<Integer> userIdSet = usageMap.get(originId).keySet();
-			for (int userId : allUserIdsList) {
-				if (userIdSet.contains(userId)) {
-					System.out.print("\t1"); //$NON-NLS-1$
-				} else {
-					System.out.print("\t0"); //$NON-NLS-1$
-				}
-			}
-			System.out.println();
-
-			/*
-			 * for (int userId : usageMap.get(originId).keySet()) {
-			 * System.out.print("\t" + userId); } System.out.println();
-			 */
-		}
-	}
-
-	public ArrayList<String> getOriginIdList() {
-		ArrayList<String> originIdList = new ArrayList<String>(usageMap.keySet());
-
-		return originIdList;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventClassifier.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventClassifier.java
deleted file mode 100644
index c76df47..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventClassifier.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Test whether an InteractionEvent meets particular criteria
- * 
- * @author Gail Murphy
- * @author Mik Kersten
- */
-public class InteractionEventClassifier {
-
-	/**
-	 * isEdit currently classifies selections in editor as edits. May need to split off a different version
-	 */
-	public static boolean isEdit(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.EDIT)
-				|| (event.getKind().equals(InteractionEvent.Kind.SELECTION) && isSelectionInEditor(event));
-	}
-
-	public static boolean isSelection(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.SELECTION) && !isSelectionInEditor(event);
-	}
-
-	public static boolean isCommand(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.COMMAND);
-	}
-
-	public static boolean isJavaEdit(InteractionEvent event) {
-		return event.getKind().equals(InteractionEvent.Kind.EDIT)
-				&& (event.getOriginId().contains("java") || event.getOriginId().contains("jdt.ui")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public static boolean isJDTEvent(InteractionEvent event) {
-		return (isEdit(event) || isSelection(event) || isCommand(event)) && getCleanOriginId(event).contains("jdt"); //$NON-NLS-1$
-	}
-
-	public static boolean isSelectionInEditor(InteractionEvent event) {
-		return event.getOriginId().contains("Editor") || event.getOriginId().contains("editor") //$NON-NLS-1$ //$NON-NLS-2$
-				|| event.getOriginId().contains("source"); //$NON-NLS-1$
-	}
-
-	public static String getCleanOriginId(InteractionEvent event) {
-		String cleanOriginId = ""; //$NON-NLS-1$
-		String originId = event.getOriginId();
-
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			for (int i = 0; i < originId.length(); i++) {
-				char curChar = originId.charAt(i);
-				if (!(curChar == '&')) {
-					if (Character.getType(curChar) == Character.CONTROL) {
-						cleanOriginId = cleanOriginId.concat(" "); //$NON-NLS-1$
-					} else {
-						cleanOriginId = cleanOriginId.concat(String.valueOf(curChar));
-					}
-				}
-			}
-			return cleanOriginId;
-		} else {
-			return originId;
-		}
-	}
-
-	public static String formatDuration(long timeToFormatInms) {
-		long timeInSeconds = timeToFormatInms / 1000;
-		long hours, minutes;
-		hours = timeInSeconds / 3600;
-		timeInSeconds = timeInSeconds - (hours * 3600);
-		minutes = timeInSeconds / 60;
-		timeInSeconds = timeInSeconds - (minutes * 60);
-		return hours + "." + minutes; //$NON-NLS-1$
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventComparator.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventComparator.java
deleted file mode 100644
index 47e74b7..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventComparator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.Comparator;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * Comparator of InteractionEvents
- * 
- * @author Gail Murphy
- */
-public class InteractionEventComparator implements Comparator<InteractionEvent> {
-
-	public int compare(InteractionEvent arg0, InteractionEvent arg1) {
-		if (arg0.equals(arg1)) {
-			return 0;
-		}
-		if (arg0.getDate().before(arg1.getDate())) {
-			return -1;
-		}
-		return 1;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventSummary.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventSummary.java
deleted file mode 100644
index 9e66467..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventSummary.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Leah Findalter - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Stores the type, ID, name, and usage count of a single function that can be stored in the context.
- * 
- * @author Leah Findlater
- * @author Mik Kersten
- */
-public class InteractionEventSummary {
-	private String type;
-
-	private String name;
-
-	private int usageCount;
-
-	private float interestContribution;
-
-	private String delta;
-
-	private Set<Integer> userIds = new HashSet<Integer>();
-
-	public InteractionEventSummary(String type, String name, int usageCount) {
-		this.type = type;
-		this.name = name;
-		this.usageCount = usageCount;
-
-	}
-
-	public InteractionEventSummary() {
-		type = ""; //$NON-NLS-1$
-		name = ""; //$NON-NLS-1$
-		usageCount = 0;
-	}
-
-	public InteractionEventSummary(InteractionEventSummary another) {
-		this.type = another.type;
-		this.name = another.name;
-		this.usageCount = another.usageCount;
-		this.userIds.addAll(another.getUserIds());
-	}
-
-	public void combine(InteractionEventSummary another) {
-		this.usageCount = this.usageCount + another.getUsageCount();
-		this.userIds.addAll(another.getUserIds());
-	}
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name
-	 *            The name to set.
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @param type
-	 *            The type to set.
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * @return Returns the usageCount.
-	 */
-	public int getUsageCount() {
-		return usageCount;
-	}
-
-	/**
-	 * @param usageCount
-	 *            The usageCount to set.
-	 */
-	public void setUsageCount(int usageCount) {
-		this.usageCount = usageCount;
-	}
-
-	public float getInterestContribution() {
-		return interestContribution;
-	}
-
-	public void setInterestContribution(float interestContribution) {
-		this.interestContribution = interestContribution;
-	}
-
-	public String getDelta() {
-		if ("null".equals(delta)) { //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
-		} else {
-			return delta;
-		}
-	}
-
-	public void setDelta(String delta) {
-		this.delta = delta;
-	}
-
-	public Set<Integer> getUserIds() {
-		return userIds;
-	}
-
-	public void setUserIds(Set<Integer> userIds) {
-		this.userIds = userIds;
-	}
-
-	public void addUserId(int userId) {
-		if (!userIds.contains(userId)) {
-			this.userIds.add(userId);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventUtil.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventUtil.java
deleted file mode 100644
index c7ba9e3..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/InteractionEventUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionEventUtil {
-
-	public static String getCleanOriginId(InteractionEvent event) {
-		String cleanOriginId = ""; //$NON-NLS-1$
-		String originId = event.getOriginId();
-
-		if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			for (int i = 0; i < originId.length(); i++) {
-				char curChar = originId.charAt(i);
-				if (!(curChar == '&')) {
-					if (Character.getType(curChar) == Character.CONTROL) {
-						cleanOriginId = cleanOriginId.concat(" "); //$NON-NLS-1$
-					} else {
-						cleanOriginId = cleanOriginId.concat(String.valueOf(curChar));
-					}
-				}
-			}
-			return cleanOriginId;
-		} else {
-			return originId;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/Messages.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/Messages.java
deleted file mode 100644
index 5233ff5..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/Messages.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.monitor.core.collection.messages"; //$NON-NLS-1$
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String CommandUsageCollector_Command_Usage;
-
-	public static String DataOverviewCollector_active_use;
-
-	public static String DataOverviewCollector_CSV_ACTIVE_USE;
-
-	public static String DataOverviewCollector_CSV_ELAPSED_USE;
-
-	public static String DataOverviewCollector_CSV_END;
-
-	public static String DataOverviewCollector_CSV_EVENTS;
-
-	public static String DataOverviewCollector_CSV_START;
-
-	public static String DataOverviewCollector_CSV_USER;
-
-	public static String DataOverviewCollector_Data_Overview;
-
-	public static String DataOverviewCollector_events;
-
-	public static String DataOverviewCollector__h4_Data_Overview_h4_;
-
-	public static String DataOverviewCollector_Number_of_Users_;
-
-	public static String DataOverviewCollector_TO_PERIOD_OF_HOURS;
-
-	public static String SummaryCollector_END_DATE;
-
-	public static String SummaryCollector_Number_of_commands_;
-
-	public static String SummaryCollector_Number_of_events_;
-
-	public static String SummaryCollector_Number_of_preference_changes;
-
-	public static String SummaryCollector_Number_of_selections_;
-
-	public static String SummaryCollector_Start_date_;
-
-	public static String SummaryCollector_Summary;
-
-	public static String ViewUsageCollector_View_Usage;
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/PercentUsageComparator.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/PercentUsageComparator.java
deleted file mode 100644
index a1c644c..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/PercentUsageComparator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.Comparator;
-
-/**
- * @author Mik Kersten
- * @author Leah Findlater
- */
-public class PercentUsageComparator implements Comparator<String> {
-	public int compare(String o1, String o2) {
-		int index1 = o1.indexOf('%');
-		int index2 = o2.indexOf('%');
-		if (index1 != -1 && index2 != -1) {
-			String s1 = o1.substring(0, index1);
-			String s2 = o2.substring(0, index2);
-			return (-1) * new Float(s1).compareTo(new Float(s2));
-		} else {
-			return 0;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/SummaryCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/SummaryCollector.java
deleted file mode 100644
index ce770f1..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/SummaryCollector.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class SummaryCollector implements IUsageCollector {
-
-	protected int numSelections = 0;
-
-	protected int numEdits = 0;
-
-	protected int numUserEvents = 0;
-
-	protected Date leastRecentDate = new Date();
-
-	protected Date mostRecentDate = new Date(0);
-
-	protected int numCommands = 0;
-
-	protected int numPreference = 0;
-
-	public void consumeEvent(InteractionEvent event, int userId) {
-		if (mostRecentDate.compareTo(event.getDate()) == -1) {
-			mostRecentDate = event.getDate();
-		}
-		if (leastRecentDate.compareTo(event.getDate()) == 1) {
-			leastRecentDate = event.getDate();
-		}
-
-		if (event.getKind().equals(InteractionEvent.Kind.SELECTION)) {
-			numSelections++;
-		} else if (event.getKind().equals(InteractionEvent.Kind.EDIT)) {
-			numEdits++;
-		} else if (event.getKind().equals(InteractionEvent.Kind.COMMAND)) {
-			numCommands++;
-		} else if (event.getKind().equals(InteractionEvent.Kind.PREFERENCE)) {
-			numPreference++;
-		}
-		numUserEvents++;
-	}
-
-	public List<String> getReport() {
-		List<String> summaries = new ArrayList<String>();
-
-		summaries.add(Messages.SummaryCollector_Start_date_ + leastRecentDate + Messages.SummaryCollector_END_DATE + mostRecentDate + "<br>"); //$NON-NLS-1$
-
-		summaries.add(Messages.SummaryCollector_Number_of_events_ + numUserEvents + "<br>"); //$NON-NLS-1$
-		summaries.add(Messages.SummaryCollector_Number_of_commands_ + numCommands + "<br>"); //$NON-NLS-1$
-		summaries.add(Messages.SummaryCollector_Number_of_preference_changes + numPreference + "<br>"); //$NON-NLS-1$
-		summaries.add(Messages.SummaryCollector_Number_of_selections_ + numSelections + "<br>"); //$NON-NLS-1$
-		return summaries;
-	}
-
-	public String getReportTitle() {
-		return Messages.SummaryCollector_Summary;
-	}
-
-	public void exportAsCSVFile(String directory) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public List<String> getPlainTextReport() {
-		List<String> summaries = new ArrayList<String>();
-
-		summaries.add(Messages.SummaryCollector_Start_date_ + leastRecentDate + Messages.SummaryCollector_END_DATE + mostRecentDate);
-
-		summaries.add(Messages.SummaryCollector_Number_of_events_ + numUserEvents);
-		summaries.add(Messages.SummaryCollector_Number_of_commands_ + numCommands);
-		summaries.add(Messages.SummaryCollector_Number_of_preference_changes + numPreference);
-		summaries.add(Messages.SummaryCollector_Number_of_selections_ + numSelections);
-		return summaries;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/ViewUsageCollector.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/ViewUsageCollector.java
deleted file mode 100644
index ec23931..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/ViewUsageCollector.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.core.collection;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- * @author Leah Findlater
- */
-public class ViewUsageCollector implements IUsageCollector {
-
-	protected Map<Integer, Integer> usersNumSelections = new HashMap<Integer, Integer>();
-
-	protected Map<Integer, Map<String, Integer>> usersNormalViewSelections = new HashMap<Integer, Map<String, Integer>>();
-
-	protected int maxViewsToReport = -1;
-
-	public void consumeEvent(InteractionEvent event, int userId) {
-		if (!usersNumSelections.containsKey(userId)) {
-			usersNumSelections.put(userId, 0);
-		}
-
-		Map<String, Integer> normalViewSelections = usersNormalViewSelections.get(userId);
-		if (normalViewSelections == null) {
-			normalViewSelections = new HashMap<String, Integer>();
-			usersNormalViewSelections.put(userId, normalViewSelections);
-		}
-
-		if (event.getKind().equals(InteractionEvent.Kind.SELECTION)) {
-			if (!usersNumSelections.containsKey(userId)) {
-				usersNumSelections.put(userId, 0);
-			}
-			int numEvents = usersNumSelections.get(userId) + 1;
-			usersNumSelections.put(userId, numEvents);
-
-			String viewId = event.getOriginId();
-			if (!normalViewSelections.containsKey(viewId)) {
-				normalViewSelections.put(viewId, 0);
-			}
-			int normal = normalViewSelections.get(viewId) + 1;
-			normalViewSelections.put(viewId, normal);
-		}
-	}
-
-	public List<String> getSummary(int userId, boolean html) {
-		Map<String, Integer> normalViewSelections = usersNormalViewSelections.get(userId);
-
-		float numSelections = usersNumSelections.get(userId);
-
-		List<String> summaries = new ArrayList<String>();
-		List<String> viewUsage = new ArrayList<String>();
-		for (String view : normalViewSelections.keySet()) {
-			float viewUse = ((float) (normalViewSelections.get(view))) / numSelections;
-			String formattedViewUse = formatAsPercentage(viewUse);
-			String ending = ""; //$NON-NLS-1$
-			if (html) {
-				ending = "<br>"; //$NON-NLS-1$
-			}
-			viewUsage.add(formattedViewUse + ": " + view + " (" + normalViewSelections.get(view) + ")" + ending); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		Collections.sort(viewUsage, new PercentUsageComparator());
-		int numViewsToReport = 0;
-		for (String viewUsageSummary : viewUsage) {
-			if (maxViewsToReport == -1 || numViewsToReport < maxViewsToReport || viewUsageSummary.contains("mylar")) { //$NON-NLS-1$
-				summaries.add(viewUsageSummary);
-				numViewsToReport++;
-			}
-		}
-		return summaries;
-	}
-
-	private String formatAsPercentage(float viewUse) {
-		String formattedViewUse = ("" + viewUse * 100); //$NON-NLS-1$
-
-		// sometimes the floats are so small that formattedViewUsage ends up
-		// being
-		// something like 7.68334E-4, which would get formatted to 7.68% without
-		// this check
-		if (formattedViewUse.contains("E")) { //$NON-NLS-1$
-			return "0.00%"; //$NON-NLS-1$
-		}
-
-		int indexOf2ndDecimal = formattedViewUse.indexOf('.') + 3;
-		if (indexOf2ndDecimal <= formattedViewUse.length()) {
-			formattedViewUse = formattedViewUse.substring(0, indexOf2ndDecimal);
-		}
-		return formattedViewUse + "%"; //$NON-NLS-1$
-	}
-
-	public List<String> getReport() {
-		List<String> summaries = new ArrayList<String>();
-		for (int userId : usersNormalViewSelections.keySet()) {
-			summaries.addAll(getSummary(userId, true));
-		}
-		return summaries;
-	}
-
-	public String getReportTitle() {
-		return Messages.ViewUsageCollector_View_Usage;
-	}
-
-	public void exportAsCSVFile(String directory) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * For testing.
-	 */
-	public Map<String, Integer> getNormalViewSelections() {
-		Map<String, Integer> normalViewSelections = new HashMap<String, Integer>();
-		for (int userId : usersNormalViewSelections.keySet()) {
-			normalViewSelections.putAll(usersNormalViewSelections.get(userId));
-		}
-		return normalViewSelections;
-	}
-
-	public void setMaxViewsToReport(int maxViewsToReport) {
-		this.maxViewsToReport = maxViewsToReport;
-	}
-
-	public Map<Integer, Map<String, Integer>> getUsersNormalViewSelections() {
-		return usersNormalViewSelections;
-	}
-
-	public List<String> getPlainTextReport() {
-		List<String> summaries = new ArrayList<String>();
-		for (int userId : usersNormalViewSelections.keySet()) {
-			summaries.addAll(getSummary(userId, false));
-		}
-		return summaries;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/messages.properties b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/messages.properties
deleted file mode 100644
index f503edd..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/internal/monitor/core/collection/messages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-CommandUsageCollector_Command_Usage=Command Usage
-
-DataOverviewCollector_active_use=\ active use; 
-DataOverviewCollector_CSV_ACTIVE_USE=Active Use
-DataOverviewCollector_CSV_ELAPSED_USE=Elapsed Use
-DataOverviewCollector_CSV_END=End
-DataOverviewCollector_CSV_EVENTS=Events
-DataOverviewCollector_CSV_START=Start
-DataOverviewCollector_CSV_USER=User
-DataOverviewCollector_Data_Overview=Data Overview
-DataOverviewCollector_events=\ events; 
-DataOverviewCollector__h4_Data_Overview_h4_=<h4>Data Overview</h4>
-DataOverviewCollector_Number_of_Users_=Number of Users: 
-DataOverviewCollector_TO_PERIOD_OF_HOURS={0} to {1}, a period of {2} hours.
-
-SummaryCollector_END_DATE=, End date: 
-SummaryCollector_Number_of_commands_=Number of commands: 
-SummaryCollector_Number_of_events_=Number of events: 
-SummaryCollector_Number_of_preference_changes=Number of preference changes: 
-SummaryCollector_Number_of_selections_=Number of selections: 
-SummaryCollector_Start_date_=Start date: 
-SummaryCollector_Summary=Summary
-
-ViewUsageCollector_View_Usage=View Usage
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/AbstractMonitorLog.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/AbstractMonitorLog.java
deleted file mode 100644
index c1835e4..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/AbstractMonitorLog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.core;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.monitor.core.IMonitorCoreConstants;
-
-/**
- * Used for logging interaction events.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractMonitorLog {
-
-	protected File outputFile;
-
-	protected FileOutputStream outputStream;
-
-	protected boolean started = false;
-
-	public AbstractMonitorLog() {
-		super();
-	}
-
-	public void startMonitoring() {
-		synchronized (this) {
-			if (started) {
-				return;
-			} else {
-				started = true;
-			}
-		}
-		try {
-			if (!outputFile.exists()) {
-				outputFile.createNewFile();
-			}
-			outputStream = new FileOutputStream(outputFile, true);
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, IMonitorCoreConstants.ID_PLUGIN, "Could not log to file: " //$NON-NLS-1$
-					+ outputFile.getAbsolutePath(), e));
-		}
-	}
-
-	public void stopMonitoring() {
-		try {
-			if (outputStream != null) {
-				outputStream.flush();
-				outputStream.close();
-			}
-			started = false;
-		} catch (IOException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, IMonitorCoreConstants.ID_PLUGIN,
-					"Could not close interaction event stream", e)); //$NON-NLS-1$
-		}
-	}
-
-	public File moveOutputFile(String newPath) {
-		stopMonitoring();
-		File newFile = new File(newPath);
-		try {
-			if (outputFile.exists() && !newFile.exists()) {
-				outputFile.renameTo(newFile);
-			} else if (!newFile.exists()) {
-				newFile.createNewFile();
-				outputFile.delete();
-			} else {
-				outputFile.delete();
-			}
-			this.outputFile = newFile;
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, IMonitorCoreConstants.ID_PLUGIN,
-					"Could not set logger output file", e)); //$NON-NLS-1$
-		}
-		startMonitoring();
-		return newFile;
-	}
-
-	public File getOutputFile() {
-		return outputFile;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/IInteractionEventListener.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/IInteractionEventListener.java
deleted file mode 100644
index 4846c39..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/IInteractionEventListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.core;
-
-/**
- * Notified of interaction events and the logging lifecycle.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public interface IInteractionEventListener {
-
-	public abstract void interactionObserved(InteractionEvent event);
-
-	public abstract void startMonitoring();
-
-	public abstract void stopMonitoring();
-}
diff --git a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/InteractionEvent.java b/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/InteractionEvent.java
deleted file mode 100644
index 87b89c2..0000000
--- a/org.eclipse.mylyn.monitor.core/src/org/eclipse/mylyn/monitor/core/InteractionEvent.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.core;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.eclipse.core.runtime.Assert;
-
-/**
- * Immutable. Encapsulates interaction made by the user or on behalf of the user.
- * 
- * Also see: http://wiki.eclipse.org/index.php/Mylyn_Integrator_Reference#Monitor_API
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public class InteractionEvent {
-
-	/**
-	 * Determines the type of interaction that took place, either initiated by the user or done on behalf of the user.
-	 */
-	public enum Kind {
-		/**
-		 * User selection of elements, issued by the Eclipse post-selection mechanism.
-		 */
-		SELECTION,
-
-		/**
-		 * Edit events that are created by text selections in an editor.
-		 */
-		EDIT,
-
-		/**
-		 * Commands and actions invoked via buttons, menus, and keyboard shortcuts.
-		 */
-		COMMAND,
-
-		/**
-		 * Workbench preference changes, sometimes made by the user, sometimes automatically on behalf of the user.
-		 */
-		PREFERENCE,
-
-		/**
-		 * Candidates for future interaction.
-		 */
-		PREDICTION,
-
-		/**
-		 * Indirect user interaction with elements (e.g. parent gets implicitly selected when element is selected).
-		 */
-		PROPAGATION,
-
-		/**
-		 * Direct manipulation of interest via actions such as "Mark as Landmark" and "Mark Less Interesting".
-		 */
-		MANIPULATION,
-
-		/**
-		 * Capture interaction with tasks, the workbench, and lifecycle events that define where the user's attention is
-		 * directed.
-		 */
-		ATTENTION;
-
-		/**
-		 * TODO: add PREFERENCE?
-		 */
-		public boolean isUserEvent() {
-			return this == SELECTION || this == EDIT || this == COMMAND || this == PREFERENCE;
-		}
-
-		/**
-		 * @return Simple string representation of the event kind or "null" if no such kind.
-		 */
-		@Override
-		public String toString() {
-			switch (this) {
-			case SELECTION:
-				return "selection"; //$NON-NLS-1$
-			case EDIT:
-				return "edit"; //$NON-NLS-1$
-			case COMMAND:
-				return "command"; //$NON-NLS-1$
-			case PREFERENCE:
-				return "preference"; //$NON-NLS-1$
-			case PREDICTION:
-				return "prediction"; //$NON-NLS-1$
-			case PROPAGATION:
-				return "propagation"; //$NON-NLS-1$
-			case MANIPULATION:
-				return "manipulation"; //$NON-NLS-1$
-			case ATTENTION:
-				return "attention"; //$NON-NLS-1$
-			default:
-				return "null"; //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * @return The corresponding event based on the string provided, or null if no such STring.
-		 */
-		public static Kind fromString(String string) {
-			if (string == null) {
-				return null;
-			}
-			if (string.equals("selection")) { //$NON-NLS-1$
-				return SELECTION;
-			}
-			if (string.equals("edit")) { //$NON-NLS-1$
-				return EDIT;
-			}
-			if (string.equals("command")) { //$NON-NLS-1$
-				return COMMAND;
-			}
-			if (string.equals("preference")) { //$NON-NLS-1$
-				return PREFERENCE;
-			}
-			if (string.equals("prediction")) { //$NON-NLS-1$
-				return PREDICTION;
-			}
-			if (string.equals("propagation")) { //$NON-NLS-1$
-				return PROPAGATION;
-			}
-			if (string.equals("manipulation")) { //$NON-NLS-1$
-				return MANIPULATION;
-			}
-			if (string.equals("attention")) { //$NON-NLS-1$
-				return ATTENTION;
-			}
-			return null;
-		}
-	}
-
-	private final Kind kind;
-
-	private final Date date;
-
-	private final Date endDate;
-
-	private final String originId;
-
-	private final String structureKind;
-
-	private final String structureHandle;
-
-	private final String navigation;
-
-	private final String delta;
-
-	private final float interestContribution;
-
-	/**
-	 * Use to specify an uknown identifier, e.g. for an originId.
-	 */
-	public static final String ID_UNKNOWN = "?"; //$NON-NLS-1$
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId) {
-		this(kind, structureKind, handle, originId, 1f);
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId, String navigatedRelation) {
-		this(kind, structureKind, handle, originId, navigatedRelation, "null", 1f); //$NON-NLS-1$
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId, String navigatedRelation,
-			float interestContribution) {
-		this(kind, structureKind, handle, originId, navigatedRelation, "null", interestContribution); //$NON-NLS-1$
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public static InteractionEvent makeCommand(String originId, String delta) {
-		return new InteractionEvent(InteractionEvent.Kind.COMMAND, "null", "null", originId, "null", delta, 1); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public static InteractionEvent makeCopy(InteractionEvent originalEvent, float newInterestContribution) {
-		return new InteractionEvent(originalEvent.getKind(), originalEvent.getStructureKind(),
-				originalEvent.getStructureHandle(), originalEvent.getOriginId(), originalEvent.getNavigation(),
-				originalEvent.getDelta(), newInterestContribution, originalEvent.getDate(), originalEvent.getEndDate());
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public static InteractionEvent makePreference(String originId, String delta) {
-		return new InteractionEvent(InteractionEvent.Kind.PREFERENCE, "null", "null", originId, "null", delta, 1); // default //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		// contribution
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId, float interestContribution) {
-		this(kind, structureKind, handle, originId, "null", "null", interestContribution); // default //$NON-NLS-1$ //$NON-NLS-2$
-		// contribution
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId, String navigatedRelation,
-			String delta, float interestContribution) {
-		Assert.isNotNull(kind);
-		Assert.isNotNull(originId);
-		this.kind = kind;
-		this.structureKind = structureKind;
-		this.structureHandle = handle;
-		this.originId = originId;
-		this.navigation = navigatedRelation;
-		this.delta = delta;
-		this.interestContribution = interestContribution;
-		this.date = Calendar.getInstance().getTime();
-		this.endDate = this.date;
-	}
-
-	/**
-	 * For parameter description see this class's getters.
-	 */
-	public InteractionEvent(Kind kind, String structureKind, String handle, String originId, String navigatedRelation,
-			String delta, float interestContribution, Date startDate, Date endDate) {
-		Assert.isNotNull(kind);
-		Assert.isNotNull(originId);
-		Assert.isNotNull(startDate);
-		Assert.isNotNull(endDate);
-		this.kind = kind;
-		this.structureKind = structureKind;
-		this.structureHandle = handle;
-		this.originId = originId;
-		this.navigation = navigatedRelation;
-		this.delta = delta;
-		this.interestContribution = interestContribution;
-		this.date = startDate;
-		this.endDate = endDate;
-	}
-
-	@Override
-	public boolean equals(Object object) {
-		if (object == null || !(object instanceof InteractionEvent)) {
-			return false;
-		}
-		InteractionEvent event = (InteractionEvent) object;
-		return (date == null ? event.date == null : date.equals(event.date))
-				&& (endDate == null ? event.endDate == null : endDate.equals(event.endDate))
-				&& (kind == null ? event.kind == null : kind.equals(event.kind))
-				&& (structureKind == null ? event.structureKind == null : structureKind.equals(event.structureKind))
-				&& (structureHandle == null ? event.structureHandle == null
-						: structureHandle.equals(event.structureHandle))
-				&& (originId == null ? event.originId == null : originId.equals(event.originId))
-				&& (navigation == null ? event.navigation == null : navigation.equals(event.navigation))
-				&& (delta == null ? event.delta == null : delta.equals(event.delta))
-				&& interestContribution == event.interestContribution;
-	}
-
-	@Override
-	public int hashCode() {
-		int hashCode = 0;
-		if (date != null) {
-			hashCode += date.hashCode();
-		}
-		if (endDate != null) {
-			hashCode += endDate.hashCode();
-		}
-		if (kind != null) {
-			hashCode += kind.hashCode();
-		}
-		if (structureKind != null) {
-			hashCode += structureKind.hashCode();
-		}
-		if (structureHandle != null) {
-			hashCode += structureHandle.hashCode();
-		}
-		if (originId != null) {
-			hashCode += originId.hashCode();
-		}
-		if (navigation != null) {
-			hashCode += navigation.hashCode();
-		}
-		if (delta != null) {
-			hashCode += delta.hashCode();
-		}
-		// TODO: could this lose precision?
-		hashCode += new Float(interestContribution).hashCode();
-		return hashCode;
-	}
-
-	@Override
-	public String toString() {
-		return "(date: " + date + ", kind: " + kind + ", sourceHandle: " + structureHandle + ", origin: " + originId //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				+ ", delta: " + delta + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public boolean isValidStructureHandle() {
-		return structureHandle != null && !structureHandle.equals("null") && !structureHandle.trim().equals(ID_UNKNOWN); //$NON-NLS-1$
-	}
-
-	// TODO 4.0 change to getHandleIdentifier()
-	public String getStructureHandle() {
-		return structureHandle;
-	}
-
-	/**
-	 * @return The content type of the element being interacted with.
-	 */
-	public String getStructureKind() {
-		return structureKind;
-	}
-
-	/**
-	 * @return Time stamp for the occurrence of the event.
-	 */
-	public Date getDate() {
-		return date;
-	}
-
-	/**
-	 * Can be used for extensibility, e.g. by adding an XML-encoded String.
-	 * 
-	 * @return Additional information relevant to interaction monitoring.
-	 */
-	public String getDelta() {
-		return delta;
-	}
-
-	/**
-	 * @return Defines the kind of interaction that took place.
-	 */
-	public Kind getKind() {
-		return kind;
-	}
-
-	/**
-	 * @return The UI affordance that the event was issued from.
-	 */
-	public String getOriginId() {
-		return originId;
-	}
-
-	/**
-	 * @return If an aggregate event, amount of interest of all contained events.
-	 */
-	// TODO: consider refactoring in order to de-couple events from interest.
-	public float getInterestContribution() {
-		return interestContribution;
-	}
-
-	/**
-	 * @return If an aggregate event, time stamp of the last occurrence.
-	 */
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	/**
-	 * @return An identifier for the kind of relation that corresponds to the navigation to this element.
-	 */
-	public String getNavigation() {
-		return navigation;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/.classpath b/org.eclipse.mylyn.monitor.tests/.classpath
deleted file mode 100644
index 71ff97d..0000000
--- a/org.eclipse.mylyn.monitor.tests/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="org/eclipse/mylar/monitor/usage/tests/" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/mylyn/**"/>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.monitor.tests/.cvsignore b/org.eclipse.mylyn.monitor.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.monitor.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.monitor.tests/.project b/org.eclipse.mylyn.monitor.tests/.project
deleted file mode 100644
index 47490df..0000000
--- a/org.eclipse.mylyn.monitor.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.monitor.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6c30227..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:43 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index d51268c..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,145 +0,0 @@
-#Tue Apr 08 17:50:00 PDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Error
-ANNOTATION_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD_WITH_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_LEAK=Ignore
-API_PROFILE_ELEMENT_TYPE_REMOVED_API_COMPONENT=Error
-CLASS_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
-CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-CLASS_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERCLASS_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
-CLASS_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
-CLASS_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
-CLASS_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-CLASS_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
-ENUM_ELEMENT_TYPE_ADDED_FIELD=Error
-ENUM_ELEMENT_TYPE_ADDED_METHOD=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-ENUM_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
-ENUM_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
-ENUM_ELEMENT_TYPE_CHANGED_TO_INTERFACE=Error
-ENUM_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENTS=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Ignore
-ILLEGAL_IMPLEMENT=Ignore
-ILLEGAL_INSTANTIATE=Ignore
-ILLEGAL_OVERRIDE=Ignore
-ILLEGAL_REFERENCE=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-INTERFACE_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETERS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_INTERFACE_BOUNDS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TO_ANNOTATION=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TO_CLASS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TO_ENUM=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-METHOD_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-METHOD_ELEMENT_TYPE_ADDED_INTERFACE_BOUNDS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-METHOD_ELEMENT_TYPE_REMOVED_INTERFACE_BOUNDS=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETERS=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.monitor.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.monitor.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.monitor.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9228e88..0000000
--- a/org.eclipse.mylyn.monitor.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Mylyn Monitor Tests
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.tests
-Bundle-Version: 0.0.0
-Bundle-Activator: org.eclipse.mylyn.monitor.tests.MonitorTestsPlugin
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.eclipse.mylyn.context.core,
- org.eclipse.mylyn.context.tests,
- org.eclipse.jdt.ui,
- org.eclipse.mylyn.java.ui,
- org.eclipse.mylyn.context.ui,
- org.eclipse.mylyn.tasks.ui,
- org.eclipse.ui.ide,
- org.eclipse.mylyn.monitor.usage,
- org.eclipse.mylyn.monitor.ui,
- org.eclipse.mylyn.monitor.core,
- org.eclipse.mylyn.commons.core
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: mylyn-monitor-tests.jar
-Export-Package: org.eclipse.mylyn.monitor.reports.tests;x-internal:=true,
- org.eclipse.mylyn.monitor.tests;x-internal:=true,
- org.eclipse.mylyn.monitor.tests.usage.tests;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.monitor.tests/about.html b/org.eclipse.mylyn.monitor.tests/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.monitor.tests/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.tests/build.properties b/org.eclipse.mylyn.monitor.tests/build.properties
deleted file mode 100644
index 4f3a7d7..0000000
--- a/org.eclipse.mylyn.monitor.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Mylyn project committers and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-bin.includes = META-INF/,\
-               mylyn-monitor-tests.jar,\
-               about.html,\
-               testdata/,\
-               test-log.xml
-jars.compile.order = mylyn-monitor-tests.jar
-source.mylyn-monitor-tests.jar = src/
-output.mylyn-monitor-tests.jar = bin/
-src.includes = about.html
-jre.compilation.profile = J2SE-1.5
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/AllMonitorReportTests.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/AllMonitorReportTests.java
deleted file mode 100644
index 0b2ebea..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/AllMonitorReportTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.reports.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Gail Murphy
- */
-public class AllMonitorReportTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.monitor.ui.report.tests");
-
-		// $JUnit-BEGIN$
-		// TODO: Add tests as they are developed
-		suite.addTestSuite(DataOverviewCollectorTest.class);
-		suite.addTestSuite(ContextParsingTest.class);
-		// $JUnit-END$
-
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/ContextParsingTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/ContextParsingTest.java
deleted file mode 100644
index 89be346..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/ContextParsingTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.reports.tests;
-
-import java.io.File;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.mylyn.context.core.IInteractionElement;
-import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.context.core.InteractionContextScaling;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.tests.MonitorTestsPlugin;
-
-/**
- * @author Mik Kersten
- */
-public class ContextParsingTest extends TestCase {
-
-	private static final String PATH_USAGE_FILE = "testdata/usage-parsing.zip";
-
-	private List<InteractionEvent> events;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		File file;
-		if (MonitorTestsPlugin.getDefault() != null) {
-			file = FileTool.getFileInPlugin(MonitorTestsPlugin.getDefault(), new Path(PATH_USAGE_FILE));
-		} else {
-			file = new File(PATH_USAGE_FILE);
-		}
-		InteractionEventLogger logger = new InteractionEventLogger(file);
-		events = logger.getHistoryFromFile(file);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		events.clear();
-	}
-
-	public void testOriginIdValidity() {
-		for (InteractionEvent event : events) {
-			if (event.isValidStructureHandle()) {
-				assertFalse(event.getStructureHandle().equals("null"));
-			}
-		}
-	}
-
-	public void testHistoryParsingWithDecayReset() {
-		InteractionContextScaling scalingFactors = new InteractionContextScaling();
-		// scalingFactors.setDecay(new ScalingFactor("decay", .05f));
-		InteractionContext context = new InteractionContext("test", scalingFactors);
-		int numEvents = 0;
-		for (InteractionEvent event : events) {
-			if (event.isValidStructureHandle()) {
-				// if (SelectionMonitor.isValidStructureHandle(event)) {
-				InteractionEvent newEvent = InteractionEvent.makeCopy(event, 1f);
-				context.parseEvent(newEvent);
-				if (event.isValidStructureHandle() && event.getKind().equals(InteractionEvent.Kind.SELECTION)) {
-					// if (SelectionMonitor.isValidStructureHandle(event) &&
-					// event.getKind().equals(InteractionEvent.Kind.SELECTION))
-					// {
-					IInteractionElement element = context.parseEvent(event);
-
-					// reset decay if not selected
-					if (element.getInterest().getValue() < 0) {
-						float decayOffset = (-1) * (element.getInterest().getValue()) + 1;
-						element = context.parseEvent(new InteractionEvent(InteractionEvent.Kind.MANIPULATION,
-								event.getStructureKind(), event.getStructureHandle(), "test-decay", decayOffset));
-					}
-
-					assertTrue("should be positive: " + element.getInterest().getValue(), element.getInterest()
-							.getValue() >= 0);
-					numEvents++;
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/DataOverviewCollectorTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/DataOverviewCollectorTest.java
deleted file mode 100644
index 76669e9..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/DataOverviewCollectorTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.reports.tests;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.mylyn.internal.monitor.core.collection.DataOverviewCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.ReportGenerator;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.monitor.core.AbstractMonitorLog;
-import org.eclipse.mylyn.monitor.tests.MonitorTestsPlugin;
-
-/**
- * 
- * @author Gail Murphy
- */
-public class DataOverviewCollectorTest extends TestCase {
-
-	private DataOverviewCollector dataOverviewCollector = null;
-
-	public void testNumberOfUsers() {
-		assertTrue(dataOverviewCollector.getNumberOfUsers() == 2);
-	}
-
-	public void testActiveUse() {
-		long activeUse = dataOverviewCollector.getActiveUseOfUser(1);
-		assertTrue("User 1 Use", getHoursOfDuration(activeUse) == 0);
-		activeUse = dataOverviewCollector.getActiveUseOfUser(2);
-		assertTrue("User 2 Use", getHoursOfDuration(activeUse) == 0);
-
-	}
-
-	public void testTimePeriodOfUse() {
-		long durationOfUse = dataOverviewCollector.getDurationUseOfUser(1);
-		assertTrue("User 1 duration", getHoursOfDuration(durationOfUse) == 24);
-		durationOfUse = dataOverviewCollector.getDurationUseOfUser(2);
-		assertTrue("User 2 duration", getHoursOfDuration(durationOfUse) == 24);
-	}
-
-	public void testSizeOfHistory() {
-		int size = dataOverviewCollector.getSizeOfHistory(1);
-		assertTrue("User 1 size", size == 21);
-		size = dataOverviewCollector.getSizeOfHistory(2);
-		assertTrue("User 2 size", size == 21);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		List<File> interactionHistoryFiles = new ArrayList<File>();
-
-		// Access two interaction history files that are copies of each other
-		File firstInteractionHistoryFile = FileTool.getFileInPlugin(MonitorTestsPlugin.getDefault(), new Path(
-				"testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip"));
-		interactionHistoryFiles.add(firstInteractionHistoryFile);
-		File secondInteractionHistoryFile = FileTool.getFileInPlugin(MonitorTestsPlugin.getDefault(), new Path(
-				"testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip"));
-		interactionHistoryFiles.add(secondInteractionHistoryFile);
-
-		// Initialize fake logger
-		File logFile = new File("test-log.xml");
-		logFile.delete();
-		AbstractMonitorLog logger = new InteractionEventLogger(logFile);
-		logger.startMonitoring();
-
-		// Prepare collectors
-		List<IUsageCollector> collectors = new ArrayList<IUsageCollector>();
-		dataOverviewCollector = new DataOverviewCollector("test-");
-		collectors.add(dataOverviewCollector);
-
-		ReportGenerator generator = new ReportGenerator(UiUsageMonitorPlugin.getDefault().getInteractionLogger(),
-				collectors);
-		generator.forceSyncForTesting(true);
-		generator.getStatisticsFromInteractionHistories(interactionHistoryFiles, null);
-
-		// cleanup
-		logFile.delete();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	private long getHoursOfDuration(long duration) {
-		long timeInSeconds = duration / 1000;
-		long hours = timeInSeconds / 3600;
-		return hours;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/FileTool.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/FileTool.java
deleted file mode 100644
index ba7c0e3..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/reports/tests/FileTool.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.reports.tests;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * Provides access to files for testing. TODO: Copied from the bugzilla component - consider refactoring as common
- * utility
- */
-public class FileTool {
-
-	private final static int MAX_RETRY = 5;
-
-	/**
-	 * A buffer.
-	 */
-	private static byte[] buffer = new byte[8192];
-
-	/**
-	 * Unzips the given zip file to the given destination directory extracting only those entries the pass through the
-	 * given filter.
-	 * 
-	 * @param zipFile
-	 *            the zip file to unzip
-	 * @param dstDir
-	 *            the destination directory
-	 * @throws IOException
-	 *             in case of problem
-	 */
-	public static void unzip(ZipFile zipFile, File dstDir) throws IOException {
-		unzip(zipFile, dstDir, dstDir, 0);
-	}
-
-	private static void unzip(ZipFile zipFile, File rootDstDir, File dstDir, int depth) throws IOException {
-
-		Enumeration<? extends ZipEntry> entries = zipFile.entries();
-
-		try {
-			while (entries.hasMoreElements()) {
-				ZipEntry entry = entries.nextElement();
-				if (entry.isDirectory()) {
-					continue;
-				}
-				String entryName = entry.getName();
-				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
-				file.getParentFile().mkdirs();
-				InputStream src = null;
-				OutputStream dst = null;
-				try {
-					src = zipFile.getInputStream(entry);
-					dst = new FileOutputStream(file);
-					transferData(src, dst);
-				} finally {
-					if (dst != null) {
-						try {
-							dst.close();
-						} catch (IOException e) {
-							// don't worry in the finally
-						}
-					}
-					if (src != null) {
-						try {
-							src.close();
-						} catch (IOException e) {
-							// don't worry in the finally
-						}
-					}
-				}
-			}
-		} finally {
-			try {
-				zipFile.close();
-			} catch (IOException e) {
-				// don't worry in the finally
-			}
-		}
-	}
-
-	/**
-	 * Returns the given file path with its separator character changed from the given old separator to the given new
-	 * separator.
-	 * 
-	 * @param path
-	 *            a file path
-	 * @param oldSeparator
-	 *            a path separator character
-	 * @param newSeparator
-	 *            a path separator character
-	 * @return the file path with its separator character changed from the given old separator to the given new
-	 *         separator
-	 */
-	public static String changeSeparator(String path, char oldSeparator, char newSeparator) {
-		return path.replace(oldSeparator, newSeparator);
-	}
-
-	/**
-	 * Copies all bytes in the given source file to the given destination file.
-	 * 
-	 * @param source
-	 *            the given source file
-	 * @param destination
-	 *            the given destination file
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void transferData(File source, File destination) throws IOException {
-		destination.getParentFile().mkdirs();
-		InputStream is = null;
-		OutputStream os = null;
-		try {
-			is = new FileInputStream(source);
-			os = new FileOutputStream(destination);
-			transferData(is, os);
-		} finally {
-			if (os != null) {
-				try {
-					os.close();
-				} catch (IOException e) {
-					// don't worry in the finally
-				}
-			}
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					// don't worry in the finally
-				}
-			}
-		}
-	}
-
-	/**
-	 * Copies all bytes in the given source stream to the given destination stream. Neither streams are closed.
-	 * 
-	 * @param source
-	 *            the given source stream
-	 * @param destination
-	 *            the given destination stream
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void transferData(InputStream source, OutputStream destination) throws IOException {
-		int bytesRead = 0;
-		while (bytesRead != -1) {
-			bytesRead = source.read(buffer, 0, buffer.length);
-			if (bytesRead != -1) {
-				destination.write(buffer, 0, bytesRead);
-			}
-		}
-	}
-
-	/**
-	 * Copies the given source file to the given destination file.
-	 * 
-	 * @param src
-	 *            the given source file
-	 * @param dst
-	 *            the given destination file
-	 * @throws IOException
-	 *             in case of error
-	 */
-	public static void copy(File src, File dst) throws IOException {
-		if (src.isDirectory()) {
-			String[] srcChildren = src.list();
-			for (int i = 0; i < srcChildren.length; ++i) {
-				File srcChild = new File(src, srcChildren[i]);
-				File dstChild = new File(dst, srcChildren[i]);
-				copy(srcChild, dstChild);
-			}
-		} else {
-			transferData(src, dst);
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	public static File getFileInPlugin(Plugin plugin, IPath path) {
-		try {
-			URL installURL = plugin.getBundle().getEntry(path.toString());
-			URL localURL = Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	public static File createTempFileInPlugin(Plugin plugin, IPath path) {
-		IPath stateLocation = plugin.getStateLocation();
-		stateLocation = stateLocation.append(path);
-		return stateLocation.toFile();
-	}
-
-	public static StringBuffer read(String fileName) throws IOException {
-		return read(new FileReader(fileName));
-	}
-
-	public static StringBuffer read(Reader reader) throws IOException {
-		StringBuffer s = new StringBuffer();
-		try {
-			char[] charBuffer = new char[8196];
-			int chars = reader.read(charBuffer);
-			while (chars != -1) {
-				s.append(charBuffer, 0, chars);
-				chars = reader.read(charBuffer);
-			}
-		} finally {
-			try {
-				reader.close();
-			} catch (IOException e) {
-				// don't worry in the finally
-			}
-		}
-		return s;
-	}
-
-	public static void write(String fileName, StringBuffer content) throws IOException {
-		Writer writer = new FileWriter(fileName);
-		try {
-			writer.write(content.toString());
-		} finally {
-			try {
-				writer.close();
-			} catch (IOException e) {
-				// don't worry in the finally
-			}
-		}
-	}
-
-	public static void delete(File file) {
-		if (file.exists()) {
-			for (int i = 0; i < MAX_RETRY; i++) {
-				if (file.delete()) {
-					i = MAX_RETRY;
-				} else {
-					try {
-						Thread.sleep(1000); // sleep a second
-					} catch (InterruptedException e) {
-						// don't care if the sleep is interrupted
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/AllMonitorTests.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/AllMonitorTests.java
deleted file mode 100644
index d84ada2..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/AllMonitorTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.mylyn.monitor.reports.tests.AllMonitorReportTests;
-import org.eclipse.mylyn.monitor.tests.usage.tests.AllMonitorUsageTests;
-
-/**
- * @author Mik Kersten
- */
-public class AllMonitorTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.monitor.ui.tests");
-		suite.addTest(AllMonitorUsageTests.suite());
-		suite.addTest(AllMonitorReportTests.suite());
-		suite.addTestSuite(InteractionLoggerTest.class);
-		suite.addTestSuite(StatisticsLoggingTest.class);
-		suite.addTestSuite(MonitorTest.class);
-		suite.addTestSuite(InteractionEventExternalizationTest.class);
-		suite.addTestSuite(MonitorPackagingTest.class);
-		suite.addTestSuite(MultiWindowMonitorTest.class);
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/CheckActivityJobTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/CheckActivityJobTest.java
deleted file mode 100644
index 88b6e48..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/CheckActivityJobTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.internal.monitor.ui.CheckActivityJob;
-import org.eclipse.mylyn.internal.monitor.ui.IActivityManagerCallback;
-
-/**
- * @author Steffen Pingel
- */
-public class CheckActivityJobTest extends TestCase {
-
-	private StubCallback callback;
-
-	private TestableCheckActivityJob job;
-
-	@Override
-	protected void setUp() throws Exception {
-		callback = new StubCallback();
-		job = new TestableCheckActivityJob(callback);
-	}
-
-	public void testInactivityTimeout() throws Exception {
-		callback.lastEventTime = System.currentTimeMillis() - 41;
-		job.setInactivityTimeout(40);
-		job.run();
-		assertFalse(job.isActive());
-		job.run();
-		assertFalse(job.isActive());
-		callback.lastEventTime = System.currentTimeMillis();
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(0, callback.activeTime);
-		Thread.sleep(6);
-		job.run();
-		assertTrue(job.isActive());
-		assertTrue("expected less than 5 < activeTime < 20, got " + callback.activeTime, callback.activeTime > 5
-				&& callback.activeTime < 20);
-	}
-
-	public void testResumeFromSleepNoTimeout() throws Exception {
-		job.setInactivityTimeout(0);
-		job.run();
-		assertTrue(job.isActive());
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(1, callback.eventCount);
-		job.run();
-		assertEquals(2, callback.eventCount);
-		assertTrue(job.isActive());
-		Thread.sleep(11);
-		job.run();
-		assertTrue(job.isActive());
-		assertTrue("expected more than 10 ms, got " + callback.activeTime, callback.activeTime > 10);
-		assertEquals(3, callback.eventCount);
-	}
-
-	public void testResumeFromSleepTimeoutNoEvent() throws Exception {
-		callback.lastEventTime = System.currentTimeMillis();
-		job.setInactivityTimeout(20);
-		job.setTick(20);
-		job.run();
-		assertTrue(job.isActive());
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(1, callback.eventCount);
-		Thread.sleep(61);
-		// resume from sleep past timeout
-		job.run();
-		assertFalse(job.isActive());
-		job.run();
-		assertFalse(job.isActive());
-		assertTrue("expected less than 10 ms, got " + callback.activeTime, callback.activeTime < 10);
-		assertEquals(1, callback.eventCount);
-		assertEquals(callback.lastEventTime, callback.startTime);
-	}
-
-	public void testResumeFromSleepTimeoutEvent() throws Exception {
-		callback.lastEventTime = System.currentTimeMillis();
-		job.setInactivityTimeout(20);
-		job.setTick(20);
-		job.run();
-		assertTrue(job.isActive());
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(1, callback.eventCount);
-		Thread.sleep(41);
-		// resume from sleep past timeout
-		job.run();
-		assertTrue(callback.inactive);
-		assertFalse(job.isActive());
-		Thread.sleep(11);
-		// should still discard events
-		job.run();
-		assertFalse(job.isActive());
-		// start activity
-		callback.lastEventTime = System.currentTimeMillis();
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(1, callback.eventCount);
-		Thread.sleep(11);
-		job.run();
-		// check if time sleeping was logged
-		assertTrue("expected less than 10 < activeTime < 20, got " + callback.activeTime, callback.activeTime > 10
-				&& callback.activeTime < 20);
-		assertEquals(2, callback.eventCount);
-	}
-
-	public void testResumeFromSleepTimeoutEventDiscarded() throws Exception {
-		callback.lastEventTime = System.currentTimeMillis();
-		job.setInactivityTimeout(20);
-		job.setTick(20);
-		job.run();
-		assertTrue(job.isActive());
-		job.run();
-		assertTrue(job.isActive());
-		assertEquals(1, callback.eventCount);
-		Thread.sleep(61);
-		// resume from sleep past timeout
-		callback.lastEventTime = System.currentTimeMillis();
-		job.run();
-		assertFalse(callback.inactive);
-		assertTrue(job.isActive());
-		Thread.sleep(6);
-		job.run();
-		assertTrue(job.isActive());
-		// check if time sleeping was logged
-		assertTrue("expected less than 5 < activeTime < 10, got " + callback.activeTime, callback.activeTime > 5
-				&& callback.activeTime < 10);
-		assertEquals(2, callback.eventCount);
-	}
-
-	private class TestableCheckActivityJob extends CheckActivityJob {
-
-		public TestableCheckActivityJob(IActivityManagerCallback callback) {
-			super(callback);
-		}
-
-		public IStatus run() {
-			return super.run(new NullProgressMonitor());
-		}
-
-		@Override
-		protected boolean isEnabled() {
-			return true;
-		}
-
-		public void setPreviousEventTime(long previousEventTime) {
-			this.previousEventTime = previousEventTime;
-		}
-
-		public void setTick(long tick) {
-			this.tick = tick;
-		}
-
-		@Override
-		public void reschedule() {
-			// ignore, job is called explicitly from test
-		}
-
-	}
-
-	private class StubCallback implements IActivityManagerCallback {
-
-		private boolean inactive;
-
-		private long lastEventTime;
-
-		private long activeTime;
-
-		private long eventCount;
-
-		private long startTime;
-
-		public void addMonitoredActivityTime(long startTime, long endTime) {
-			this.startTime = startTime;
-			this.activeTime += endTime - startTime;
-			this.eventCount++;
-		}
-
-		public void inactive() {
-			this.inactive = true;
-		}
-
-		public long getLastEventTime() {
-			return this.lastEventTime;
-		}
-
-		public void active() {
-		}
-
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionEventExternalizationTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionEventExternalizationTest.java
deleted file mode 100644
index d1c626d..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionEventExternalizationTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.MonitorPreferenceConstants;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-@SuppressWarnings("deprecation")
-public class InteractionEventExternalizationTest extends AbstractContextTest {
-
-	private static final String PATH = "test-log.xml";
-
-	public void testXmlStringConversion() {
-		String testStrings[] = { "single", "simple string with spaces", "<embedded-xml>",
-				"<more complicated=\"xml\"><example with='comp:licated'/></more>",
-				"<embedded>\rcarriage-returns\nnewlines\tand tabs" };
-		for (String s : testStrings) {
-			assertEquals(
-					s,
-					org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertXmlToString(org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(s)));
-		}
-	}
-
-	public void testManualExternalization() throws IOException {
-		UiUsageMonitorPlugin.getPrefs().setValue(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE, false);
-
-		List<InteractionEvent> events = new ArrayList<InteractionEvent>();
-		File f = new File(PATH);
-		if (f.exists()) {
-			f.delete();
-		}
-		InteractionEventLogger logger = new InteractionEventLogger(f);
-		logger.clearInteractionHistory();
-		logger.startMonitoring();
-		String handle = "";
-		for (int i = 0; i < 100; i++) {
-			handle += "1";
-			InteractionEvent event = new InteractionEvent(InteractionEvent.Kind.SELECTION, "structureKind", handle,
-					"originId", "navigatedRelation", "delta", 2f, new Date(), new Date());
-			events.add(event);
-			logger.interactionObserved(event);
-		}
-		logger.stopMonitoring();
-
-		File infile = new File(PATH);
-		List<InteractionEvent> readEvents = logger.getHistoryFromFile(infile);
-		for (int i = 0; i < events.size(); i++) {
-			// NOTE: shouldn't use toString(), but get timezone failures
-			assertEquals(events.get(i), readEvents.get(i));
-			// assertEquals(events.get(i), readEvents.get(i));
-		}
-
-		infile.delete();
-		UiUsageMonitorPlugin.getPrefs().setValue(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE, true);
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionLoggerTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionLoggerTest.java
deleted file mode 100644
index 57e47fb..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/InteractionLoggerTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class InteractionLoggerTest extends TestCase {
-
-	private final InteractionEventLogger logger = UiUsageMonitorPlugin.getDefault().getInteractionLogger();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-	}
-
-	public void testClearHistory() throws IOException {
-		logger.startMonitoring();
-		File monitorFile = logger.getOutputFile();
-		assertTrue(monitorFile.exists());
-		logger.interactionObserved(InteractionEvent.makeCommand("a", "b"));
-		logger.stopMonitoring();
-		assertTrue(monitorFile.length() > 0);
-		logger.clearInteractionHistory();
-		assertEquals(monitorFile.length(), 0);
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MockSelectionMonitor.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MockSelectionMonitor.java
deleted file mode 100644
index afd879e..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MockSelectionMonitor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Mik Kersten
- */
-public class MockSelectionMonitor extends AbstractUserInteractionMonitor {
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		handleElementSelection(part, selection, contributeToContext);
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorPackagingTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorPackagingTest.java
deleted file mode 100644
index e074001..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorPackagingTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.mylyn.context.tests.AbstractContextTest;
-import org.eclipse.mylyn.internal.commons.core.ZipFileUtil;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-
-/**
- * @author Mik Kersten
- */
-public class MonitorPackagingTest extends AbstractContextTest {
-
-	public void testCreateUploadPackage() throws IOException, InterruptedException {
-		UiUsageMonitorPlugin.getDefault().getInteractionLogger().stopMonitoring();
-
-		File monitorFile = UiUsageMonitorPlugin.getDefault().getMonitorLogFile();
-
-		List<File> files = new ArrayList<File>();
-		files.add(monitorFile);
-		// files.add(logFile);
-
-		File zipFile = new File(ContextCorePlugin.getContextStore().getContextDirectory().getParentFile()
-				+ "/mylarUpload.zip");
-
-		ZipFileUtil.createZipFile(zipFile, files);
-
-		// MylarMonitorPlugin.getDefault().startLog();
-		UiUsageMonitorPlugin.getDefault().getInteractionLogger().startMonitoring();
-
-		// pretend to upload
-		Thread.sleep(1000);
-
-		zipFile = new File(ContextCorePlugin.getContextStore().getContextDirectory().getParentFile()
-				+ "/mylarUpload.zip");
-
-		// Open the ZIP file
-		ZipFile zf = new ZipFile(zipFile);
-
-		int numEntries = 0;
-
-		// Enumerate each entry
-		for (Enumeration<? extends ZipEntry> entries = zf.entries(); entries.hasMoreElements();) {
-			numEntries++;
-			String zipEntryName = ((ZipEntry) entries.nextElement()).getName();
-			assertTrue("Unknown Entry: " + zipEntryName, zipEntryName.compareTo(monitorFile.getName()) == 0);// ||
-			// zipEntryName.compareTo(logFile.getName())
-			// ==
-			// 0);
-		}
-		assertEquals("Results not correct size", 1, numEntries);
-
-		// check the length of the zip
-		// long fileLength = monitorFile.length() + logFile.length();
-		// if(monitorFile.length() != 0 || logFile.length() != 0)
-		// assertTrue("Zip didn't help", fileLength > zipFile.length());
-
-		// delete it
-		zipFile.delete();
-	}
-
-	public void testCreateLargeUploadPackage() throws IOException, InterruptedException {
-
-		for (int i = 0; i < 20000; i++) {
-			MonitorUiPlugin.getDefault().notifyInteractionObserved(mockSelection());
-		}
-		testCreateUploadPackage();
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTest.java
deleted file mode 100644
index 40a36d9..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.mylyn.internal.monitor.ui.BrowserMonitor;
-import org.eclipse.mylyn.internal.monitor.ui.KeybindingCommandMonitor;
-import org.eclipse.mylyn.internal.monitor.ui.PerspectiveChangeMonitor;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.IMonitorLifecycleListener;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveRegistry;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Mik Kersten
- */
-public class MonitorTest extends TestCase implements IMonitorLifecycleListener {
-
-	private final InteractionEventLogger logger = UiUsageMonitorPlugin.getDefault().getInteractionLogger();
-
-	private final MockSelectionMonitor selectionMonitor = new MockSelectionMonitor();
-
-	private final KeybindingCommandMonitor commandMonitor = new KeybindingCommandMonitor();
-
-	private final BrowserMonitor browserMonitor = new BrowserMonitor();
-
-	private final PerspectiveChangeMonitor perspectiveMonitor = new PerspectiveChangeMonitor();
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testEnablement() throws IOException {
-		File monitorFile = UiUsageMonitorPlugin.getDefault().getMonitorLogFile();
-		assertTrue(monitorFile.exists());
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-		logger.clearInteractionHistory();
-		assertEquals(0, logger.getHistoryFromFile(monitorFile).size());
-		generateSelection();
-		assertEquals(0, logger.getHistoryFromFile(monitorFile).size());
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		generateSelection();
-		assertEquals(1, logger.getHistoryFromFile(monitorFile).size());
-
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-		generateSelection();
-		assertEquals(1, logger.getHistoryFromFile(monitorFile).size());
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		generateSelection();
-		assertEquals(2, logger.getHistoryFromFile(monitorFile).size());
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-	}
-
-	public void testUrlFilter() {
-		browserMonitor.setAcceptedUrls("url1,url2,url3");
-		assertEquals(3, browserMonitor.getAcceptedUrls().size());
-
-		browserMonitor.setAcceptedUrls(null);
-		assertEquals(0, browserMonitor.getAcceptedUrls().size());
-
-		browserMonitor.setAcceptedUrls("");
-		assertEquals(0, browserMonitor.getAcceptedUrls().size());
-	}
-
-	@SuppressWarnings( { "deprecation", "unchecked" })
-	public void testLogging() throws InterruptedException {
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		logger.stopMonitoring();
-		UiUsageMonitorPlugin.getDefault().getMonitorLogFile().delete();
-		logger.startMonitoring();
-
-		generateSelection();
-		commandMonitor.preExecute("foo.command", new ExecutionEvent(new HashMap(), "trigger", "context"));
-		File monitorFile = UiUsageMonitorPlugin.getDefault().getMonitorLogFile();
-		assertTrue(monitorFile.exists());
-		logger.stopMonitoring();
-		List<InteractionEvent> events = logger.getHistoryFromFile(monitorFile);
-		assertTrue("" + events.size(), events.size() >= 2);
-
-		logger.stopMonitoring();
-		events = logger.getHistoryFromFile(monitorFile);
-		assertTrue(events.size() >= 0);
-		UiUsageMonitorPlugin.getDefault().getMonitorLogFile().delete();
-		logger.startMonitoring();
-
-		generatePerspectiveSwitch();
-		assertTrue(monitorFile.exists());
-		logger.stopMonitoring();
-		events = logger.getHistoryFromFile(monitorFile);
-		assertTrue(events.size() >= 1);
-	}
-
-	private void generateSelection() {
-		selectionMonitor.selectionChanged(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage()
-				.getActivePart(), new StructuredSelection("yo"));
-	}
-
-	private void generatePerspectiveSwitch() {
-		IPerspectiveRegistry registry = PlatformUI.getWorkbench().getPerspectiveRegistry();
-		IPerspectiveDescriptor perspective = registry.clonePerspective("newId", "newLabel",
-				registry.getPerspectives()[0]);
-
-		perspectiveMonitor.perspectiveActivated(null, perspective);
-	}
-
-	boolean monitorRunning = false;
-
-	public void startMonitoring() {
-		monitorRunning = true;
-	}
-
-	public void stopMonitoring() {
-		monitorRunning = false;
-	}
-
-	public void testLifecycleCallbacks() {
-		assertFalse(monitorRunning);
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-		UiUsageMonitorPlugin.getDefault().addMonitoringLifecycleListener(this);
-		assertTrue(monitorRunning);
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		assertTrue(monitorRunning);
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-		assertFalse(monitorRunning);
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		assertTrue(monitorRunning);
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-		assertFalse(monitorRunning);
-
-		UiUsageMonitorPlugin.getDefault().removeMonitoringLifecycleListener(this);
-	}
-}
-
-// public void testLogFileMove() throws IOException {
-// File defaultFile = MylarMonitorPlugin.getDefault().getMonitorLogFile();
-// MylarMonitorPlugin.getDefault().stopMonitoring();
-// assertTrue(logger.clearInteractionHistory());
-//    	
-// MylarMonitorPlugin.getDefault().startMonitoring();
-// generateSelection();
-// generateSelection();
-// assertEquals(2, logger.getHistoryFromFile(defaultFile).size());
-//        
-// File newFile =
-// MylarMonitorPlugin.getDefault().moveMonitorLogFile(ContextCore.getMylarDataDirectory()
-// + "/monitor-test-new.xml");
-// assertNotNull(newFile);
-// File movedFile = MylarMonitorPlugin.getDefault().getMonitorLogFile();
-// assertTrue(!newFile.equals(defaultFile));
-// assertEquals(newFile, movedFile);
-// assertEquals(newFile, logger.getOutputFile());
-// assertEquals(2, logger.getHistoryFromFile(newFile).size());
-// assertEquals(0, logger.getHistoryFromFile(defaultFile).size());
-//    	
-// generateSelection();
-// assertEquals(3, logger.getHistoryFromFile(newFile).size());
-// File restoredFile =
-// MylarMonitorPlugin.getDefault().moveMonitorLogFile(defaultFile.getAbsolutePath());
-// assertNotNull(restoredFile);
-// }
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTestsPlugin.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTestsPlugin.java
deleted file mode 100644
index 69ad783..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MonitorTestsPlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Mik Kersten
- */
-public class MonitorTestsPlugin extends Plugin {
-
-	private static MonitorTestsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public MonitorTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static MonitorTestsPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java
deleted file mode 100644
index 0758122..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/MultiWindowMonitorTest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Brian de Alwis - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.window.WindowManager;
-import org.eclipse.mylyn.internal.monitor.ui.IMonitoredWindow;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.internal.IWorkbenchConstants;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.internal.WorkbenchWindow;
-
-/**
- * @author Brian de Alwis
- * @author Mik Kersten
- * @author Shawn Minto
- */
-public class MultiWindowMonitorTest extends TestCase {
-
-	private class ContextAwareWorkbenchWindow extends WorkbenchWindow implements IMonitoredWindow {
-
-		private boolean monitored = true;
-
-		public ContextAwareWorkbenchWindow(int number, boolean monitored) {
-			super(number);
-			this.monitored = monitored;
-		}
-
-		public boolean isMonitored() {
-			return monitored;
-		}
-
-		public boolean isPerspectiveManaged() {
-			return false;
-		}
-	}
-
-	private class MockWorkbench {
-		private final Workbench wBench;
-
-		private WindowManager parentManager = null;
-
-		private MockWorkbench() {
-			wBench = Workbench.getInstance();
-
-			Field wManagerField;
-			try {
-				wManagerField = Workbench.class.getDeclaredField("windowManager");
-				wManagerField.setAccessible(true);
-				parentManager = (WindowManager) wManagerField.get(wBench);
-
-			} catch (Exception e) {
-			}
-		}
-
-		private int getNewWindowNumber() {
-			Window[] windows = parentManager.getWindows();
-			int count = windows.length;
-
-			boolean checkArray[] = new boolean[count];
-			for (int nX = 0; nX < count; nX++) {
-				if (windows[nX] instanceof WorkbenchWindow) {
-					WorkbenchWindow ww = (WorkbenchWindow) windows[nX];
-					int index = ww.getNumber() - 1;
-					if (index >= 0 && index < count) {
-						checkArray[index] = true;
-					}
-				}
-			}
-
-			for (int index = 0; index < count; index++) {
-				if (!checkArray[index]) {
-					return index + 1;
-				}
-			}
-			return count + 1;
-		}
-
-		private ContextAwareWorkbenchWindow newWorkbenchWindow(boolean isMonitored) {
-			return new ContextAwareWorkbenchWindow(getNewWindowNumber(), isMonitored);
-		}
-
-		public ContextAwareWorkbenchWindow restoreState(IMemento memento, boolean isMonitored) {
-
-			ContextAwareWorkbenchWindow newWindow = newWorkbenchWindow(isMonitored);
-			newWindow.create();
-
-			parentManager.add(newWindow);
-
-			boolean opened = false;
-
-			try {
-				newWindow.restoreState(memento, null);
-				newWindow.open();
-				opened = true;
-			} finally {
-				if (!opened) {
-					newWindow.close();
-				}
-			}
-
-			return newWindow;
-		}
-	}
-
-	private final InteractionEventLogger logger = UiUsageMonitorPlugin.getDefault().getInteractionLogger();
-
-	private final MockSelectionMonitor selectionMonitor = new MockSelectionMonitor();
-
-	private IWorkbenchWindow window1;
-
-	private IWorkbenchWindow window2;
-
-	private IWorkbenchWindow window3;
-
-	private IWorkbenchWindow window4;
-
-	private boolean monitoringWasEnabled;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		monitoringWasEnabled = UiUsageMonitorPlugin.getDefault().isMonitoringEnabled();
-		UiUsageMonitorPlugin.getDefault().stopMonitoring();
-
-		// make sure the MonitorUiPlugin is fully initialized
-		while (PlatformUI.getWorkbench().getDisplay().readAndDispatch()) {
-		}
-
-		window1 = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		assertTrue(MonitorUiPlugin.getDefault().getMonitoredWindows().contains(window1));
-		window2 = duplicateWindow(window1);
-		assertNotNull(window2);
-		assertTrue(MonitorUiPlugin.getDefault().getMonitoredWindows().contains(window2));
-		window3 = createContextAwareWindow(true, window1);
-		assertNotNull(window3);
-		assertTrue(MonitorUiPlugin.getDefault().getMonitoredWindows().contains(window3));
-		window4 = createContextAwareWindow(false, window1);
-		assertNotNull(window4);
-		assertFalse(MonitorUiPlugin.getDefault().getMonitoredWindows().contains(window4));
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		window2.close();
-		window3.close();
-		window4.close();
-		if (monitoringWasEnabled) {
-			UiUsageMonitorPlugin.getDefault().startMonitoring();
-		}
-	}
-
-	protected void generateSelection(IWorkbenchWindow w) {
-		selectionMonitor.selectionChanged(w.getActivePage().getActivePart(), new StructuredSelection("yo"));
-	}
-
-	public void testMultipleWindows() throws IOException {
-		File monitorFile = UiUsageMonitorPlugin.getDefault().getMonitorLogFile();
-		logger.clearInteractionHistory();
-		assertEquals(0, logger.getHistoryFromFile(monitorFile).size());
-
-		generateSelection(window1);
-		assertEquals(0, logger.getHistoryFromFile(monitorFile).size());
-
-		UiUsageMonitorPlugin.getDefault().startMonitoring();
-		generateSelection(window1);
-		generateSelection(window2);
-		generateSelection(window3);
-		generateSelection(window4);
-		assertEquals(3, logger.getHistoryFromFile(monitorFile).size());
-	}
-
-	protected IWorkbenchWindow duplicateWindow(IWorkbenchWindow window) {
-		WorkbenchWindow w = (WorkbenchWindow) window;
-		XMLMemento memento = XMLMemento.createWriteRoot(IWorkbenchConstants.TAG_WINDOW);
-		IStatus status = w.saveState(memento);
-		if (!status.isOK()) {
-			fail("failed to duplicate window: " + status);
-		}
-		return restoreWorkbenchWindow((Workbench) w.getWorkbench(), memento);
-	}
-
-	private IWorkbenchWindow createContextAwareWindow(boolean monitored, IWorkbenchWindow window) {
-		WorkbenchWindow w = (WorkbenchWindow) window;
-		XMLMemento memento = XMLMemento.createWriteRoot(IWorkbenchConstants.TAG_WINDOW);
-		IStatus status = w.saveState(memento);
-		if (!status.isOK()) {
-			fail("failed to duplicate window: " + status);
-		}
-		return new MockWorkbench().restoreState(memento, monitored);
-	}
-
-	protected IWorkbenchWindow restoreWorkbenchWindow(Workbench workbench, IMemento memento) {
-		return (IWorkbenchWindow) invokeMethod(workbench, "restoreWorkbenchWindow", new Class[] { IMemento.class },
-				new Object[] { memento });
-	}
-
-	protected Object invokeMethod(Object instance, String methodName, Class<?> argTypes[], Object arguments[]) {
-		Class<?> clas = instance.getClass();
-		try {
-			Method method = clas.getDeclaredMethod(methodName, argTypes);
-			method.setAccessible(true);
-			return method.invoke(instance, arguments);
-		} catch (Exception ex) {
-			fail("exception during reflective invocation of " + clas.getName() + "." + methodName + ": " + ex);
-			return null;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/StatisticsLoggingTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/StatisticsLoggingTest.java
deleted file mode 100644
index 62852fa..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/StatisticsLoggingTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.mylyn.context.tests.ContextTest;
-import org.eclipse.mylyn.internal.monitor.core.collection.IUsageCollector;
-import org.eclipse.mylyn.internal.monitor.core.collection.InteractionEventSummary;
-import org.eclipse.mylyn.internal.monitor.core.collection.SummaryCollector;
-import org.eclipse.mylyn.internal.monitor.usage.InteractionEventLogger;
-import org.eclipse.mylyn.internal.monitor.usage.ReportGenerator;
-
-/**
- * @author Mik Kersten
- */
-public class StatisticsLoggingTest extends ContextTest {
-
-	private File logFile;
-
-	private InteractionEventLogger logger;
-
-	private ReportGenerator report;
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		logFile = new File("test-log.xml");
-		logFile.delete();
-		logger = new InteractionEventLogger(logFile);
-		logger.startMonitoring();
-		List<IUsageCollector> collectors = new ArrayList<IUsageCollector>();
-		collectors.add(new SummaryCollector());
-		report = new ReportGenerator(logger, collectors);
-		report.forceSyncForTesting(true);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		logFile.delete();
-	}
-
-	public void testFileReading() {
-		logger.interactionObserved(mockSelection());
-		mockUserDelay();
-		logger.interactionObserved(mockSelection());
-		logger.stopMonitoring();
-
-		report.getStatisticsFromInteractionHistory(logFile, new JobChangeAdapter() {
-			@Override
-			public void done(IJobChangeEvent event) {
-				List<InteractionEventSummary> summary = report.getLastParsedSummary().getSingleSummaries();
-				assertEquals(1, summary.size());
-				InteractionEventSummary first = summary.get(0);
-				assertEquals(2, first.getUsageCount());
-			}
-		});
-
-	}
-
-	/**
-	 * Delay enough to make replicated events different
-	 */
-	private void mockUserDelay() {
-		try {
-			Thread.sleep(100);
-		} catch (InterruptedException ie) {
-			;
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/AllMonitorUsageTests.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/AllMonitorUsageTests.java
deleted file mode 100644
index 06624de..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/AllMonitorUsageTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Meghan Allen - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests.usage.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Meghan Allen
- */
-public class AllMonitorUsageTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.eclipse.mylyn.monitor.ui.usage.tests");
-		suite.addTestSuite(FileDisplayDialogTest.class);
-		suite.addTestSuite(DefaultPreferenceConfigTest.class);
-		return suite;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/DefaultPreferenceConfigTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/DefaultPreferenceConfigTest.java
deleted file mode 100644
index dc24ed5..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/DefaultPreferenceConfigTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests.usage.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.monitor.usage.MonitorPreferenceConstants;
-import org.eclipse.mylyn.internal.monitor.usage.UiUsageMonitorPlugin;
-
-/**
- * @author Mik Kersten
- */
-public class DefaultPreferenceConfigTest extends TestCase {
-
-	public void testMonitorPreferences() {
-		assertNotNull(UiUsageMonitorPlugin.getDefault());
-		assertTrue(UiUsageMonitorPlugin.getPrefs().getBoolean(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE));
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/FileDisplayDialogTest.java b/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/FileDisplayDialogTest.java
deleted file mode 100644
index 0a8e6d7..0000000
--- a/org.eclipse.mylyn.monitor.tests/src/org/eclipse/mylyn/monitor/tests/usage/tests/FileDisplayDialogTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Meghan Allen - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.tests.usage.tests;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Calendar;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.mylyn.context.tests.support.FileTool;
-import org.eclipse.mylyn.internal.monitor.usage.FileDisplayDialog;
-import org.eclipse.mylyn.monitor.tests.MonitorTestsPlugin;
-
-/**
- * @author Meghan Allen
- */
-public class FileDisplayDialogTest extends TestCase {
-
-	private static final long TWO_SECONDS = 2 * 1000;
-
-	File monitorFile;
-
-	@Override
-	protected void setUp() throws Exception {
-		monitorFile = FileTool.getFileInPlugin(MonitorTestsPlugin.getDefault(), new Path("testdata/monitor-log.xml"));
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-
-	}
-
-	public void testGetContents() throws FileNotFoundException {
-		long startTime = Calendar.getInstance().getTimeInMillis();
-		FileDisplayDialog.getContents(monitorFile);
-		long endTime = Calendar.getInstance().getTimeInMillis();
-
-		assertTrue(endTime - startTime <= TWO_SECONDS);
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.tests/test-log.xml b/org.eclipse.mylyn.monitor.tests/test-log.xml
deleted file mode 100644
index 74b8fca..0000000
--- a/org.eclipse.mylyn.monitor.tests/test-log.xml
+++ /dev/null
@@ -1,1100 +0,0 @@
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.975 GMT</date>
-	<endDate>2007-10-11 00:31:59.975 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.975 GMT</date>
-	<endDate>2007-10-11 00:31:59.975 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.975 GMT</date>
-	<endDate>2007-10-11 00:31:59.975 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.975 GMT</date>
-	<endDate>2007-10-11 00:31:59.975 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.976 GMT</date>
-	<endDate>2007-10-11 00:31:59.976 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.977 GMT</date>
-	<endDate>2007-10-11 00:31:59.977 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.978 GMT</date>
-	<endDate>2007-10-11 00:31:59.978 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.979 GMT</date>
-	<endDate>2007-10-11 00:31:59.979 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.980 GMT</date>
-	<endDate>2007-10-11 00:31:59.980 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.981 GMT</date>
-	<endDate>2007-10-11 00:31:59.981 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.981 GMT</date>
-	<endDate>2007-10-11 00:31:59.981 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.981 GMT</date>
-	<endDate>2007-10-11 00:31:59.981 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.982 GMT</date>
-	<endDate>2007-10-11 00:31:59.982 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.983 GMT</date>
-	<endDate>2007-10-11 00:31:59.983 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.984 GMT</date>
-	<endDate>2007-10-11 00:31:59.984 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.985 GMT</date>
-	<endDate>2007-10-11 00:31:59.985 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.985 GMT</date>
-	<endDate>2007-10-11 00:31:59.985 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.985 GMT</date>
-	<endDate>2007-10-11 00:31:59.985 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.985 GMT</date>
-	<endDate>2007-10-11 00:31:59.985 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.986 GMT</date>
-	<endDate>2007-10-11 00:31:59.986 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.987 GMT</date>
-	<endDate>2007-10-11 00:31:59.987 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.988 GMT</date>
-	<endDate>2007-10-11 00:31:59.988 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.989 GMT</date>
-	<endDate>2007-10-11 00:31:59.989 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.991 GMT</date>
-	<endDate>2007-10-11 00:31:59.991 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.991 GMT</date>
-	<endDate>2007-10-11 00:31:59.991 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.991 GMT</date>
-	<endDate>2007-10-11 00:31:59.991 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.992 GMT</date>
-	<endDate>2007-10-11 00:31:59.992 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2007-10-11 00:31:59.993 GMT</date>
-	<endDate>2007-10-11 00:31:59.993 GMT</endDate>
-	<originId>originId</originId>
-	<structureKind>structureKind</structureKind>
-	<structureHandle>1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</structureHandle>
-	<navigation>navigatedRelation</navigation>
-	<delta>delta</delta>
-	<interestContribution>2.0</interestContribution>
-</interactionEvent>
diff --git a/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip b/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip
deleted file mode 100644
index aa3eb20..0000000
--- a/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-1-2005-12-05-1-1-1.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip b/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip
deleted file mode 100644
index aa3eb20..0000000
--- a/org.eclipse.mylyn.monitor.tests/testdata/USAGE-1.1.1-usage-2-2005-12-05-1-1-1.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.tests/testdata/monitor-log.xml b/org.eclipse.mylyn.monitor.tests/testdata/monitor-log.xml
deleted file mode 100644
index 407798a..0000000
--- a/org.eclipse.mylyn.monitor.tests/testdata/monitor-log.xml
+++ /dev/null
@@ -1,14476 +0,0 @@
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:08.725 PST</date>
-	<endDate>2006-03-10 19:47:08.725 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:47:13.933 PST</date>
-	<endDate>2006-03-10 19:47:13.933 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:13.983 PST</date>
-	<endDate>2006-03-10 19:47:13.983 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:47:16.547 PST</date>
-	<endDate>2006-03-10 19:47:16.547 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:16.547 PST</date>
-	<endDate>2006-03-10 19:47:16.547 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:47:18.389 PST</date>
-	<endDate>2006-03-10 19:47:18.389 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:18.389 PST</date>
-	<endDate>2006-03-10 19:47:18.389 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:47:25.900 PST</date>
-	<endDate>2006-03-10 19:47:25.900 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:25.920 PST</date>
-	<endDate>2006-03-10 19:47:25.920 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:47:30.266 PST</date>
-	<endDate>2006-03-10 19:47:30.266 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:47:30.266 PST</date>
-	<endDate>2006-03-10 19:47:30.266 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:05.958 PST</date>
-	<endDate>2006-03-10 19:48:05.958 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:05.968 PST</date>
-	<endDate>2006-03-10 19:48:05.968 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:08.782 PST</date>
-	<endDate>2006-03-10 19:48:08.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:08.782 PST</date>
-	<endDate>2006-03-10 19:48:08.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:11.746 PST</date>
-	<endDate>2006-03-10 19:48:11.746 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:11.746 PST</date>
-	<endDate>2006-03-10 19:48:11.746 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:13.418 PST</date>
-	<endDate>2006-03-10 19:48:13.418 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:13.418 PST</date>
-	<endDate>2006-03-10 19:48:13.418 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:27.889 PST</date>
-	<endDate>2006-03-10 19:48:27.889 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:27.909 PST</date>
-	<endDate>2006-03-10 19:48:27.909 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:32.275 PST</date>
-	<endDate>2006-03-10 19:48:32.275 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:32.275 PST</date>
-	<endDate>2006-03-10 19:48:32.275 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:50.171 PST</date>
-	<endDate>2006-03-10 19:48:50.171 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:50.191 PST</date>
-	<endDate>2006-03-10 19:48:50.191 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:48:54.858 PST</date>
-	<endDate>2006-03-10 19:48:54.858 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:48:54.858 PST</date>
-	<endDate>2006-03-10 19:48:54.858 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:06.64 PST</date>
-	<endDate>2006-03-10 19:49:06.64 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:06.94 PST</date>
-	<endDate>2006-03-10 19:49:06.94 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:08.227 PST</date>
-	<endDate>2006-03-10 19:49:08.227 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:08.227 PST</date>
-	<endDate>2006-03-10 19:49:08.227 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:21.757 PST</date>
-	<endDate>2006-03-10 19:49:21.757 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:21.767 PST</date>
-	<endDate>2006-03-10 19:49:21.767 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:23.669 PST</date>
-	<endDate>2006-03-10 19:49:23.669 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:23.669 PST</date>
-	<endDate>2006-03-10 19:49:23.669 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:25.592 PST</date>
-	<endDate>2006-03-10 19:49:25.592 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:25.592 PST</date>
-	<endDate>2006-03-10 19:49:25.592 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:28.346 PST</date>
-	<endDate>2006-03-10 19:49:28.346 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:28.346 PST</date>
-	<endDate>2006-03-10 19:49:28.346 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:38.250 PST</date>
-	<endDate>2006-03-10 19:49:38.250 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:38.250 PST</date>
-	<endDate>2006-03-10 19:49:38.250 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:39.853 PST</date>
-	<endDate>2006-03-10 19:49:39.853 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:39.853 PST</date>
-	<endDate>2006-03-10 19:49:39.853 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:48.755 PST</date>
-	<endDate>2006-03-10 19:49:48.755 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:48.765 PST</date>
-	<endDate>2006-03-10 19:49:48.765 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:49:50.348 PST</date>
-	<endDate>2006-03-10 19:49:50.348 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:49:50.348 PST</date>
-	<endDate>2006-03-10 19:49:50.348 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:50:11.288 PST</date>
-	<endDate>2006-03-10 19:50:11.288 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:50:11.308 PST</date>
-	<endDate>2006-03-10 19:50:11.308 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:50:13.531 PST</date>
-	<endDate>2006-03-10 19:50:13.531 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:50:13.531 PST</date>
-	<endDate>2006-03-10 19:50:13.531 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:50:53.789 PST</date>
-	<endDate>2006-03-10 19:50:53.789 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:50:53.809 PST</date>
-	<endDate>2006-03-10 19:50:53.809 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:50:55.622 PST</date>
-	<endDate>2006-03-10 19:50:55.622 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:50:55.622 PST</date>
-	<endDate>2006-03-10 19:50:55.622 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:51:46.875 PST</date>
-	<endDate>2006-03-10 19:51:46.875 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:51:46.915 PST</date>
-	<endDate>2006-03-10 19:51:46.915 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:04.621 PST</date>
-	<endDate>2006-03-10 19:52:04.621 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:04.621 PST</date>
-	<endDate>2006-03-10 19:52:04.621 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:27.113 PST</date>
-	<endDate>2006-03-10 19:52:27.113 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:27.123 PST</date>
-	<endDate>2006-03-10 19:52:27.123 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:29.176 PST</date>
-	<endDate>2006-03-10 19:52:29.176 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:29.176 PST</date>
-	<endDate>2006-03-10 19:52:29.176 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:30.678 PST</date>
-	<endDate>2006-03-10 19:52:30.678 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:30.678 PST</date>
-	<endDate>2006-03-10 19:52:30.678 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:32.821 PST</date>
-	<endDate>2006-03-10 19:52:32.821 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:32.821 PST</date>
-	<endDate>2006-03-10 19:52:32.821 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:38.960 PST</date>
-	<endDate>2006-03-10 19:52:38.960 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:39.0 PST</date>
-	<endDate>2006-03-10 19:52:39.0 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:40.673 PST</date>
-	<endDate>2006-03-10 19:52:40.673 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:40.673 PST</date>
-	<endDate>2006-03-10 19:52:40.673 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:42.585 PST</date>
-	<endDate>2006-03-10 19:52:42.585 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:42.585 PST</date>
-	<endDate>2006-03-10 19:52:42.585 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:56.495 PST</date>
-	<endDate>2006-03-10 19:52:56.495 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:56.505 PST</date>
-	<endDate>2006-03-10 19:52:56.505 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:52:58.68 PST</date>
-	<endDate>2006-03-10 19:52:58.68 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:52:58.68 PST</date>
-	<endDate>2006-03-10 19:52:58.68 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:53:00.411 PST</date>
-	<endDate>2006-03-10 19:53:00.411 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:00.411 PST</date>
-	<endDate>2006-03-10 19:53:00.411 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:53:22.353 PST</date>
-	<endDate>2006-03-10 19:53:22.353 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:22.363 PST</date>
-	<endDate>2006-03-10 19:53:22.363 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-10 19:53:23.965 PST</date>
-	<endDate>2006-03-10 19:53:23.965 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:23.965 PST</date>
-	<endDate>2006-03-10 19:53:23.965 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:29.142 PST</date>
-	<endDate>2006-03-10 19:53:29.142 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:29.182 PST</date>
-	<endDate>2006-03-10 19:53:29.182 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:29.182 PST</date>
-	<endDate>2006-03-10 19:53:29.182 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-10 19:53:29.182 PST</date>
-	<endDate>2006-03-10 19:53:29.182 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 09:04:54.835 PST</date>
-	<endDate>2006-03-12 09:04:54.835 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 09:16:45.56 PST</date>
-	<endDate>2006-03-12 09:16:45.56 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 09:21:14.83 PST</date>
-	<endDate>2006-03-12 09:21:14.83 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 09:21:23.817 PST</date>
-	<endDate>2006-03-12 09:21:23.817 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:31:56.894 PST</date>
-	<endDate>2006-03-12 10:31:56.894 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:31:56.944 PST</date>
-	<endDate>2006-03-12 10:31:56.944 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:31:56.944 PST</date>
-	<endDate>2006-03-12 10:31:56.944 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:31:56.944 PST</date>
-	<endDate>2006-03-12 10:31:56.944 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:32:19.537 PST</date>
-	<endDate>2006-03-12 10:32:19.537 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:32:48.218 PST</date>
-	<endDate>2006-03-12 10:32:48.218 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:35:07.558 PST</date>
-	<endDate>2006-03-12 10:35:07.558 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:36:08.796 PST</date>
-	<endDate>2006-03-12 10:36:08.796 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:36:08.816 PST</date>
-	<endDate>2006-03-12 10:36:08.816 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:36:08.816 PST</date>
-	<endDate>2006-03-12 10:36:08.816 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:36:08.816 PST</date>
-	<endDate>2006-03-12 10:36:08.816 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:36:26.482 PST</date>
-	<endDate>2006-03-12 10:36:26.482 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:39:50.575 PST</date>
-	<endDate>2006-03-12 10:39:50.575 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:39:50.595 PST</date>
-	<endDate>2006-03-12 10:39:50.595 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:39:50.595 PST</date>
-	<endDate>2006-03-12 10:39:50.595 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:39:50.595 PST</date>
-	<endDate>2006-03-12 10:39:50.595 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:40:37.553 PST</date>
-	<endDate>2006-03-12 10:40:37.553 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:40:51.332 PST</date>
-	<endDate>2006-03-12 10:40:51.332 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:43:03.753 PST</date>
-	<endDate>2006-03-12 10:43:03.753 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:43:03.783 PST</date>
-	<endDate>2006-03-12 10:43:03.783 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:43:03.783 PST</date>
-	<endDate>2006-03-12 10:43:03.783 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 10:43:03.783 PST</date>
-	<endDate>2006-03-12 10:43:03.783 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:43:35.418 PST</date>
-	<endDate>2006-03-12 10:43:35.418 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 10:44:18.60 PST</date>
-	<endDate>2006-03-12 10:44:18.60 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:00:30.703 PST</date>
-	<endDate>2006-03-12 11:00:30.703 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:00:30.763 PST</date>
-	<endDate>2006-03-12 11:00:30.763 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:00:30.773 PST</date>
-	<endDate>2006-03-12 11:00:30.773 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:00:30.773 PST</date>
-	<endDate>2006-03-12 11:00:30.773 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:24:30.323 PST</date>
-	<endDate>2006-03-12 11:24:30.323 PST</endDate>
-	<originId>org.eclipse.jdt.ui.navigate.open.type</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:34.78 PST</date>
-	<endDate>2006-03-12 11:24:34.78 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:38.805 PST</date>
-	<endDate>2006-03-12 11:24:38.805 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:38.845 PST</date>
-	<endDate>2006-03-12 11:24:38.845 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:24:39.126 PST</date>
-	<endDate>2006-03-12 11:24:39.126 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>T=Fbk2uIUeLKpXi5BRC75ZAyBok=/XYAyujRQ7UXxpW=PAK1+ACp1l0I=:T=Fbk2uIUeLKpXi5BRC75ZAyBok=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:39.136 PST</date>
-	<endDate>2006-03-12 11:24:39.136 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:39.136 PST</date>
-	<endDate>2006-03-12 11:24:39.136 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:24:46.436 PST</date>
-	<endDate>2006-03-12 11:24:46.436 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:47.648 PST</date>
-	<endDate>2006-03-12 11:24:47.648 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:47.648 PST</date>
-	<endDate>2006-03-12 11:24:47.648 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:24:47.708 PST</date>
-	<endDate>2006-03-12 11:24:47.708 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:KfybdB7uQ=44EtvNKZs=3mXPO34=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:24:49.10 PST</date>
-	<endDate>2006-03-12 11:24:49.10 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:KfybdB7uQ=44EtvNKZs=3mXPO34=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:50.672 PST</date>
-	<endDate>2006-03-12 11:24:50.672 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:24:50.712 PST</date>
-	<endDate>2006-03-12 11:24:50.712 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:KfybdB7uQ=44EtvNKZs=3mXPO34=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:24:50.852 PST</date>
-	<endDate>2006-03-12 11:24:50.852 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:Z68L15gNPPARgMj7gcPErrbiDIw=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:24:52.815 PST</date>
-	<endDate>2006-03-12 11:24:52.815 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:24:52.855 PST</date>
-	<endDate>2006-03-12 11:24:52.855 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:Z68L15gNPPARgMj7gcPErrbiDIw=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:24:53.406 PST</date>
-	<endDate>2006-03-12 11:24:53.406 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/KfybdB7uQ=44EtvNKZs=3mXPO34=:q44TuySdcJZKGCfzyxAr4skdUYk=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:25:01.968 PST</date>
-	<endDate>2006-03-12 11:25:01.968 PST</endDate>
-	<originId>org.eclipse.search.ui.openSearchDialog</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:06.855 PST</date>
-	<endDate>2006-03-12 11:25:06.855 PST</endDate>
-	<originId>org.eclipse.search.ui.views.SearchView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: viewShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:06.855 PST</date>
-	<endDate>2006-03-12 11:25:06.855 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: viewShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:25:10.350 PST</date>
-	<endDate>2006-03-12 11:25:10.350 PST</endDate>
-	<originId>org.eclipse.search.ui.openSearchDialog</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:17.701 PST</date>
-	<endDate>2006-03-12 11:25:17.701 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:SvJjKJMTOvImC5qopXiyMHcMItQ=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:17.821 PST</date>
-	<endDate>2006-03-12 11:25:17.821 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:17.831 PST</date>
-	<endDate>2006-03-12 11:25:17.831 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:18.592 PST</date>
-	<endDate>2006-03-12 11:25:18.592 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:LGpmJfjPFhGG80bNCx+3R2C4yJU=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:25.102 PST</date>
-	<endDate>2006-03-12 11:25:25.102 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:32rRkDfJeYfE=5eSgQwOFFNWcXw=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:26.404 PST</date>
-	<endDate>2006-03-12 11:25:26.404 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:26.544 PST</date>
-	<endDate>2006-03-12 11:25:26.544 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceType</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:FSUKUH18S4jMvVlW+WkMrc7xB9Q=</structureHandle>
-	<navigation>null</navigation>
-	<delta>predicted</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:25:27.605 PST</date>
-	<endDate>2006-03-12 11:25:27.605 PST</endDate>
-	<originId>null$item.label.&amp;Open&#x09;F3</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:27.625 PST</date>
-	<endDate>2006-03-12 11:25:27.625 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:25:27.665 PST</date>
-	<endDate>2006-03-12 11:25:27.665 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceType</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:FSUKUH18S4jMvVlW+WkMrc7xB9Q=</structureHandle>
-	<navigation>null</navigation>
-	<delta>predicted</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:28.206 PST</date>
-	<endDate>2006-03-12 11:25:28.206 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:28.256 PST</date>
-	<endDate>2006-03-12 11:25:28.256 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceType</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:FSUKUH18S4jMvVlW+WkMrc7xB9Q=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:28.336 PST</date>
-	<endDate>2006-03-12 11:25:28.336 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:LGpmJfjPFhGG80bNCx+3R2C4yJU=</structureHandle>
-	<navigation>null</navigation>
-	<delta>predicted</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:25:31.891 PST</date>
-	<endDate>2006-03-12 11:25:31.891 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestDecrementAction$item.label.Mylar: Mark Less Interesting</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:25:33.293 PST</date>
-	<endDate>2006-03-12 11:25:33.293 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:25:33.323 PST</date>
-	<endDate>2006-03-12 11:25:33.323 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:LGpmJfjPFhGG80bNCx+3R2C4yJU=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:25:33.934 PST</date>
-	<endDate>2006-03-12 11:25:33.934 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:LGpmJfjPFhGG80bNCx+3R2C4yJU=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:38.671 PST</date>
-	<endDate>2006-03-12 11:25:38.671 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:38.681 PST</date>
-	<endDate>2006-03-12 11:25:38.681 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 11:25:38.741 PST</date>
-	<endDate>2006-03-12 11:25:38.741 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:25:57.839 PST</date>
-	<endDate>2006-03-12 11:25:57.839 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:LGpmJfjPFhGG80bNCx+3R2C4yJU=</structureHandle>
-	<navigation>null</navigation>
-	<delta>predicted</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:58.410 PST</date>
-	<endDate>2006-03-12 11:25:58.410 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:h=hGtoFuNRNSjB4cyrq00dVTK08=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 11:25:59.651 PST</date>
-	<endDate>2006-03-12 11:25:59.651 PST</endDate>
-	<originId>org.eclipse.search.ui.views.SearchView</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:26:02.666 PST</date>
-	<endDate>2006-03-12 11:26:02.666 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:h=hGtoFuNRNSjB4cyrq00dVTK08=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:26:06.341 PST</date>
-	<endDate>2006-03-12 11:26:06.341 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:h=hGtoFuNRNSjB4cyrq00dVTK08=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-12 11:26:12.970 PST</date>
-	<endDate>2006-03-12 11:26:12.970 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:h=hGtoFuNRNSjB4cyrq00dVTK08=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.506 PST</date>
-	<endDate>2006-03-12 11:34:09.506 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.556 PST</date>
-	<endDate>2006-03-12 11:34:09.556 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.556 PST</date>
-	<endDate>2006-03-12 11:34:09.556 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.556 PST</date>
-	<endDate>2006-03-12 11:34:09.556 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.816 PST</date>
-	<endDate>2006-03-12 11:34:09.816 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.816 PST</date>
-	<endDate>2006-03-12 11:34:09.816 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.846 PST</date>
-	<endDate>2006-03-12 11:34:09.846 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.846 PST</date>
-	<endDate>2006-03-12 11:34:09.846 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 11:34:09.846 PST</date>
-	<endDate>2006-03-12 11:34:09.846 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 12:10:18.955 PST</date>
-	<endDate>2006-03-12 12:10:18.955 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/SvJjKJMTOvImC5qopXiyMHcMItQ=:SvJjKJMTOvImC5qopXiyMHcMItQ=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:10:25.344 PST</date>
-	<endDate>2006-03-12 12:10:25.344 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:10:25.344 PST</date>
-	<endDate>2006-03-12 12:10:25.344 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:10:29.110 PST</date>
-	<endDate>2006-03-12 12:10:29.110 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:10:29.110 PST</date>
-	<endDate>2006-03-12 12:10:29.110 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:10:42.369 PST</date>
-	<endDate>2006-03-12 12:10:42.369 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:10:42.369 PST</date>
-	<endDate>2006-03-12 12:10:42.369 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:11:42.5 PST</date>
-	<endDate>2006-03-12 12:11:42.5 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:11:42.5 PST</date>
-	<endDate>2006-03-12 12:11:42.5 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:11:43.907 PST</date>
-	<endDate>2006-03-12 12:11:43.907 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:11:43.907 PST</date>
-	<endDate>2006-03-12 12:11:43.907 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:27.505 PST</date>
-	<endDate>2006-03-12 12:16:27.505 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:27.505 PST</date>
-	<endDate>2006-03-12 12:16:27.505 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:29.568 PST</date>
-	<endDate>2006-03-12 12:16:29.568 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:29.578 PST</date>
-	<endDate>2006-03-12 12:16:29.578 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:41.15 PST</date>
-	<endDate>2006-03-12 12:16:41.15 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.collapse.all$item.label.Collapse All</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:45.151 PST</date>
-	<endDate>2006-03-12 12:16:45.151 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:45.171 PST</date>
-	<endDate>2006-03-12 12:16:45.171 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:45.171 PST</date>
-	<endDate>2006-03-12 12:16:45.171 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:45.171 PST</date>
-	<endDate>2006-03-12 12:16:45.171 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:45.191 PST</date>
-	<endDate>2006-03-12 12:16:45.191 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:45.381 PST</date>
-	<endDate>2006-03-12 12:16:45.381 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:51.229 PST</date>
-	<endDate>2006-03-12 12:16:51.229 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:51.239 PST</date>
-	<endDate>2006-03-12 12:16:51.239 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:16:51.239 PST</date>
-	<endDate>2006-03-12 12:16:51.239 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:16:58.370 PST</date>
-	<endDate>2006-03-12 12:16:58.370 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:06.868 PST</date>
-	<endDate>2006-03-12 12:18:06.868 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.collapse.all$item.label.Collapse All</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:09.852 PST</date>
-	<endDate>2006-03-12 12:18:09.852 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:18:09.852 PST</date>
-	<endDate>2006-03-12 12:18:09.852 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:11.625 PST</date>
-	<endDate>2006-03-12 12:18:11.625 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:18:11.625 PST</date>
-	<endDate>2006-03-12 12:18:11.625 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:21.28 PST</date>
-	<endDate>2006-03-12 12:18:21.28 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:18:21.28 PST</date>
-	<endDate>2006-03-12 12:18:21.28 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:23.462 PST</date>
-	<endDate>2006-03-12 12:18:23.462 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:18:23.462 PST</date>
-	<endDate>2006-03-12 12:18:23.462 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:18:25.715 PST</date>
-	<endDate>2006-03-12 12:18:25.715 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:18:25.715 PST</date>
-	<endDate>2006-03-12 12:18:25.715 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:22:32.740 PST</date>
-	<endDate>2006-03-12 12:22:32.740 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:22:32.760 PST</date>
-	<endDate>2006-03-12 12:22:32.760 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:22:32.760 PST</date>
-	<endDate>2006-03-12 12:22:32.760 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:22:32.760 PST</date>
-	<endDate>2006-03-12 12:22:32.760 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:08.662 PST</date>
-	<endDate>2006-03-12 12:23:08.662 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:13.299 PST</date>
-	<endDate>2006-03-12 12:23:13.299 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:13.299 PST</date>
-	<endDate>2006-03-12 12:23:13.299 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:15.71 PST</date>
-	<endDate>2006-03-12 12:23:15.71 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:15.71 PST</date>
-	<endDate>2006-03-12 12:23:15.71 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:38.685 PST</date>
-	<endDate>2006-03-12 12:23:38.685 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:38.685 PST</date>
-	<endDate>2006-03-12 12:23:38.685 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:40.428 PST</date>
-	<endDate>2006-03-12 12:23:40.428 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:40.428 PST</date>
-	<endDate>2006-03-12 12:23:40.428 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:50.622 PST</date>
-	<endDate>2006-03-12 12:23:50.622 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:50.622 PST</date>
-	<endDate>2006-03-12 12:23:50.622 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:23:52.245 PST</date>
-	<endDate>2006-03-12 12:23:52.245 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:23:52.245 PST</date>
-	<endDate>2006-03-12 12:23:52.245 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:25:25.919 PST</date>
-	<endDate>2006-03-12 12:25:25.919 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:25:25.919 PST</date>
-	<endDate>2006-03-12 12:25:25.919 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:25:28.183 PST</date>
-	<endDate>2006-03-12 12:25:28.183 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:25:28.183 PST</date>
-	<endDate>2006-03-12 12:25:28.183 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:25:29.815 PST</date>
-	<endDate>2006-03-12 12:25:29.815 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:25:29.815 PST</date>
-	<endDate>2006-03-12 12:25:29.815 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:25:31.467 PST</date>
-	<endDate>2006-03-12 12:25:31.467 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:25:31.467 PST</date>
-	<endDate>2006-03-12 12:25:31.467 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:25:56.133 PST</date>
-	<endDate>2006-03-12 12:25:56.133 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:25:56.143 PST</date>
-	<endDate>2006-03-12 12:25:56.143 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:32:39.403 PST</date>
-	<endDate>2006-03-12 12:32:39.403 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:32:39.413 PST</date>
-	<endDate>2006-03-12 12:32:39.413 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:32:41.75 PST</date>
-	<endDate>2006-03-12 12:32:41.75 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:32:41.85 PST</date>
-	<endDate>2006-03-12 12:32:41.85 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:32:43.148 PST</date>
-	<endDate>2006-03-12 12:32:43.148 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:32:43.148 PST</date>
-	<endDate>2006-03-12 12:32:43.148 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:32:45.151 PST</date>
-	<endDate>2006-03-12 12:32:45.151 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:32:45.161 PST</date>
-	<endDate>2006-03-12 12:32:45.161 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:10.618 PST</date>
-	<endDate>2006-03-12 12:33:10.618 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:10.618 PST</date>
-	<endDate>2006-03-12 12:33:10.618 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:12.370 PST</date>
-	<endDate>2006-03-12 12:33:12.370 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:12.380 PST</date>
-	<endDate>2006-03-12 12:33:12.380 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:14.153 PST</date>
-	<endDate>2006-03-12 12:33:14.153 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:14.163 PST</date>
-	<endDate>2006-03-12 12:33:14.163 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:16.847 PST</date>
-	<endDate>2006-03-12 12:33:16.847 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:16.847 PST</date>
-	<endDate>2006-03-12 12:33:16.847 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:19.580 PST</date>
-	<endDate>2006-03-12 12:33:19.580 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:19.580 PST</date>
-	<endDate>2006-03-12 12:33:19.580 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:23.276 PST</date>
-	<endDate>2006-03-12 12:33:23.276 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:23.276 PST</date>
-	<endDate>2006-03-12 12:33:23.276 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:37.116 PST</date>
-	<endDate>2006-03-12 12:33:37.116 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.mark.completed$item.label.Mark Complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:45.448 PST</date>
-	<endDate>2006-03-12 12:33:45.448 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:45.448 PST</date>
-	<endDate>2006-03-12 12:33:45.448 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:33:53.990 PST</date>
-	<endDate>2006-03-12 12:33:53.990 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:33:53.990 PST</date>
-	<endDate>2006-03-12 12:33:53.990 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:34:11.405 PST</date>
-	<endDate>2006-03-12 12:34:11.405 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.mark.incomplete$item.label.Mark Incomplete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:34:43.942 PST</date>
-	<endDate>2006-03-12 12:34:43.942 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 12:34:44.713 PST</date>
-	<endDate>2006-03-12 12:34:44.713 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.JavaProject</structureKind>
-	<structureHandle>(non-source element)</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:34:48.909 PST</date>
-	<endDate>2006-03-12 12:34:48.909 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:35:09.378 PST</date>
-	<endDate>2006-03-12 12:35:09.378 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.view.go.into$item.label.Go Into Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:35:11.642 PST</date>
-	<endDate>2006-03-12 12:35:11.642 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.view.go.up$item.label.Go Up To Root</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:15.503 PST</date>
-	<endDate>2006-03-12 12:36:15.503 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:18.538 PST</date>
-	<endDate>2006-03-12 12:36:18.538 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:24.677 PST</date>
-	<endDate>2006-03-12 12:36:24.677 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:28.642 PST</date>
-	<endDate>2006-03-12 12:36:28.642 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:36.524 PST</date>
-	<endDate>2006-03-12 12:36:36.524 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:37.805 PST</date>
-	<endDate>2006-03-12 12:36:37.805 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:36:37.805 PST</date>
-	<endDate>2006-03-12 12:36:37.805 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:39.959 PST</date>
-	<endDate>2006-03-12 12:36:39.959 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:36:59.577 PST</date>
-	<endDate>2006-03-12 12:36:59.577 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:36:59.577 PST</date>
-	<endDate>2006-03-12 12:36:59.577 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:37:01.570 PST</date>
-	<endDate>2006-03-12 12:37:01.570 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:37:01.570 PST</date>
-	<endDate>2006-03-12 12:37:01.570 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:37:02.862 PST</date>
-	<endDate>2006-03-12 12:37:02.862 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:37:02.892 PST</date>
-	<endDate>2006-03-12 12:37:02.892 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:37:02.892 PST</date>
-	<endDate>2006-03-12 12:37:02.892 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:37:02.892 PST</date>
-	<endDate>2006-03-12 12:37:02.892 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:49:40.451 PST</date>
-	<endDate>2006-03-12 12:49:40.451 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.create.category$item.label.New Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 12:53:00.128 PST</date>
-	<endDate>2006-03-12 12:53:00.128 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.remove$item.label.Remove From Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:55:10.325 PST</date>
-	<endDate>2006-03-12 12:55:10.325 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:55:10.365 PST</date>
-	<endDate>2006-03-12 12:55:10.365 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:55:10.365 PST</date>
-	<endDate>2006-03-12 12:55:10.365 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 12:55:10.365 PST</date>
-	<endDate>2006-03-12 12:55:10.365 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 13:38:34.119 PST</date>
-	<endDate>2006-03-12 13:38:34.119 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.remove$item.label.Remove From Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 13:38:35.822 PST</date>
-	<endDate>2006-03-12 13:38:35.822 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 13:38:35.872 PST</date>
-	<endDate>2006-03-12 13:38:35.872 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 13:38:35.872 PST</date>
-	<endDate>2006-03-12 13:38:35.872 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 13:38:35.872 PST</date>
-	<endDate>2006-03-12 13:38:35.872 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:09.272 PST</date>
-	<endDate>2006-03-12 15:37:09.272 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:09.292 PST</date>
-	<endDate>2006-03-12 15:37:09.292 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:11.365 PST</date>
-	<endDate>2006-03-12 15:37:11.365 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:11.546 PST</date>
-	<endDate>2006-03-12 15:37:11.546 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:28.790 PST</date>
-	<endDate>2006-03-12 15:37:28.790 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:28.860 PST</date>
-	<endDate>2006-03-12 15:37:28.860 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:28.860 PST</date>
-	<endDate>2006-03-12 15:37:28.860 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:37:28.860 PST</date>
-	<endDate>2006-03-12 15:37:28.860 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:38:28.246 PST</date>
-	<endDate>2006-03-12 15:38:28.246 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:38:35.977 PST</date>
-	<endDate>2006-03-12 15:38:35.977 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:38:36.7 PST</date>
-	<endDate>2006-03-12 15:38:36.7 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:38:39.632 PST</date>
-	<endDate>2006-03-12 15:38:39.632 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:38:39.632 PST</date>
-	<endDate>2006-03-12 15:38:39.632 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:39:20.781 PST</date>
-	<endDate>2006-03-12 15:39:20.781 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:39:20.781 PST</date>
-	<endDate>2006-03-12 15:39:20.781 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:39:22.324 PST</date>
-	<endDate>2006-03-12 15:39:22.324 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:39:36.33 PST</date>
-	<endDate>2006-03-12 15:39:36.33 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:39:43.724 PST</date>
-	<endDate>2006-03-12 15:39:43.724 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:39:43.724 PST</date>
-	<endDate>2006-03-12 15:39:43.724 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:40:27.127 PST</date>
-	<endDate>2006-03-12 15:40:27.127 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:40:27.127 PST</date>
-	<endDate>2006-03-12 15:40:27.127 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 15:47:17.947 PST</date>
-	<endDate>2006-03-12 15:47:17.947 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 15:47:17.978 PST</date>
-	<endDate>2006-03-12 15:47:17.978 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:47:18.48 PST</date>
-	<endDate>2006-03-12 15:47:18.48 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:47:26.870 PST</date>
-	<endDate>2006-03-12 15:47:26.870 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:47:28.232 PST</date>
-	<endDate>2006-03-12 15:47:28.232 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:47:42.22 PST</date>
-	<endDate>2006-03-12 15:47:42.22 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 15:47:43.3 PST</date>
-	<endDate>2006-03-12 15:47:43.3 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:47:53.529 PST</date>
-	<endDate>2006-03-12 15:47:53.529 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:47:53.559 PST</date>
-	<endDate>2006-03-12 15:47:53.559 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:47:53.559 PST</date>
-	<endDate>2006-03-12 15:47:53.559 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 15:47:53.559 PST</date>
-	<endDate>2006-03-12 15:47:53.559 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 16:56:30.158 PST</date>
-	<endDate>2006-03-12 16:56:30.158 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 16:56:38.510 PST</date>
-	<endDate>2006-03-12 16:56:38.510 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.properties$item.label.Properties</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:56:45.871 PST</date>
-	<endDate>2006-03-12 16:56:45.871 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.bugzilla</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>[obfuscated]</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:56:46.21 PST</date>
-	<endDate>2006-03-12 16:56:46.21 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.bugzilla</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>[obfuscated]</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 16:57:24.176 PST</date>
-	<endDate>2006-03-12 16:57:24.176 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 16:57:42.452 PST</date>
-	<endDate>2006-03-12 16:57:42.452 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.properties$item.label.Properties</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:57:55.310 PST</date>
-	<endDate>2006-03-12 16:57:55.310 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.bugzilla</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>[obfuscated]</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:57:55.401 PST</date>
-	<endDate>2006-03-12 16:57:55.401 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.bugzilla</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>[obfuscated]</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 16:57:58.595 PST</date>
-	<endDate>2006-03-12 16:57:58.595 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:59:29.626 PST</date>
-	<endDate>2006-03-12 16:59:29.626 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:59:29.676 PST</date>
-	<endDate>2006-03-12 16:59:29.676 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:59:29.676 PST</date>
-	<endDate>2006-03-12 16:59:29.676 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 16:59:29.676 PST</date>
-	<endDate>2006-03-12 16:59:29.676 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 17:02:02.185 PST</date>
-	<endDate>2006-03-12 17:02:02.185 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 17:02:02.236 PST</date>
-	<endDate>2006-03-12 17:02:02.236 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 17:02:02.236 PST</date>
-	<endDate>2006-03-12 17:02:02.236 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 17:02:02.236 PST</date>
-	<endDate>2006-03-12 17:02:02.236 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:18:06.208 PST</date>
-	<endDate>2006-03-12 18:18:06.208 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:18:47.197 PST</date>
-	<endDate>2006-03-12 18:18:47.197 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:19:06.24 PST</date>
-	<endDate>2006-03-12 18:19:06.24 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:19:19.974 PST</date>
-	<endDate>2006-03-12 18:19:19.974 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:19:44.269 PST</date>
-	<endDate>2006-03-12 18:19:44.269 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:19:44.319 PST</date>
-	<endDate>2006-03-12 18:19:44.319 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:19:44.319 PST</date>
-	<endDate>2006-03-12 18:19:44.319 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:19:44.319 PST</date>
-	<endDate>2006-03-12 18:19:44.319 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:22:41.865 PST</date>
-	<endDate>2006-03-12 18:22:41.865 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:22:53.912 PST</date>
-	<endDate>2006-03-12 18:22:53.912 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:23:01.563 PST</date>
-	<endDate>2006-03-12 18:23:01.563 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:01.573 PST</date>
-	<endDate>2006-03-12 18:23:01.573 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:23:03.446 PST</date>
-	<endDate>2006-03-12 18:23:03.446 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:03.446 PST</date>
-	<endDate>2006-03-12 18:23:03.446 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:16.54 PST</date>
-	<endDate>2006-03-12 18:23:16.54 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:16.54 PST</date>
-	<endDate>2006-03-12 18:23:16.54 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:20.320 PST</date>
-	<endDate>2006-03-12 18:23:20.320 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:20.400 PST</date>
-	<endDate>2006-03-12 18:23:20.400 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:29.133 PST</date>
-	<endDate>2006-03-12 18:23:29.133 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:29.133 PST</date>
-	<endDate>2006-03-12 18:23:29.133 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:32.598 PST</date>
-	<endDate>2006-03-12 18:23:32.598 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:32.648 PST</date>
-	<endDate>2006-03-12 18:23:32.648 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:23:40.689 PST</date>
-	<endDate>2006-03-12 18:23:40.689 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:46.758 PST</date>
-	<endDate>2006-03-12 18:23:46.758 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:46.758 PST</date>
-	<endDate>2006-03-12 18:23:46.758 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:23:50.43 PST</date>
-	<endDate>2006-03-12 18:23:50.43 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:52.466 PST</date>
-	<endDate>2006-03-12 18:23:52.466 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:23:52.496 PST</date>
-	<endDate>2006-03-12 18:23:52.496 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:24:03.742 PST</date>
-	<endDate>2006-03-12 18:24:03.742 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.open$item.label.Open</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:04.113 PST</date>
-	<endDate>2006-03-12 18:24:04.113 PST</endDate>
-	<originId>org.eclipse.ui.browser.editor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:04.123 PST</date>
-	<endDate>2006-03-12 18:24:04.123 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:07.748 PST</date>
-	<endDate>2006-03-12 18:24:07.748 PST</endDate>
-	<originId>org.eclipse.ui.browser.editor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:07.808 PST</date>
-	<endDate>2006-03-12 18:24:07.808 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:24:14.338 PST</date>
-	<endDate>2006-03-12 18:24:14.338 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.open$item.label.Open</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:24:42.829 PST</date>
-	<endDate>2006-03-12 18:24:42.829 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:24:47.545 PST</date>
-	<endDate>2006-03-12 18:24:47.545 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:55.627 PST</date>
-	<endDate>2006-03-12 18:24:55.627 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:55.677 PST</date>
-	<endDate>2006-03-12 18:24:55.677 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:55.677 PST</date>
-	<endDate>2006-03-12 18:24:55.677 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:24:55.677 PST</date>
-	<endDate>2006-03-12 18:24:55.677 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 18:25:11.320 PST</date>
-	<endDate>2006-03-12 18:25:11.320 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 18:25:11.920 PST</date>
-	<endDate>2006-03-12 18:25:11.920 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-12 18:25:11.920 PST</date>
-	<endDate>2006-03-12 18:25:11.920 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:25:16.36 PST</date>
-	<endDate>2006-03-12 18:25:16.36 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:25:20.723 PST</date>
-	<endDate>2006-03-12 18:25:20.723 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:26:05.497 PST</date>
-	<endDate>2006-03-12 18:26:05.497 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:26:20.158 PST</date>
-	<endDate>2006-03-12 18:26:20.158 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:26:33.818 PST</date>
-	<endDate>2006-03-12 18:26:33.818 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:27:11.793 PST</date>
-	<endDate>2006-03-12 18:27:11.793 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.create.category$item.label.New Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:27:20.15 PST</date>
-	<endDate>2006-03-12 18:27:20.15 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:32:31.703 PST</date>
-	<endDate>2006-03-12 18:32:31.703 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.addQuery$item.label.New Repository Query</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:33:16.778 PST</date>
-	<endDate>2006-03-12 18:33:16.778 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:33:30.337 PST</date>
-	<endDate>2006-03-12 18:33:30.337 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:30.347 PST</date>
-	<endDate>2006-03-12 18:33:30.347 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:33:33.1 PST</date>
-	<endDate>2006-03-12 18:33:33.1 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:33.1 PST</date>
-	<endDate>2006-03-12 18:33:33.1 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:51.878 PST</date>
-	<endDate>2006-03-12 18:33:51.878 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:51.878 PST</date>
-	<endDate>2006-03-12 18:33:51.878 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:55.613 PST</date>
-	<endDate>2006-03-12 18:33:55.613 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:33:55.694 PST</date>
-	<endDate>2006-03-12 18:33:55.694 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:01.41 PST</date>
-	<endDate>2006-03-12 18:34:01.41 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:06.719 PST</date>
-	<endDate>2006-03-12 18:34:06.719 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:17.685 PST</date>
-	<endDate>2006-03-12 18:34:17.685 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:18.526 PST</date>
-	<endDate>2006-03-12 18:34:18.526 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:19.448 PST</date>
-	<endDate>2006-03-12 18:34:19.448 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:20.399 PST</date>
-	<endDate>2006-03-12 18:34:20.399 PST</endDate>
-	<originId>null$item.label.Normal</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:34:20.399 PST</date>
-	<endDate>2006-03-12 18:34:20.399 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P3</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:20.950 PST</date>
-	<endDate>2006-03-12 18:34:20.950 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:34:21.981 PST</date>
-	<endDate>2006-03-12 18:34:21.981 PST</endDate>
-	<originId>null$item.label.Very Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:34:21.981 PST</date>
-	<endDate>2006-03-12 18:34:21.981 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P5</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:56:29.480 PST</date>
-	<endDate>2006-03-12 18:56:29.480 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:56:29.530 PST</date>
-	<endDate>2006-03-12 18:56:29.530 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:56:29.530 PST</date>
-	<endDate>2006-03-12 18:56:29.530 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:56:29.530 PST</date>
-	<endDate>2006-03-12 18:56:29.530 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:56:56.950 PST</date>
-	<endDate>2006-03-12 18:56:56.950 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.addQuery$item.label.New Repository Query</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:57:37.258 PST</date>
-	<endDate>2006-03-12 18:57:37.258 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.addQuery$item.label.New Repository Query</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:00.371 PST</date>
-	<endDate>2006-03-12 18:58:00.371 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:20.400 PST</date>
-	<endDate>2006-03-12 18:58:20.400 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:20.410 PST</date>
-	<endDate>2006-03-12 18:58:20.410 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:31.796 PST</date>
-	<endDate>2006-03-12 18:58:31.796 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:34.210 PST</date>
-	<endDate>2006-03-12 18:58:34.210 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:34.290 PST</date>
-	<endDate>2006-03-12 18:58:34.290 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:38.125 PST</date>
-	<endDate>2006-03-12 18:58:38.125 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:47.98 PST</date>
-	<endDate>2006-03-12 18:58:47.98 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:51.805 PST</date>
-	<endDate>2006-03-12 18:58:51.805 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:51.815 PST</date>
-	<endDate>2006-03-12 18:58:51.815 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:58:54.178 PST</date>
-	<endDate>2006-03-12 18:58:54.178 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:54.178 PST</date>
-	<endDate>2006-03-12 18:58:54.178 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:57.153 PST</date>
-	<endDate>2006-03-12 18:58:57.153 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:58:57.153 PST</date>
-	<endDate>2006-03-12 18:58:57.153 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:59:05.975 PST</date>
-	<endDate>2006-03-12 18:59:05.975 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:59:06.5 PST</date>
-	<endDate>2006-03-12 18:59:06.5 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:59:13.75 PST</date>
-	<endDate>2006-03-12 18:59:13.75 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:59:13.75 PST</date>
-	<endDate>2006-03-12 18:59:13.75 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 18:59:14.698 PST</date>
-	<endDate>2006-03-12 18:59:14.698 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 18:59:14.698 PST</date>
-	<endDate>2006-03-12 18:59:14.698 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 19:00:07.924 PST</date>
-	<endDate>2006-03-12 19:00:07.924 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:07.934 PST</date>
-	<endDate>2006-03-12 19:00:07.934 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:07.934 PST</date>
-	<endDate>2006-03-12 19:00:07.934 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 19:00:09.316 PST</date>
-	<endDate>2006-03-12 19:00:09.316 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-12 19:00:38.68 PST</date>
-	<endDate>2006-03-12 19:00:38.68 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:47.972 PST</date>
-	<endDate>2006-03-12 19:00:47.972 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:47.972 PST</date>
-	<endDate>2006-03-12 19:00:47.972 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:52.418 PST</date>
-	<endDate>2006-03-12 19:00:52.418 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:52.458 PST</date>
-	<endDate>2006-03-12 19:00:52.458 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:57.135 PST</date>
-	<endDate>2006-03-12 19:00:57.135 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:57.165 PST</date>
-	<endDate>2006-03-12 19:00:57.165 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:57.165 PST</date>
-	<endDate>2006-03-12 19:00:57.165 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 19:00:57.165 PST</date>
-	<endDate>2006-03-12 19:00:57.165 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 20:32:03.825 PST</date>
-	<endDate>2006-03-12 20:32:03.825 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 20:32:03.895 PST</date>
-	<endDate>2006-03-12 20:32:03.895 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 20:32:03.895 PST</date>
-	<endDate>2006-03-12 20:32:03.895 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-12 20:32:03.895 PST</date>
-	<endDate>2006-03-12 20:32:03.895 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:41:29.145 PST</date>
-	<endDate>2006-03-13 10:41:29.145 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:41:37.346 PST</date>
-	<endDate>2006-03-13 10:41:37.346 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:41:51.116 PST</date>
-	<endDate>2006-03-13 10:41:51.116 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:41:51.166 PST</date>
-	<endDate>2006-03-13 10:41:51.166 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:41:51.166 PST</date>
-	<endDate>2006-03-13 10:41:51.166 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:41:51.166 PST</date>
-	<endDate>2006-03-13 10:41:51.166 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:42:20.118 PST</date>
-	<endDate>2006-03-13 10:42:20.118 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:42:22.461 PST</date>
-	<endDate>2006-03-13 10:42:22.461 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:42:22.461 PST</date>
-	<endDate>2006-03-13 10:42:22.461 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:42:27.228 PST</date>
-	<endDate>2006-03-13 10:42:27.228 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:42:27.228 PST</date>
-	<endDate>2006-03-13 10:42:27.228 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:42:28.890 PST</date>
-	<endDate>2006-03-13 10:42:28.890 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:42:43.381 PST</date>
-	<endDate>2006-03-13 10:42:43.381 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:43:05.603 PST</date>
-	<endDate>2006-03-13 10:43:05.603 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:43:05.603 PST</date>
-	<endDate>2006-03-13 10:43:05.603 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:43:14.526 PST</date>
-	<endDate>2006-03-13 10:43:14.526 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:43:14.526 PST</date>
-	<endDate>2006-03-13 10:43:14.526 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:43:43.508 PST</date>
-	<endDate>2006-03-13 10:43:43.508 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:43:53.202 PST</date>
-	<endDate>2006-03-13 10:43:53.202 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.collapse.all$item.label.Collapse All</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:44:02.235 PST</date>
-	<endDate>2006-03-13 10:44:02.235 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.remove$item.label.Remove From Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:44:09.605 PST</date>
-	<endDate>2006-03-13 10:44:09.605 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:14.92 PST</date>
-	<endDate>2006-03-13 10:44:14.92 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:14.132 PST</date>
-	<endDate>2006-03-13 10:44:14.132 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:14.132 PST</date>
-	<endDate>2006-03-13 10:44:14.132 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:14.132 PST</date>
-	<endDate>2006-03-13 10:44:14.132 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:44:38.897 PST</date>
-	<endDate>2006-03-13 10:44:38.897 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:43.764 PST</date>
-	<endDate>2006-03-13 10:44:43.764 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104022</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:44.105 PST</date>
-	<endDate>2006-03-13 10:44:44.105 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:44.105 PST</date>
-	<endDate>2006-03-13 10:44:44.105 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:45.897 PST</date>
-	<endDate>2006-03-13 10:44:45.897 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:45.978 PST</date>
-	<endDate>2006-03-13 10:44:45.978 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:44:48.291 PST</date>
-	<endDate>2006-03-13 10:44:48.291 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.remove$item.label.Remove From Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:44:55.631 PST</date>
-	<endDate>2006-03-13 10:44:55.631 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:58.466 PST</date>
-	<endDate>2006-03-13 10:44:58.466 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:58.496 PST</date>
-	<endDate>2006-03-13 10:44:58.496 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:58.496 PST</date>
-	<endDate>2006-03-13 10:44:58.496 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:44:58.496 PST</date>
-	<endDate>2006-03-13 10:44:58.496 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:47:05.58 PST</date>
-	<endDate>2006-03-13 10:47:05.58 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:47:09.434 PST</date>
-	<endDate>2006-03-13 10:47:09.434 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:47:11.246 PST</date>
-	<endDate>2006-03-13 10:47:11.246 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:47:11.256 PST</date>
-	<endDate>2006-03-13 10:47:11.256 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:47:17.616 PST</date>
-	<endDate>2006-03-13 10:47:17.616 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:47:17.656 PST</date>
-	<endDate>2006-03-13 10:47:17.656 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:47:17.656 PST</date>
-	<endDate>2006-03-13 10:47:17.656 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:47:17.656 PST</date>
-	<endDate>2006-03-13 10:47:17.656 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:49:38.638 PST</date>
-	<endDate>2006-03-13 10:49:38.638 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:49:51.958 PST</date>
-	<endDate>2006-03-13 10:49:51.958 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:50:32.856 PST</date>
-	<endDate>2006-03-13 10:50:32.856 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:50:32.866 PST</date>
-	<endDate>2006-03-13 10:50:32.866 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:50:34.659 PST</date>
-	<endDate>2006-03-13 10:50:34.659 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:50:34.659 PST</date>
-	<endDate>2006-03-13 10:50:34.659 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:50:55.919 PST</date>
-	<endDate>2006-03-13 10:50:55.919 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:50:55.919 PST</date>
-	<endDate>2006-03-13 10:50:55.919 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:50:57.782 PST</date>
-	<endDate>2006-03-13 10:50:57.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:50:57.782 PST</date>
-	<endDate>2006-03-13 10:50:57.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:51:01.908 PST</date>
-	<endDate>2006-03-13 10:51:01.908 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:53:29.290 PST</date>
-	<endDate>2006-03-13 10:53:29.290 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:29.290 PST</date>
-	<endDate>2006-03-13 10:53:29.290 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:53:31.363 PST</date>
-	<endDate>2006-03-13 10:53:31.363 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:31.363 PST</date>
-	<endDate>2006-03-13 10:53:31.363 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:36.831 PST</date>
-	<endDate>2006-03-13 10:53:36.831 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:36.861 PST</date>
-	<endDate>2006-03-13 10:53:36.861 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:36.871 PST</date>
-	<endDate>2006-03-13 10:53:36.871 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:53:36.871 PST</date>
-	<endDate>2006-03-13 10:53:36.871 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:54:39.851 PST</date>
-	<endDate>2006-03-13 10:54:39.851 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:54:43.76 PST</date>
-	<endDate>2006-03-13 10:54:43.76 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:54:44.919 PST</date>
-	<endDate>2006-03-13 10:54:44.919 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:54:44.929 PST</date>
-	<endDate>2006-03-13 10:54:44.929 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:57:13.623 PST</date>
-	<endDate>2006-03-13 10:57:13.623 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:57:15.515 PST</date>
-	<endDate>2006-03-13 10:57:15.515 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:57:15.525 PST</date>
-	<endDate>2006-03-13 10:57:15.525 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:57:23.627 PST</date>
-	<endDate>2006-03-13 10:57:23.627 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:59:40.934 PST</date>
-	<endDate>2006-03-13 10:59:40.934 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:59:42.997 PST</date>
-	<endDate>2006-03-13 10:59:42.997 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:59:42.997 PST</date>
-	<endDate>2006-03-13 10:59:42.997 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:59:52.191 PST</date>
-	<endDate>2006-03-13 10:59:52.191 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:59:54.384 PST</date>
-	<endDate>2006-03-13 10:59:54.384 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:59:54.384 PST</date>
-	<endDate>2006-03-13 10:59:54.384 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 10:59:56.747 PST</date>
-	<endDate>2006-03-13 10:59:56.747 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 10:59:56.747 PST</date>
-	<endDate>2006-03-13 10:59:56.747 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:00.62 PST</date>
-	<endDate>2006-03-13 11:00:00.62 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:20.842 PST</date>
-	<endDate>2006-03-13 11:00:20.842 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:00:20.842 PST</date>
-	<endDate>2006-03-13 11:00:20.842 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:22.664 PST</date>
-	<endDate>2006-03-13 11:00:22.664 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:00:22.664 PST</date>
-	<endDate>2006-03-13 11:00:22.664 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:24.287 PST</date>
-	<endDate>2006-03-13 11:00:24.287 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:00:24.287 PST</date>
-	<endDate>2006-03-13 11:00:24.287 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:33.290 PST</date>
-	<endDate>2006-03-13 11:00:33.290 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:00:33.290 PST</date>
-	<endDate>2006-03-13 11:00:33.290 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:43.214 PST</date>
-	<endDate>2006-03-13 11:00:43.214 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:00:45.888 PST</date>
-	<endDate>2006-03-13 11:00:45.888 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:02:13.704 PST</date>
-	<endDate>2006-03-13 11:02:13.704 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:02:13.704 PST</date>
-	<endDate>2006-03-13 11:02:13.704 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:03:15.152 PST</date>
-	<endDate>2006-03-13 11:03:15.152 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:03:15.213 PST</date>
-	<endDate>2006-03-13 11:03:15.213 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:03:15.213 PST</date>
-	<endDate>2006-03-13 11:03:15.213 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:03:15.213 PST</date>
-	<endDate>2006-03-13 11:03:15.213 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:03:48.601 PST</date>
-	<endDate>2006-03-13 11:03:48.601 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:04:52.793 PST</date>
-	<endDate>2006-03-13 11:04:52.793 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:04:53.744 PST</date>
-	<endDate>2006-03-13 11:04:53.744 PST</endDate>
-	<originId>null$item.label.Very High</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:04:53.754 PST</date>
-	<endDate>2006-03-13 11:04:53.754 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P1</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:05:01.816 PST</date>
-	<endDate>2006-03-13 11:05:01.816 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:05:01.816 PST</date>
-	<endDate>2006-03-13 11:05:01.816 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:06:53.146 PST</date>
-	<endDate>2006-03-13 11:06:53.146 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:06:53.146 PST</date>
-	<endDate>2006-03-13 11:06:53.146 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:06:56.591 PST</date>
-	<endDate>2006-03-13 11:06:56.591 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:06:56.591 PST</date>
-	<endDate>2006-03-13 11:06:56.591 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:07.316 PST</date>
-	<endDate>2006-03-13 11:07:07.316 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:07:07.316 PST</date>
-	<endDate>2006-03-13 11:07:07.316 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:11.753 PST</date>
-	<endDate>2006-03-13 11:07:11.753 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:12.594 PST</date>
-	<endDate>2006-03-13 11:07:12.594 PST</endDate>
-	<originId>null$item.label.Very Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:07:12.594 PST</date>
-	<endDate>2006-03-13 11:07:12.594 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P5</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:17.371 PST</date>
-	<endDate>2006-03-13 11:07:17.371 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:07:17.371 PST</date>
-	<endDate>2006-03-13 11:07:17.371 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:26.414 PST</date>
-	<endDate>2006-03-13 11:07:26.414 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:38.651 PST</date>
-	<endDate>2006-03-13 11:07:38.651 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:39.352 PST</date>
-	<endDate>2006-03-13 11:07:39.352 PST</endDate>
-	<originId>null$item.label.Very High</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:07:39.352 PST</date>
-	<endDate>2006-03-13 11:07:39.352 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P1</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:07:59.762 PST</date>
-	<endDate>2006-03-13 11:07:59.762 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:07:59.782 PST</date>
-	<endDate>2006-03-13 11:07:59.782 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:07:59.902 PST</date>
-	<endDate>2006-03-13 11:07:59.902 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:08:42.83 PST</date>
-	<endDate>2006-03-13 11:08:42.83 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:08:42.83 PST</date>
-	<endDate>2006-03-13 11:08:42.83 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:09:59.133 PST</date>
-	<endDate>2006-03-13 11:09:59.133 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:09:59.183 PST</date>
-	<endDate>2006-03-13 11:09:59.183 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:09:59.183 PST</date>
-	<endDate>2006-03-13 11:09:59.183 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:09:59.183 PST</date>
-	<endDate>2006-03-13 11:09:59.183 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:21.673 PST</date>
-	<endDate>2006-03-13 11:16:21.673 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:25.990 PST</date>
-	<endDate>2006-03-13 11:16:25.990 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:25.990 PST</date>
-	<endDate>2006-03-13 11:16:25.990 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:37.416 PST</date>
-	<endDate>2006-03-13 11:16:37.416 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:37.416 PST</date>
-	<endDate>2006-03-13 11:16:37.416 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:42.503 PST</date>
-	<endDate>2006-03-13 11:16:42.503 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:46.539 PST</date>
-	<endDate>2006-03-13 11:16:46.539 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:46.609 PST</date>
-	<endDate>2006-03-13 11:16:46.609 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:48.893 PST</date>
-	<endDate>2006-03-13 11:16:48.893 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:48.893 PST</date>
-	<endDate>2006-03-13 11:16:48.893 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:50.655 PST</date>
-	<endDate>2006-03-13 11:16:50.655 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:50.655 PST</date>
-	<endDate>2006-03-13 11:16:50.655 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:58.216 PST</date>
-	<endDate>2006-03-13 11:16:58.216 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:58.226 PST</date>
-	<endDate>2006-03-13 11:16:58.226 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:59.137 PST</date>
-	<endDate>2006-03-13 11:16:59.137 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:16:59.858 PST</date>
-	<endDate>2006-03-13 11:16:59.858 PST</endDate>
-	<originId>null$item.label.Very Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:16:59.858 PST</date>
-	<endDate>2006-03-13 11:16:59.858 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P5</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:17:01.451 PST</date>
-	<endDate>2006-03-13 11:17:01.451 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:18:25.872 PST</date>
-	<endDate>2006-03-13 11:18:25.872 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:26.72 PST</date>
-	<endDate>2006-03-13 11:18:26.72 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:28.756 PST</date>
-	<endDate>2006-03-13 11:18:28.756 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:28.766 PST</date>
-	<endDate>2006-03-13 11:18:28.766 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:28.766 PST</date>
-	<endDate>2006-03-13 11:18:28.766 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:29.207 PST</date>
-	<endDate>2006-03-13 11:18:29.207 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:29.207 PST</date>
-	<endDate>2006-03-13 11:18:29.207 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:29.557 PST</date>
-	<endDate>2006-03-13 11:18:29.557 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:29.557 PST</date>
-	<endDate>2006-03-13 11:18:29.557 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:30.178 PST</date>
-	<endDate>2006-03-13 11:18:30.178 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:30.178 PST</date>
-	<endDate>2006-03-13 11:18:30.178 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:18:31.580 PST</date>
-	<endDate>2006-03-13 11:18:31.580 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/zRai1dz4fqCs8EYWbB7QgLfSLhc=:zRai1dz4fqCs8EYWbB7QgLfSLhc=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:31.750 PST</date>
-	<endDate>2006-03-13 11:18:31.750 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 11:18:33.273 PST</date>
-	<endDate>2006-03-13 11:18:33.273 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/0jtZh1BMGz3khL8uR8dvdau3lNM=/Csx=rbyONyqld0zn1ZNHTi5h8Vk=/HHwe682WKFlWYnodEABqZ1bZwrQ=/nzOnx5ivb9arsoBJ2cGz7fov0ko=/lKBCbo0yA9pUaMzwxiT5PLN2AeI=/NVnXrM8ANglxlhyhiYmtwGFAicA=/zRai1dz4fqCs8EYWbB7QgLfSLhc=:zRai1dz4fqCs8EYWbB7QgLfSLhc=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:18:33.593 PST</date>
-	<endDate>2006-03-13 11:18:33.593 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:18:36.577 PST</date>
-	<endDate>2006-03-13 11:18:36.577 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:36.577 PST</date>
-	<endDate>2006-03-13 11:18:36.577 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:18:38.801 PST</date>
-	<endDate>2006-03-13 11:18:38.801 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:38.801 PST</date>
-	<endDate>2006-03-13 11:18:38.801 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:18:40.223 PST</date>
-	<endDate>2006-03-13 11:18:40.223 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.253 PST</date>
-	<endDate>2006-03-13 11:18:40.253 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.253 PST</date>
-	<endDate>2006-03-13 11:18:40.253 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.253 PST</date>
-	<endDate>2006-03-13 11:18:40.253 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.253 PST</date>
-	<endDate>2006-03-13 11:18:40.253 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.293 PST</date>
-	<endDate>2006-03-13 11:18:40.293 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:18:40.483 PST</date>
-	<endDate>2006-03-13 11:18:40.483 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:19:03.176 PST</date>
-	<endDate>2006-03-13 11:19:03.176 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:19:03.176 PST</date>
-	<endDate>2006-03-13 11:19:03.176 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:19:05.179 PST</date>
-	<endDate>2006-03-13 11:19:05.179 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:19:05.179 PST</date>
-	<endDate>2006-03-13 11:19:05.179 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:19:47.740 PST</date>
-	<endDate>2006-03-13 11:19:47.740 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:19:47.740 PST</date>
-	<endDate>2006-03-13 11:19:47.740 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:19:49.542 PST</date>
-	<endDate>2006-03-13 11:19:49.542 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:19:49.542 PST</date>
-	<endDate>2006-03-13 11:19:49.542 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:20:04.754 PST</date>
-	<endDate>2006-03-13 11:20:04.754 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:20:04.754 PST</date>
-	<endDate>2006-03-13 11:20:04.754 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:28.4 PST</date>
-	<endDate>2006-03-13 11:21:28.4 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:28.4 PST</date>
-	<endDate>2006-03-13 11:21:28.4 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:32.380 PST</date>
-	<endDate>2006-03-13 11:21:32.380 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:32.380 PST</date>
-	<endDate>2006-03-13 11:21:32.380 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:38.359 PST</date>
-	<endDate>2006-03-13 11:21:38.359 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:38.359 PST</date>
-	<endDate>2006-03-13 11:21:38.359 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:38.359 PST</date>
-	<endDate>2006-03-13 11:21:38.359 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:39.941 PST</date>
-	<endDate>2006-03-13 11:21:39.941 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:48.163 PST</date>
-	<endDate>2006-03-13 11:21:48.163 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:21:50.857 PST</date>
-	<endDate>2006-03-13 11:21:50.857 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:50.857 PST</date>
-	<endDate>2006-03-13 11:21:50.857 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:21:50.857 PST</date>
-	<endDate>2006-03-13 11:21:50.857 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:22:06.59 PST</date>
-	<endDate>2006-03-13 11:22:06.59 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:22:08.212 PST</date>
-	<endDate>2006-03-13 11:22:08.212 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:22:15.242 PST</date>
-	<endDate>2006-03-13 11:22:15.242 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:22:27.610 PST</date>
-	<endDate>2006-03-13 11:22:27.610 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:23:11.503 PST</date>
-	<endDate>2006-03-13 11:23:11.503 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:23:11.523 PST</date>
-	<endDate>2006-03-13 11:23:11.523 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:23:11.523 PST</date>
-	<endDate>2006-03-13 11:23:11.523 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:23:11.533 PST</date>
-	<endDate>2006-03-13 11:23:11.533 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:23:59.802 PST</date>
-	<endDate>2006-03-13 11:23:59.802 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:24:08.865 PST</date>
-	<endDate>2006-03-13 11:24:08.865 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:25:06.778 PST</date>
-	<endDate>2006-03-13 11:25:06.778 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:25:09.583 PST</date>
-	<endDate>2006-03-13 11:25:09.583 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:25:09.583 PST</date>
-	<endDate>2006-03-13 11:25:09.583 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:25:21.530 PST</date>
-	<endDate>2006-03-13 11:25:21.530 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:25:21.530 PST</date>
-	<endDate>2006-03-13 11:25:21.530 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:25:25.916 PST</date>
-	<endDate>2006-03-13 11:25:25.916 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:25:44.172 PST</date>
-	<endDate>2006-03-13 11:25:44.172 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:26:26.643 PST</date>
-	<endDate>2006-03-13 11:26:26.643 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:28:37.832 PST</date>
-	<endDate>2006-03-13 11:28:37.832 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:28:37.862 PST</date>
-	<endDate>2006-03-13 11:28:37.862 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:28:37.862 PST</date>
-	<endDate>2006-03-13 11:28:37.862 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:28:37.862 PST</date>
-	<endDate>2006-03-13 11:28:37.862 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:29:43.727 PST</date>
-	<endDate>2006-03-13 11:29:43.727 PST</endDate>
-	<originId>null$item.label..Clear</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:29:45.730 PST</date>
-	<endDate>2006-03-13 11:29:45.730 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:29:45.740 PST</date>
-	<endDate>2006-03-13 11:29:45.740 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:30:37.804 PST</date>
-	<endDate>2006-03-13 11:30:37.804 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:37.804 PST</date>
-	<endDate>2006-03-13 11:30:37.804 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:30:45.15 PST</date>
-	<endDate>2006-03-13 11:30:45.15 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:45.15 PST</date>
-	<endDate>2006-03-13 11:30:45.15 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:30:46.817 PST</date>
-	<endDate>2006-03-13 11:30:46.817 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:46.817 PST</date>
-	<endDate>2006-03-13 11:30:46.817 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:59.85 PST</date>
-	<endDate>2006-03-13 11:30:59.85 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:59.135 PST</date>
-	<endDate>2006-03-13 11:30:59.135 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:59.135 PST</date>
-	<endDate>2006-03-13 11:30:59.135 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:30:59.135 PST</date>
-	<endDate>2006-03-13 11:30:59.135 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:54:58.84 PST</date>
-	<endDate>2006-03-13 11:54:58.84 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.rename$item.label.Rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:06.126 PST</date>
-	<endDate>2006-03-13 11:55:06.136 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.rename$item.label.Rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:55:13.997 PST</date>
-	<endDate>2006-03-13 11:55:13.997 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.catEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:55:13.997 PST</date>
-	<endDate>2006-03-13 11:55:13.997 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:18.193 PST</date>
-	<endDate>2006-03-13 11:55:18.193 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:55:19.866 PST</date>
-	<endDate>2006-03-13 11:55:19.866 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.catEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:55:19.956 PST</date>
-	<endDate>2006-03-13 11:55:19.956 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:27.456 PST</date>
-	<endDate>2006-03-13 11:55:27.456 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:36.590 PST</date>
-	<endDate>2006-03-13 11:55:36.590 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:41.987 PST</date>
-	<endDate>2006-03-13 11:55:41.987 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:42.538 PST</date>
-	<endDate>2006-03-13 11:55:42.538 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:43.530 PST</date>
-	<endDate>2006-03-13 11:55:43.530 PST</endDate>
-	<originId>null$item.label.Very Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:44.872 PST</date>
-	<endDate>2006-03-13 11:55:44.872 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:55:45.713 PST</date>
-	<endDate>2006-03-13 11:55:45.713 PST</endDate>
-	<originId>null$item.label.Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:55:45.723 PST</date>
-	<endDate>2006-03-13 11:55:45.723 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P4</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:21.170 PST</date>
-	<endDate>2006-03-13 11:57:21.170 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:26.137 PST</date>
-	<endDate>2006-03-13 11:57:26.137 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:27.99 PST</date>
-	<endDate>2006-03-13 11:57:27.99 PST</endDate>
-	<originId>null$item.label.Normal</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:57:27.99 PST</date>
-	<endDate>2006-03-13 11:57:27.99 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P3</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:27.980 PST</date>
-	<endDate>2006-03-13 11:57:27.980 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:28.921 PST</date>
-	<endDate>2006-03-13 11:57:28.921 PST</endDate>
-	<originId>null$item.label.Very Low</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:57:28.921 PST</date>
-	<endDate>2006-03-13 11:57:28.921 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.priority</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>P5</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:30.984 PST</date>
-	<endDate>2006-03-13 11:57:30.984 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:57:30.984 PST</date>
-	<endDate>2006-03-13 11:57:30.984 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:57:33.488 PST</date>
-	<endDate>2006-03-13 11:57:33.488 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.completed$item.label.Filter Completed Tasks</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 11:57:33.488 PST</date>
-	<endDate>2006-03-13 11:57:33.488 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.complete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:58:47.704 PST</date>
-	<endDate>2006-03-13 11:58:47.704 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:58:47.765 PST</date>
-	<endDate>2006-03-13 11:58:47.765 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:58:54.504 PST</date>
-	<endDate>2006-03-13 11:58:54.504 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 11:58:59.582 PST</date>
-	<endDate>2006-03-13 11:58:59.582 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 11:59:04.939 PST</date>
-	<endDate>2006-03-13 11:59:04.939 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 13:30:21.724 PST</date>
-	<endDate>2006-03-13 13:30:21.724 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 13:30:23.357 PST</date>
-	<endDate>2006-03-13 13:30:23.357 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 13:30:24.689 PST</date>
-	<endDate>2006-03-13 13:30:24.689 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:30:32.790 PST</date>
-	<endDate>2006-03-13 13:30:32.790 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:30:35.985 PST</date>
-	<endDate>2006-03-13 13:30:35.985 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:30:36.35 PST</date>
-	<endDate>2006-03-13 13:30:36.35 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:30:36.35 PST</date>
-	<endDate>2006-03-13 13:30:36.35 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:30:36.35 PST</date>
-	<endDate>2006-03-13 13:30:36.35 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:31:46.697 PST</date>
-	<endDate>2006-03-13 13:31:46.697 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:31:50.783 PST</date>
-	<endDate>2006-03-13 13:31:50.783 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:31:55.19 PST</date>
-	<endDate>2006-03-13 13:31:55.19 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:31:57.642 PST</date>
-	<endDate>2006-03-13 13:31:57.642 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:04.502 PST</date>
-	<endDate>2006-03-13 13:32:04.502 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:04.502 PST</date>
-	<endDate>2006-03-13 13:32:04.502 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 13:32:09.800 PST</date>
-	<endDate>2006-03-13 13:32:09.800 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:11.492 PST</date>
-	<endDate>2006-03-13 13:32:11.492 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:11.542 PST</date>
-	<endDate>2006-03-13 13:32:11.542 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:12.834 PST</date>
-	<endDate>2006-03-13 13:32:12.834 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:12.864 PST</date>
-	<endDate>2006-03-13 13:32:12.864 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:12.864 PST</date>
-	<endDate>2006-03-13 13:32:12.864 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 13:32:12.864 PST</date>
-	<endDate>2006-03-13 13:32:12.864 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:28.982 PST</date>
-	<endDate>2006-03-13 14:11:28.982 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:28.982 PST</date>
-	<endDate>2006-03-13 14:11:28.982 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:11:31.185 PST</date>
-	<endDate>2006-03-13 14:11:31.185 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:34.360 PST</date>
-	<endDate>2006-03-13 14:11:34.360 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:34.430 PST</date>
-	<endDate>2006-03-13 14:11:34.430 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:42.221 PST</date>
-	<endDate>2006-03-13 14:11:42.221 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104023</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:42.311 PST</date>
-	<endDate>2006-03-13 14:11:42.311 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:42.311 PST</date>
-	<endDate>2006-03-13 14:11:42.311 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:47.629 PST</date>
-	<endDate>2006-03-13 14:11:47.629 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:47.649 PST</date>
-	<endDate>2006-03-13 14:11:47.649 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:53.357 PST</date>
-	<endDate>2006-03-13 14:11:53.357 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:53.357 PST</date>
-	<endDate>2006-03-13 14:11:53.357 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:56.291 PST</date>
-	<endDate>2006-03-13 14:11:56.291 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:11:56.311 PST</date>
-	<endDate>2006-03-13 14:11:56.311 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:05.748 PST</date>
-	<endDate>2006-03-13 14:14:05.748 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:05.748 PST</date>
-	<endDate>2006-03-13 14:14:05.748 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:14:08.882 PST</date>
-	<endDate>2006-03-13 14:14:08.882 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:10.244 PST</date>
-	<endDate>2006-03-13 14:14:10.244 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:10.284 PST</date>
-	<endDate>2006-03-13 14:14:10.284 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:36.432 PST</date>
-	<endDate>2006-03-13 14:14:36.432 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:14:36.432 PST</date>
-	<endDate>2006-03-13 14:14:36.432 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:14:40.598 PST</date>
-	<endDate>2006-03-13 14:14:40.598 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.830 PST</date>
-	<endDate>2006-03-13 14:33:42.830 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.880 PST</date>
-	<endDate>2006-03-13 14:33:42.880 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.880 PST</date>
-	<endDate>2006-03-13 14:33:42.880 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.910 PST</date>
-	<endDate>2006-03-13 14:33:42.910 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.910 PST</date>
-	<endDate>2006-03-13 14:33:42.910 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:33:42.910 PST</date>
-	<endDate>2006-03-13 14:33:42.910 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:34:08.497 PST</date>
-	<endDate>2006-03-13 14:34:08.497 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:34:11.361 PST</date>
-	<endDate>2006-03-13 14:34:11.361 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:34:53.342 PST</date>
-	<endDate>2006-03-13 14:34:53.342 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:34:57.808 PST</date>
-	<endDate>2006-03-13 14:34:57.808 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:34:57.818 PST</date>
-	<endDate>2006-03-13 14:34:57.818 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:35:00.782 PST</date>
-	<endDate>2006-03-13 14:35:00.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:35:00.782 PST</date>
-	<endDate>2006-03-13 14:35:00.782 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:35:07.832 PST</date>
-	<endDate>2006-03-13 14:35:07.832 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:35:25.488 PST</date>
-	<endDate>2006-03-13 14:35:25.488 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:35:33.189 PST</date>
-	<endDate>2006-03-13 14:35:33.189 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.navigate.previous$item.label..Previous Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:37:11.711 PST</date>
-	<endDate>2006-03-13 14:37:11.711 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:39:10.131 PST</date>
-	<endDate>2006-03-13 14:39:10.131 PST</endDate>
-	<originId>org.eclipse.debug.internal.ui.actions.DebugDropDownAction$item.label..Debug</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:39:15.318 PST</date>
-	<endDate>2006-03-13 14:39:15.318 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:39:15.368 PST</date>
-	<endDate>2006-03-13 14:39:15.368 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:39:15.368 PST</date>
-	<endDate>2006-03-13 14:39:15.368 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:39:15.368 PST</date>
-	<endDate>2006-03-13 14:39:15.368 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:39:39.403 PST</date>
-	<endDate>2006-03-13 14:39:39.403 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:39:59.171 PST</date>
-	<endDate>2006-03-13 14:39:59.171 PST</endDate>
-	<originId>null$item.label..Filter Priority Lower Than</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:40:11.149 PST</date>
-	<endDate>2006-03-13 14:40:11.149 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:40:11.189 PST</date>
-	<endDate>2006-03-13 14:40:11.189 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:40:11.189 PST</date>
-	<endDate>2006-03-13 14:40:11.189 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:40:11.189 PST</date>
-	<endDate>2006-03-13 14:40:11.189 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:35.743 PST</date>
-	<endDate>2006-03-13 14:59:35.743 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:59:35.813 PST</date>
-	<endDate>2006-03-13 14:59:35.813 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:36.114 PST</date>
-	<endDate>2006-03-13 14:59:36.114 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:59:40.450 PST</date>
-	<endDate>2006-03-13 14:59:40.450 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:41.261 PST</date>
-	<endDate>2006-03-13 14:59:41.261 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.JavaProject</structureKind>
-	<structureHandle>(non-source element)</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:43.815 PST</date>
-	<endDate>2006-03-13 14:59:43.815 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:3P1bDJLoKMIhAVuk+pQt1WZcfVI=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:59:46.198 PST</date>
-	<endDate>2006-03-13 14:59:46.198 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestIncrementAction$item.label.Mylar: Mark as Landmark</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 14:59:47.780 PST</date>
-	<endDate>2006-03-13 14:59:47.780 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:47.790 PST</date>
-	<endDate>2006-03-13 14:59:47.790 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 14:59:49.683 PST</date>
-	<endDate>2006-03-13 14:59:49.683 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 14:59:51.125 PST</date>
-	<endDate>2006-03-13 14:59:51.125 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:01:54.142 PST</date>
-	<endDate>2006-03-13 15:01:54.142 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:01:54.152 PST</date>
-	<endDate>2006-03-13 15:01:54.152 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:3P1bDJLoKMIhAVuk+pQt1WZcfVI=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:01:55.624 PST</date>
-	<endDate>2006-03-13 15:01:55.624 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestIncrementAction$item.label.Mylar: Mark as Landmark</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:01:58.288 PST</date>
-	<endDate>2006-03-13 15:01:58.288 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:01:58.298 PST</date>
-	<endDate>2006-03-13 15:01:58.298 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:01:58.308 PST</date>
-	<endDate>2006-03-13 15:01:58.308 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:01:58.398 PST</date>
-	<endDate>2006-03-13 15:01:58.398 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:01.292 PST</date>
-	<endDate>2006-03-13 15:02:01.292 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:02:01.302 PST</date>
-	<endDate>2006-03-13 15:02:01.302 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:3P1bDJLoKMIhAVuk+pQt1WZcfVI=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:02:03.526 PST</date>
-	<endDate>2006-03-13 15:02:03.526 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestIncrementAction$item.label.Mylar: Mark as Landmark</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:04.707 PST</date>
-	<endDate>2006-03-13 15:02:04.707 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:04.747 PST</date>
-	<endDate>2006-03-13 15:02:04.747 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:04.777 PST</date>
-	<endDate>2006-03-13 15:02:04.777 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:04.777 PST</date>
-	<endDate>2006-03-13 15:02:04.777 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:02:04.777 PST</date>
-	<endDate>2006-03-13 15:02:04.777 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:02:28.772 PST</date>
-	<endDate>2006-03-13 15:02:28.772 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:njipS1EKh2F8=ZO7yoaeJqJ46Mk=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:02:30.715 PST</date>
-	<endDate>2006-03-13 15:02:30.715 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestIncrementAction$item.label.Mylar: Mark as Landmark</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:02:59.626 PST</date>
-	<endDate>2006-03-13 15:02:59.626 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestIncrementAction$item.label.Mylar: Mark as Landmark</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:17.492 PST</date>
-	<endDate>2006-03-13 15:03:17.492 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:03:17.502 PST</date>
-	<endDate>2006-03-13 15:03:17.502 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:03:17.512 PST</date>
-	<endDate>2006-03-13 15:03:17.512 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:03:17.602 PST</date>
-	<endDate>2006-03-13 15:03:17.602 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:18.654 PST</date>
-	<endDate>2006-03-13 15:03:18.654 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:03:18.664 PST</date>
-	<endDate>2006-03-13 15:03:18.664 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:njipS1EKh2F8=ZO7yoaeJqJ46Mk=</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:03:20.306 PST</date>
-	<endDate>2006-03-13 15:03:20.306 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.InterestDecrementAction$item.label.Mylar: Mark Less Interesting</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:23.70 PST</date>
-	<endDate>2006-03-13 15:03:23.70 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:23.110 PST</date>
-	<endDate>2006-03-13 15:03:23.110 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:23.140 PST</date>
-	<endDate>2006-03-13 15:03:23.140 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:23.140 PST</date>
-	<endDate>2006-03-13 15:03:23.140 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:03:23.140 PST</date>
-	<endDate>2006-03-13 15:03:23.140 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:30:50.78 PST</date>
-	<endDate>2006-03-13 15:30:50.78 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:30:50.649 PST</date>
-	<endDate>2006-03-13 15:30:50.649 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:31:22.245 PST</date>
-	<endDate>2006-03-13 15:31:22.245 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:31:45.939 PST</date>
-	<endDate>2006-03-13 15:31:45.939 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:32:23.102 PST</date>
-	<endDate>2006-03-13 15:32:23.102 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:32:52.84 PST</date>
-	<endDate>2006-03-13 15:32:52.84 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:33:30.749 PST</date>
-	<endDate>2006-03-13 15:33:30.749 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:34:26.780 PST</date>
-	<endDate>2006-03-13 15:34:26.780 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:34:55.912 PST</date>
-	<endDate>2006-03-13 15:34:55.912 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:36:31.890 PST</date>
-	<endDate>2006-03-13 15:36:31.890 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:36:31.960 PST</date>
-	<endDate>2006-03-13 15:36:31.960 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:38:30.50 PST</date>
-	<endDate>2006-03-13 15:38:30.50 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:48:41.409 PST</date>
-	<endDate>2006-03-13 15:48:41.409 PST</endDate>
-	<originId>null$item.label.&amp;File/&amp;New&#x09;Alt+Shift+N/&amp;Other...</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:48:50.842 PST</date>
-	<endDate>2006-03-13 15:48:50.842 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:48:50.943 PST</date>
-	<endDate>2006-03-13 15:48:50.943 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:51:56.930 PST</date>
-	<endDate>2006-03-13 15:51:56.930 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:56:42.20 PST</date>
-	<endDate>2006-03-13 15:56:42.20 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.tasklist.addNew$item.label..New Repository Task</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:56:57.252 PST</date>
-	<endDate>2006-03-13 15:56:57.252 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 15:56:57.272 PST</date>
-	<endDate>2006-03-13 15:56:57.272 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 15:56:58.83 PST</date>
-	<endDate>2006-03-13 15:56:58.83 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:56:59.665 PST</date>
-	<endDate>2006-03-13 15:56:59.665 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:56:59.715 PST</date>
-	<endDate>2006-03-13 15:56:59.715 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:56:59.715 PST</date>
-	<endDate>2006-03-13 15:56:59.715 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 15:56:59.715 PST</date>
-	<endDate>2006-03-13 15:56:59.715 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:10:46.995 PST</date>
-	<endDate>2006-03-13 16:10:46.995 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:10:47.405 PST</date>
-	<endDate>2006-03-13 16:10:47.405 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:11:17.989 PST</date>
-	<endDate>2006-03-13 16:11:17.989 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:17.989 PST</date>
-	<endDate>2006-03-13 16:11:17.989 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:31.469 PST</date>
-	<endDate>2006-03-13 16:11:31.469 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:31.469 PST</date>
-	<endDate>2006-03-13 16:11:31.469 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:11:35.745 PST</date>
-	<endDate>2006-03-13 16:11:35.745 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:37.467 PST</date>
-	<endDate>2006-03-13 16:11:37.467 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:37.538 PST</date>
-	<endDate>2006-03-13 16:11:37.538 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:11:42.425 PST</date>
-	<endDate>2006-03-13 16:11:42.425 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:11:42.425 PST</date>
-	<endDate>2006-03-13 16:11:42.425 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:14:56.554 PST</date>
-	<endDate>2006-03-13 16:14:56.554 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:14:56.584 PST</date>
-	<endDate>2006-03-13 16:14:56.584 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:14:56.584 PST</date>
-	<endDate>2006-03-13 16:14:56.584 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:14:56.584 PST</date>
-	<endDate>2006-03-13 16:14:56.584 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:16:32.582 PST</date>
-	<endDate>2006-03-13 16:16:32.582 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:16:32.592 PST</date>
-	<endDate>2006-03-13 16:16:32.592 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:16:50.488 PST</date>
-	<endDate>2006-03-13 16:16:50.488 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:16:50.488 PST</date>
-	<endDate>2006-03-13 16:16:50.488 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:17:01.564 PST</date>
-	<endDate>2006-03-13 16:17:01.564 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:17:01.664 PST</date>
-	<endDate>2006-03-13 16:17:01.664 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:17:58.946 PST</date>
-	<endDate>2006-03-13 16:17:58.946 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:17:58.946 PST</date>
-	<endDate>2006-03-13 16:17:58.946 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:28.198 PST</date>
-	<endDate>2006-03-13 16:18:28.198 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:28.238 PST</date>
-	<endDate>2006-03-13 16:18:28.238 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:32.725 PST</date>
-	<endDate>2006-03-13 16:18:32.725 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:32.755 PST</date>
-	<endDate>2006-03-13 16:18:32.755 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:37.441 PST</date>
-	<endDate>2006-03-13 16:18:37.441 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:37.441 PST</date>
-	<endDate>2006-03-13 16:18:37.441 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:18:52.213 PST</date>
-	<endDate>2006-03-13 16:18:52.213 PST</endDate>
-	<originId>org.eclipse.ui.file.close</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:52.213 PST</date>
-	<endDate>2006-03-13 16:18:52.213 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:52.263 PST</date>
-	<endDate>2006-03-13 16:18:52.263 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:57.620 PST</date>
-	<endDate>2006-03-13 16:18:57.620 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:18:57.620 PST</date>
-	<endDate>2006-03-13 16:18:57.620 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:19:53.831 PST</date>
-	<endDate>2006-03-13 16:19:53.831 PST</endDate>
-	<originId>org.eclipse.ui.edit.copy</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 16:19:56.205 PST</date>
-	<endDate>2006-03-13 16:19:56.205 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.copy$item.label.Copy Description&#x09;Ctrl+c</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.476 PST</date>
-	<endDate>2006-03-13 16:21:06.476 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.516 PST</date>
-	<endDate>2006-03-13 16:21:06.516 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.516 PST</date>
-	<endDate>2006-03-13 16:21:06.516 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.546 PST</date>
-	<endDate>2006-03-13 16:21:06.546 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.546 PST</date>
-	<endDate>2006-03-13 16:21:06.546 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 16:21:06.546 PST</date>
-	<endDate>2006-03-13 16:21:06.546 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:02.710 PST</date>
-	<endDate>2006-03-13 17:25:02.710 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:13.766 PST</date>
-	<endDate>2006-03-13 17:25:13.766 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:25:13.766 PST</date>
-	<endDate>2006-03-13 17:25:13.766 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:14.987 PST</date>
-	<endDate>2006-03-13 17:25:14.987 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:25:14.987 PST</date>
-	<endDate>2006-03-13 17:25:14.987 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:24.992 PST</date>
-	<endDate>2006-03-13 17:25:24.992 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:25:24.992 PST</date>
-	<endDate>2006-03-13 17:25:24.992 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:25.653 PST</date>
-	<endDate>2006-03-13 17:25:25.653 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:25:25.653 PST</date>
-	<endDate>2006-03-13 17:25:25.653 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:29.789 PST</date>
-	<endDate>2006-03-13 17:25:29.789 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:25:29.789 PST</date>
-	<endDate>2006-03-13 17:25:29.789 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:34.375 PST</date>
-	<endDate>2006-03-13 17:25:34.375 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:25:40.3 PST</date>
-	<endDate>2006-03-13 17:25:40.3 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:30.256 PST</date>
-	<endDate>2006-03-13 17:26:30.256 PST</endDate>
-	<originId>org.eclipse.ui.file.refresh</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:32.28 PST</date>
-	<endDate>2006-03-13 17:26:32.28 PST</endDate>
-	<originId>org.eclipse.ui.file.refresh</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:34.572 PST</date>
-	<endDate>2006-03-13 17:26:34.572 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:37.506 PST</date>
-	<endDate>2006-03-13 17:26:37.506 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:55.271 PST</date>
-	<endDate>2006-03-13 17:26:55.271 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:26:59.568 PST</date>
-	<endDate>2006-03-13 17:26:59.568 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:27:14.28 PST</date>
-	<endDate>2006-03-13 17:27:14.28 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:27:17.293 PST</date>
-	<endDate>2006-03-13 17:27:17.293 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:27:23.632 PST</date>
-	<endDate>2006-03-13 17:27:23.632 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:27:33.476 PST</date>
-	<endDate>2006-03-13 17:27:33.476 PST</endDate>
-	<originId>org.eclipse.ui.edit.rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:27:36.341 PST</date>
-	<endDate>2006-03-13 17:27:36.341 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:27:36.421 PST</date>
-	<endDate>2006-03-13 17:27:36.421 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:27:36.421 PST</date>
-	<endDate>2006-03-13 17:27:36.421 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:27:36.421 PST</date>
-	<endDate>2006-03-13 17:27:36.421 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 17:29:06.230 PST</date>
-	<endDate>2006-03-13 17:29:06.230 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.rename$item.label.Rename</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:34:31.848 PST</date>
-	<endDate>2006-03-13 17:34:31.848 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:34:31.878 PST</date>
-	<endDate>2006-03-13 17:34:31.878 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:34:31.878 PST</date>
-	<endDate>2006-03-13 17:34:31.878 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 17:34:31.878 PST</date>
-	<endDate>2006-03-13 17:34:31.878 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:06:47.692 PST</date>
-	<endDate>2006-03-13 18:06:47.692 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:06:47.752 PST</date>
-	<endDate>2006-03-13 18:06:47.752 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:06:47.752 PST</date>
-	<endDate>2006-03-13 18:06:47.752 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:06:47.752 PST</date>
-	<endDate>2006-03-13 18:06:47.752 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:09:06.381 PST</date>
-	<endDate>2006-03-13 18:09:06.381 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:09:06.411 PST</date>
-	<endDate>2006-03-13 18:09:06.411 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:09:06.411 PST</date>
-	<endDate>2006-03-13 18:09:06.411 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:09:06.411 PST</date>
-	<endDate>2006-03-13 18:09:06.411 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:02.362 PST</date>
-	<endDate>2006-03-13 18:10:02.362 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:02.412 PST</date>
-	<endDate>2006-03-13 18:10:02.412 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:02.412 PST</date>
-	<endDate>2006-03-13 18:10:02.412 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:02.412 PST</date>
-	<endDate>2006-03-13 18:10:02.412 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:10:31.564 PST</date>
-	<endDate>2006-03-13 18:10:31.564 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:31.594 PST</date>
-	<endDate>2006-03-13 18:10:31.594 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:10:33.516 PST</date>
-	<endDate>2006-03-13 18:10:33.516 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.actions.ApplyMylarToOutlineAction$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:33.516 PST</date>
-	<endDate>2006-03-13 18:10:33.516 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.mylyn.tasks.ui.views.TaskListView</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:43.781 PST</date>
-	<endDate>2006-03-13 18:10:43.781 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:43.831 PST</date>
-	<endDate>2006-03-13 18:10:43.831 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:43.831 PST</date>
-	<endDate>2006-03-13 18:10:43.831 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:10:43.831 PST</date>
-	<endDate>2006-03-13 18:10:43.831 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 18:11:00.936 PST</date>
-	<endDate>2006-03-13 18:11:00.936 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:11:00.996 PST</date>
-	<endDate>2006-03-13 18:11:00.996 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 18:11:01.276 PST</date>
-	<endDate>2006-03-13 18:11:01.276 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:09.788 PST</date>
-	<endDate>2006-03-13 18:11:09.788 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104024</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:10.109 PST</date>
-	<endDate>2006-03-13 18:11:10.109 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:10.109 PST</date>
-	<endDate>2006-03-13 18:11:10.109 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:14.906 PST</date>
-	<endDate>2006-03-13 18:11:14.906 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:14.966 PST</date>
-	<endDate>2006-03-13 18:11:14.966 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:11:14.976 PST</date>
-	<endDate>2006-03-13 18:11:14.976 PST</endDate>
-	<originId>org.eclipse.ui.edit.delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:20.965 PST</date>
-	<endDate>2006-03-13 18:11:20.965 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104025</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:21.55 PST</date>
-	<endDate>2006-03-13 18:11:21.55 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:21.55 PST</date>
-	<endDate>2006-03-13 18:11:21.55 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:23.498 PST</date>
-	<endDate>2006-03-13 18:11:23.498 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:23.518 PST</date>
-	<endDate>2006-03-13 18:11:23.518 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:11:23.518 PST</date>
-	<endDate>2006-03-13 18:11:23.518 PST</endDate>
-	<originId>org.eclipse.ui.edit.delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:25.101 PST</date>
-	<endDate>2006-03-13 18:11:25.101 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:25.131 PST</date>
-	<endDate>2006-03-13 18:11:25.131 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:25.131 PST</date>
-	<endDate>2006-03-13 18:11:25.131 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:11:25.131 PST</date>
-	<endDate>2006-03-13 18:11:25.131 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:15:44.814 PST</date>
-	<endDate>2006-03-13 18:15:44.814 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104026</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:15:45.104 PST</date>
-	<endDate>2006-03-13 18:15:45.104 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:15:45.104 PST</date>
-	<endDate>2006-03-13 18:15:45.104 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:03.150 PST</date>
-	<endDate>2006-03-13 18:16:03.150 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:03.250 PST</date>
-	<endDate>2006-03-13 18:16:03.250 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:16:07.36 PST</date>
-	<endDate>2006-03-13 18:16:07.36 PST</endDate>
-	<originId>org.eclipse.ui.edit.delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:16:34.35 PST</date>
-	<endDate>2006-03-13 18:16:34.35 PST</endDate>
-	<originId>org.eclipse.ui.edit.delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:37.690 PST</date>
-	<endDate>2006-03-13 18:16:37.690 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104027</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:37.800 PST</date>
-	<endDate>2006-03-13 18:16:37.800 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:37.800 PST</date>
-	<endDate>2006-03-13 18:16:37.800 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:40.604 PST</date>
-	<endDate>2006-03-13 18:16:40.604 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:40.624 PST</date>
-	<endDate>2006-03-13 18:16:40.624 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:16:40.624 PST</date>
-	<endDate>2006-03-13 18:16:40.624 PST</endDate>
-	<originId>org.eclipse.ui.edit.delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 18:16:43.919 PST</date>
-	<endDate>2006-03-13 18:16:43.919 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 18:16:43.929 PST</date>
-	<endDate>2006-03-13 18:16:43.929 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:16:43.999 PST</date>
-	<endDate>2006-03-13 18:16:43.999 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:53.22 PST</date>
-	<endDate>2006-03-13 18:16:53.22 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:53.52 PST</date>
-	<endDate>2006-03-13 18:16:53.52 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:53.52 PST</date>
-	<endDate>2006-03-13 18:16:53.52 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:16:53.52 PST</date>
-	<endDate>2006-03-13 18:16:53.52 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:32:42.888 PST</date>
-	<endDate>2006-03-13 18:32:42.888 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:32:42.948 PST</date>
-	<endDate>2006-03-13 18:32:42.948 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:32:42.948 PST</date>
-	<endDate>2006-03-13 18:32:42.948 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:32:42.948 PST</date>
-	<endDate>2006-03-13 18:32:42.948 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:34:56.730 PST</date>
-	<endDate>2006-03-13 18:34:56.730 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.repositories.add$item.label..Add Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 18:38:05.322 PST</date>
-	<endDate>2006-03-13 18:38:05.322 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:38:23.307 PST</date>
-	<endDate>2006-03-13 18:38:23.307 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:42:11.586 PST</date>
-	<endDate>2006-03-13 18:42:11.586 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.delete$item.label.Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:42:15.231 PST</date>
-	<endDate>2006-03-13 18:42:15.241 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.addQuery$item.label.New Repository Query</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:43:34.214 PST</date>
-	<endDate>2006-03-13 18:43:34.214 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:34.224 PST</date>
-	<endDate>2006-03-13 18:43:34.224 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:43:36.7 PST</date>
-	<endDate>2006-03-13 18:43:36.7 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:36.7 PST</date>
-	<endDate>2006-03-13 18:43:36.7 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:43:44.529 PST</date>
-	<endDate>2006-03-13 18:43:44.529 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:44.529 PST</date>
-	<endDate>2006-03-13 18:43:44.529 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:43:46.602 PST</date>
-	<endDate>2006-03-13 18:43:46.602 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.filter.archive$item.label.Filter Archive Category</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:46.602 PST</date>
-	<endDate>2006-03-13 18:43:46.602 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.filter.archive</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:49.747 PST</date>
-	<endDate>2006-03-13 18:43:49.747 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:49.747 PST</date>
-	<endDate>2006-03-13 18:43:49.747 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:43:53.132 PST</date>
-	<endDate>2006-03-13 18:43:53.132 PST</endDate>
-	<originId>org.eclipse.ui.file.save</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>keybinding</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:54.554 PST</date>
-	<endDate>2006-03-13 18:43:54.554 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:43:54.664 PST</date>
-	<endDate>2006-03-13 18:43:54.664 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 18:48:12.114 PST</date>
-	<endDate>2006-03-13 18:48:12.114 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:51:14.296 PST</date>
-	<endDate>2006-03-13 18:51:14.296 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:51:14.326 PST</date>
-	<endDate>2006-03-13 18:51:14.326 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:51:14.326 PST</date>
-	<endDate>2006-03-13 18:51:14.326 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:51:14.326 PST</date>
-	<endDate>2006-03-13 18:51:14.326 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:59:15.768 PST</date>
-	<endDate>2006-03-13 18:59:15.768 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:59:15.798 PST</date>
-	<endDate>2006-03-13 18:59:15.798 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:59:15.798 PST</date>
-	<endDate>2006-03-13 18:59:15.798 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 18:59:15.798 PST</date>
-	<endDate>2006-03-13 18:59:15.798 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:16:05.681 PST</date>
-	<endDate>2006-03-13 19:16:05.681 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:16:05.761 PST</date>
-	<endDate>2006-03-13 19:16:05.761 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:16:05.771 PST</date>
-	<endDate>2006-03-13 19:16:05.771 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:16:09.316 PST</date>
-	<endDate>2006-03-13 19:16:09.316 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:16:10.888 PST</date>
-	<endDate>2006-03-13 19:16:10.888 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:16:10.928 PST</date>
-	<endDate>2006-03-13 19:16:10.928 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:16:10.928 PST</date>
-	<endDate>2006-03-13 19:16:10.928 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:16:10.928 PST</date>
-	<endDate>2006-03-13 19:16:10.928 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:33:34.469 PST</date>
-	<endDate>2006-03-13 19:33:34.469 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:33:52.675 PST</date>
-	<endDate>2006-03-13 19:33:52.675 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:33:52.725 PST</date>
-	<endDate>2006-03-13 19:33:52.725 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:33:52.725 PST</date>
-	<endDate>2006-03-13 19:33:52.725 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:33:52.725 PST</date>
-	<endDate>2006-03-13 19:33:52.725 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:34:29.418 PST</date>
-	<endDate>2006-03-13 19:34:29.418 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:34:39.612 PST</date>
-	<endDate>2006-03-13 19:34:39.612 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:34:51.389 PST</date>
-	<endDate>2006-03-13 19:34:51.389 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:35:32.769 PST</date>
-	<endDate>2006-03-13 19:35:32.769 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:06.440 PST</date>
-	<endDate>2006-03-13 19:38:06.440 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:12.48 PST</date>
-	<endDate>2006-03-13 19:38:12.48 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:20.610 PST</date>
-	<endDate>2006-03-13 19:38:20.610 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.userid</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>104028</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:20.910 PST</date>
-	<endDate>2006-03-13 19:38:20.910 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:20.910 PST</date>
-	<endDate>2006-03-13 19:38:20.910 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:24.175 PST</date>
-	<endDate>2006-03-13 19:38:24.175 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.ui.taskEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:24.255 PST</date>
-	<endDate>2006-03-13 19:38:24.255 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:38:30.434 PST</date>
-	<endDate>2006-03-13 19:38:30.434 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:30.484 PST</date>
-	<endDate>2006-03-13 19:38:30.484 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:30.484 PST</date>
-	<endDate>2006-03-13 19:38:30.484 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:32.617 PST</date>
-	<endDate>2006-03-13 19:38:32.617 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:34.640 PST</date>
-	<endDate>2006-03-13 19:38:34.640 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.JavaProject</structureKind>
-	<structureHandle>(non-source element)</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:38:40.128 PST</date>
-	<endDate>2006-03-13 19:38:40.128 PST</endDate>
-	<originId>null$item.label.Ne&amp;w/&amp;File</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:43.703 PST</date>
-	<endDate>2006-03-13 19:38:43.703 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:43.813 PST</date>
-	<endDate>2006-03-13 19:38:43.813 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:43.853 PST</date>
-	<endDate>2006-03-13 19:38:43.853 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:43.853 PST</date>
-	<endDate>2006-03-13 19:38:43.853 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:45.916 PST</date>
-	<endDate>2006-03-13 19:38:45.916 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:45.966 PST</date>
-	<endDate>2006-03-13 19:38:45.966 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:38:49.331 PST</date>
-	<endDate>2006-03-13 19:38:49.331 PST</endDate>
-	<originId>null$item.label.&amp;Delete&#x09;Delete</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:51.645 PST</date>
-	<endDate>2006-03-13 19:38:51.645 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:51.685 PST</date>
-	<endDate>2006-03-13 19:38:51.685 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:52.576 PST</date>
-	<endDate>2006-03-13 19:38:52.576 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:53.207 PST</date>
-	<endDate>2006-03-13 19:38:53.207 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:53.968 PST</date>
-	<endDate>2006-03-13 19:38:53.968 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:54.128 PST</date>
-	<endDate>2006-03-13 19:38:54.138 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:54.158 PST</date>
-	<endDate>2006-03-13 19:38:54.158 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:54.158 PST</date>
-	<endDate>2006-03-13 19:38:54.158 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:54.158 PST</date>
-	<endDate>2006-03-13 19:38:54.158 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:38:56.752 PST</date>
-	<endDate>2006-03-13 19:38:56.752 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:56.802 PST</date>
-	<endDate>2006-03-13 19:38:56.802 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:58.565 PST</date>
-	<endDate>2006-03-13 19:38:58.565 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:38:59.115 PST</date>
-	<endDate>2006-03-13 19:38:59.115 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>new</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:00.37 PST</date>
-	<endDate>2006-03-13 19:39:00.37 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>new</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:01.218 PST</date>
-	<endDate>2006-03-13 19:39:01.218 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:01.238 PST</date>
-	<endDate>2006-03-13 19:39:01.238 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:01.459 PST</date>
-	<endDate>2006-03-13 19:39:01.459 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:01.469 PST</date>
-	<endDate>2006-03-13 19:39:01.469 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:01.469 PST</date>
-	<endDate>2006-03-13 19:39:01.469 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:02.170 PST</date>
-	<endDate>2006-03-13 19:39:02.170 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:02.220 PST</date>
-	<endDate>2006-03-13 19:39:02.220 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>new</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:02.270 PST</date>
-	<endDate>2006-03-13 19:39:02.270 PST</endDate>
-	<originId>org.eclipse.mylyn.actions.filter.packageExplorer$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:04.703 PST</date>
-	<endDate>2006-03-13 19:39:04.703 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:04.824 PST</date>
-	<endDate>2006-03-13 19:39:04.824 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:04.914 PST</date>
-	<endDate>2006-03-13 19:39:04.914 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:04.914 PST</date>
-	<endDate>2006-03-13 19:39:04.914 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:04.944 PST</date>
-	<endDate>2006-03-13 19:39:04.944 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:05.84 PST</date>
-	<endDate>2006-03-13 19:39:05.84 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:06.176 PST</date>
-	<endDate>2006-03-13 19:39:06.176 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.296 PST</date>
-	<endDate>2006-03-13 19:39:06.296 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.366 PST</date>
-	<endDate>2006-03-13 19:39:06.366 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.366 PST</date>
-	<endDate>2006-03-13 19:39:06.366 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.666 PST</date>
-	<endDate>2006-03-13 19:39:06.666 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.666 PST</date>
-	<endDate>2006-03-13 19:39:06.666 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.666 PST</date>
-	<endDate>2006-03-13 19:39:06.666 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:06.736 PST</date>
-	<endDate>2006-03-13 19:39:06.736 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:06.746 PST</date>
-	<endDate>2006-03-13 19:39:06.746 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:09.40 PST</date>
-	<endDate>2006-03-13 19:39:09.40 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:09.80 PST</date>
-	<endDate>2006-03-13 19:39:09.80 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:09.80 PST</date>
-	<endDate>2006-03-13 19:39:09.80 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:09.110 PST</date>
-	<endDate>2006-03-13 19:39:09.110 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:09.150 PST</date>
-	<endDate>2006-03-13 19:39:09.150 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:10.191 PST</date>
-	<endDate>2006-03-13 19:39:10.191 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.312 PST</date>
-	<endDate>2006-03-13 19:39:10.312 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.362 PST</date>
-	<endDate>2006-03-13 19:39:10.362 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.362 PST</date>
-	<endDate>2006-03-13 19:39:10.362 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.552 PST</date>
-	<endDate>2006-03-13 19:39:10.552 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.562 PST</date>
-	<endDate>2006-03-13 19:39:10.562 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.562 PST</date>
-	<endDate>2006-03-13 19:39:10.562 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:39:10.612 PST</date>
-	<endDate>2006-03-13 19:39:10.612 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:10.622 PST</date>
-	<endDate>2006-03-13 19:39:10.622 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:14.628 PST</date>
-	<endDate>2006-03-13 19:39:14.628 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:14.648 PST</date>
-	<endDate>2006-03-13 19:39:14.648 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:14.728 PST</date>
-	<endDate>2006-03-13 19:39:14.728 PST</endDate>
-	<originId>org.eclipse.mylyn.actions.filter.packageExplorer$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:14.728 PST</date>
-	<endDate>2006-03-13 19:39:14.728 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:14.768 PST</date>
-	<endDate>2006-03-13 19:39:14.768 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.CompilationUnit</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:u1AbU5VY3lCqthZeC1B85+I27Fg=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:18.964 PST</date>
-	<endDate>2006-03-13 19:39:18.964 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.JavaProject</structureKind>
-	<structureHandle>(non-source element)</structureHandle>
-	<navigation>null</navigation>
-	<delta>predicted</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:30.551 PST</date>
-	<endDate>2006-03-13 19:39:30.551 PST</endDate>
-	<originId>export$item.label.&amp;File/Exp&amp;ort...</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:47.906 PST</date>
-	<endDate>2006-03-13 19:39:47.906 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:49.207 PST</date>
-	<endDate>2006-03-13 19:39:49.207 PST</endDate>
-	<originId>org.eclipse.mylyn.actions.filter.packageExplorer$item.label..Apply Mylar</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:49.207 PST</date>
-	<endDate>2006-03-13 19:39:49.207 PST</endDate>
-	<originId>org.eclipse.mylyn.ui.interest.filter.org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:51.711 PST</date>
-	<endDate>2006-03-13 19:39:51.711 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:51.871 PST</date>
-	<endDate>2006-03-13 19:39:51.871 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:51.921 PST</date>
-	<endDate>2006-03-13 19:39:51.921 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:51.921 PST</date>
-	<endDate>2006-03-13 19:39:51.921 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:51.951 PST</date>
-	<endDate>2006-03-13 19:39:51.951 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:52.1 PST</date>
-	<endDate>2006-03-13 19:39:52.1 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:39:52.833 PST</date>
-	<endDate>2006-03-13 19:39:52.833 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.3 PST</date>
-	<endDate>2006-03-13 19:39:53.3 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.63 PST</date>
-	<endDate>2006-03-13 19:39:53.63 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.63 PST</date>
-	<endDate>2006-03-13 19:39:53.63 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.223 PST</date>
-	<endDate>2006-03-13 19:39:53.223 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.233 PST</date>
-	<endDate>2006-03-13 19:39:53.233 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:53.233 PST</date>
-	<endDate>2006-03-13 19:39:53.233 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:54.505 PST</date>
-	<endDate>2006-03-13 19:39:54.505 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:54.555 PST</date>
-	<endDate>2006-03-13 19:39:54.555 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:54.585 PST</date>
-	<endDate>2006-03-13 19:39:54.585 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:54.585 PST</date>
-	<endDate>2006-03-13 19:39:54.585 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:54.585 PST</date>
-	<endDate>2006-03-13 19:39:54.585 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:57.269 PST</date>
-	<endDate>2006-03-13 19:39:57.269 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:57.319 PST</date>
-	<endDate>2006-03-13 19:39:57.319 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:39:59.302 PST</date>
-	<endDate>2006-03-13 19:39:59.302 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:39:59.392 PST</date>
-	<endDate>2006-03-13 19:39:59.392 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:40:00.704 PST</date>
-	<endDate>2006-03-13 19:40:00.704 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:00.764 PST</date>
-	<endDate>2006-03-13 19:40:00.764 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:00.764 PST</date>
-	<endDate>2006-03-13 19:40:00.764 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:00.774 PST</date>
-	<endDate>2006-03-13 19:40:00.774 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:00.804 PST</date>
-	<endDate>2006-03-13 19:40:00.804 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:00.874 PST</date>
-	<endDate>2006-03-13 19:40:00.874 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:40:01.695 PST</date>
-	<endDate>2006-03-13 19:40:01.695 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:01.836 PST</date>
-	<endDate>2006-03-13 19:40:01.836 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:01.886 PST</date>
-	<endDate>2006-03-13 19:40:01.886 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:01.886 PST</date>
-	<endDate>2006-03-13 19:40:01.886 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:02.46 PST</date>
-	<endDate>2006-03-13 19:40:02.46 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:02.46 PST</date>
-	<endDate>2006-03-13 19:40:02.46 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:02.46 PST</date>
-	<endDate>2006-03-13 19:40:02.46 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:02.56 PST</date>
-	<endDate>2006-03-13 19:40:02.56 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:40:02.76 PST</date>
-	<endDate>2006-03-13 19:40:02.76 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:40:02.76 PST</date>
-	<endDate>2006-03-13 19:40:02.76 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:41:47.518 PST</date>
-	<endDate>2006-03-13 19:41:47.518 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:47.568 PST</date>
-	<endDate>2006-03-13 19:41:47.568 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:47.568 PST</date>
-	<endDate>2006-03-13 19:41:47.568 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:47.658 PST</date>
-	<endDate>2006-03-13 19:41:47.658 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:41:48.739 PST</date>
-	<endDate>2006-03-13 19:41:48.739 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:48.859 PST</date>
-	<endDate>2006-03-13 19:41:48.859 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:48.930 PST</date>
-	<endDate>2006-03-13 19:41:48.930 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:48.930 PST</date>
-	<endDate>2006-03-13 19:41:48.930 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.110 PST</date>
-	<endDate>2006-03-13 19:41:49.110 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:49.170 PST</date>
-	<endDate>2006-03-13 19:41:49.170 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.170 PST</date>
-	<endDate>2006-03-13 19:41:49.170 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.170 PST</date>
-	<endDate>2006-03-13 19:41:49.170 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.340 PST</date>
-	<endDate>2006-03-13 19:41:49.340 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:41:49.370 PST</date>
-	<endDate>2006-03-13 19:41:49.370 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.370 PST</date>
-	<endDate>2006-03-13 19:41:49.370 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.370 PST</date>
-	<endDate>2006-03-13 19:41:49.370 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.380 PST</date>
-	<endDate>2006-03-13 19:41:49.380 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:49.400 PST</date>
-	<endDate>2006-03-13 19:41:49.400 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:49.400 PST</date>
-	<endDate>2006-03-13 19:41:49.400 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:41:51.93 PST</date>
-	<endDate>2006-03-13 19:41:51.93 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:51.153 PST</date>
-	<endDate>2006-03-13 19:41:51.153 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:51.153 PST</date>
-	<endDate>2006-03-13 19:41:51.153 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:51.153 PST</date>
-	<endDate>2006-03-13 19:41:51.153 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:51.233 PST</date>
-	<endDate>2006-03-13 19:41:51.233 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:41:52.254 PST</date>
-	<endDate>2006-03-13 19:41:52.254 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.415 PST</date>
-	<endDate>2006-03-13 19:41:52.415 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.475 PST</date>
-	<endDate>2006-03-13 19:41:52.475 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.475 PST</date>
-	<endDate>2006-03-13 19:41:52.475 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.675 PST</date>
-	<endDate>2006-03-13 19:41:52.675 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:52.715 PST</date>
-	<endDate>2006-03-13 19:41:52.715 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.715 PST</date>
-	<endDate>2006-03-13 19:41:52.715 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.715 PST</date>
-	<endDate>2006-03-13 19:41:52.715 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.895 PST</date>
-	<endDate>2006-03-13 19:41:52.895 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:41:52.985 PST</date>
-	<endDate>2006-03-13 19:41:52.985 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.985 PST</date>
-	<endDate>2006-03-13 19:41:52.985 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.985 PST</date>
-	<endDate>2006-03-13 19:41:52.985 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:52.995 PST</date>
-	<endDate>2006-03-13 19:41:52.995 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:53.15 PST</date>
-	<endDate>2006-03-13 19:41:53.15 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:53.15 PST</date>
-	<endDate>2006-03-13 19:41:53.15 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:55.699 PST</date>
-	<endDate>2006-03-13 19:41:55.699 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:55.709 PST</date>
-	<endDate>2006-03-13 19:41:55.709 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>kgasQrUy746YNHDCUfTho2X9Y2w=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:55.950 PST</date>
-	<endDate>2006-03-13 19:41:55.950 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.JavaProject</structureKind>
-	<structureHandle>(non-source element)</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:57.502 PST</date>
-	<endDate>2006-03-13 19:41:57.502 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>bGEKxMN6Bg6Hkug7j+UsoKhFN0Q=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:58.483 PST</date>
-	<endDate>2006-03-13 19:41:58.483 PST</endDate>
-	<originId>org.eclipse.jdt.ui.PackageExplorer</originId>
-	<structureKind>?: class org.eclipse.core.internal.resources.File</structureKind>
-	<structureHandle>bGEKxMN6Bg6Hkug7j+UsoKhFN0Q=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:59.755 PST</date>
-	<endDate>2006-03-13 19:41:59.755 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:41:59.765 PST</date>
-	<endDate>2006-03-13 19:41:59.765 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:59.765 PST</date>
-	<endDate>2006-03-13 19:41:59.765 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:41:59.765 PST</date>
-	<endDate>2006-03-13 19:41:59.765 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:01.728 PST</date>
-	<endDate>2006-03-13 19:42:01.728 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:01.778 PST</date>
-	<endDate>2006-03-13 19:42:01.778 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:04.222 PST</date>
-	<endDate>2006-03-13 19:42:04.222 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.292 PST</date>
-	<endDate>2006-03-13 19:42:04.292 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.292 PST</date>
-	<endDate>2006-03-13 19:42:04.292 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.292 PST</date>
-	<endDate>2006-03-13 19:42:04.292 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.292 PST</date>
-	<endDate>2006-03-13 19:42:04.292 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.322 PST</date>
-	<endDate>2006-03-13 19:42:04.322 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:04.452 PST</date>
-	<endDate>2006-03-13 19:42:04.452 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:05.654 PST</date>
-	<endDate>2006-03-13 19:42:05.654 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:05.824 PST</date>
-	<endDate>2006-03-13 19:42:05.824 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:05.904 PST</date>
-	<endDate>2006-03-13 19:42:05.904 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:05.904 PST</date>
-	<endDate>2006-03-13 19:42:05.904 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:06.174 PST</date>
-	<endDate>2006-03-13 19:42:06.174 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.184 PST</date>
-	<endDate>2006-03-13 19:42:06.184 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.184 PST</date>
-	<endDate>2006-03-13 19:42:06.184 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.365 PST</date>
-	<endDate>2006-03-13 19:42:06.365 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:06.385 PST</date>
-	<endDate>2006-03-13 19:42:06.385 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.395 PST</date>
-	<endDate>2006-03-13 19:42:06.395 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.395 PST</date>
-	<endDate>2006-03-13 19:42:06.395 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.595 PST</date>
-	<endDate>2006-03-13 19:42:06.595 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:42:06.645 PST</date>
-	<endDate>2006-03-13 19:42:06.645 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.645 PST</date>
-	<endDate>2006-03-13 19:42:06.645 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.645 PST</date>
-	<endDate>2006-03-13 19:42:06.645 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.655 PST</date>
-	<endDate>2006-03-13 19:42:06.655 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:06.715 PST</date>
-	<endDate>2006-03-13 19:42:06.715 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:06.715 PST</date>
-	<endDate>2006-03-13 19:42:06.715 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:10.971 PST</date>
-	<endDate>2006-03-13 19:42:10.971 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:11.21 PST</date>
-	<endDate>2006-03-13 19:42:11.21 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:11.21 PST</date>
-	<endDate>2006-03-13 19:42:11.21 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:11.21 PST</date>
-	<endDate>2006-03-13 19:42:11.21 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:11.21 PST</date>
-	<endDate>2006-03-13 19:42:11.21 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:11.111 PST</date>
-	<endDate>2006-03-13 19:42:11.111 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:12.233 PST</date>
-	<endDate>2006-03-13 19:42:12.233 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.423 PST</date>
-	<endDate>2006-03-13 19:42:12.423 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.473 PST</date>
-	<endDate>2006-03-13 19:42:12.473 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.473 PST</date>
-	<endDate>2006-03-13 19:42:12.473 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:12.714 PST</date>
-	<endDate>2006-03-13 19:42:12.714 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.714 PST</date>
-	<endDate>2006-03-13 19:42:12.714 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.714 PST</date>
-	<endDate>2006-03-13 19:42:12.714 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.844 PST</date>
-	<endDate>2006-03-13 19:42:12.844 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:12.854 PST</date>
-	<endDate>2006-03-13 19:42:12.854 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.854 PST</date>
-	<endDate>2006-03-13 19:42:12.854 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:12.884 PST</date>
-	<endDate>2006-03-13 19:42:12.884 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:13.24 PST</date>
-	<endDate>2006-03-13 19:42:13.24 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:42:13.44 PST</date>
-	<endDate>2006-03-13 19:42:13.44 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:13.64 PST</date>
-	<endDate>2006-03-13 19:42:13.64 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:13.64 PST</date>
-	<endDate>2006-03-13 19:42:13.64 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:13.74 PST</date>
-	<endDate>2006-03-13 19:42:13.74 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:13.104 PST</date>
-	<endDate>2006-03-13 19:42:13.104 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:13.104 PST</date>
-	<endDate>2006-03-13 19:42:13.104 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:14.637 PST</date>
-	<endDate>2006-03-13 19:42:14.637 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:42:14.687 PST</date>
-	<endDate>2006-03-13 19:42:14.687 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:15.788 PST</date>
-	<endDate>2006-03-13 19:42:15.788 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:njipS1EKh2F8=ZO7yoaeJqJ46Mk=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:42:16.649 PST</date>
-	<endDate>2006-03-13 19:42:16.649 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:njipS1EKh2F8=ZO7yoaeJqJ46Mk=</structureHandle>
-	<navigation>null</navigation>
-	<delta>new</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:17.991 PST</date>
-	<endDate>2006-03-13 19:42:17.991 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.deactivate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.92 PST</date>
-	<endDate>2006-03-13 19:42:18.92 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.92 PST</date>
-	<endDate>2006-03-13 19:42:18.92 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.92 PST</date>
-	<endDate>2006-03-13 19:42:18.92 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.92 PST</date>
-	<endDate>2006-03-13 19:42:18.92 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.122 PST</date>
-	<endDate>2006-03-13 19:42:18.122 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:18.202 PST</date>
-	<endDate>2006-03-13 19:42:18.202 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-13 19:42:19.93 PST</date>
-	<endDate>2006-03-13 19:42:19.93 PST</endDate>
-	<originId>org.eclipse.mylyn.tasklist.actions.context.activate</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta></delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.253 PST</date>
-	<endDate>2006-03-13 19:42:19.253 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>false</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.353 PST</date>
-	<endDate>2006-03-13 19:42:19.353 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.353 PST</date>
-	<endDate>2006-03-13 19:42:19.353 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:19.674 PST</date>
-	<endDate>2006-03-13 19:42:19.674 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>?: class org.eclipse.pde.internal.core.text.plugin.PluginExtensionNode</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.674 PST</date>
-	<endDate>2006-03-13 19:42:19.674 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.674 PST</date>
-	<endDate>2006-03-13 19:42:19.674 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.854 PST</date>
-	<endDate>2006-03-13 19:42:19.854 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:19.894 PST</date>
-	<endDate>2006-03-13 19:42:19.894 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.894 PST</date>
-	<endDate>2006-03-13 19:42:19.894 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:19.894 PST</date>
-	<endDate>2006-03-13 19:42:19.894 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:20.74 PST</date>
-	<endDate>2006-03-13 19:42:20.74 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:20.104 PST</date>
-	<endDate>2006-03-13 19:42:20.104 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>file</structureKind>
-	<structureHandle>9nvG2tdPCNTYthh=ySR2taKqSis=/1z1W9bf52gqYBhte9cvzHd08qaA=/RNYZ2FMQ9x4lk3abnwOVAJklFKI=/vcNIv3WAHFJ=Uc3t3I7fAn9+81o=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:20.104 PST</date>
-	<endDate>2006-03-13 19:42:20.104 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:20.104 PST</date>
-	<endDate>2006-03-13 19:42:20.104 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorOpen</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:20.134 PST</date>
-	<endDate>2006-03-13 19:42:20.134 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>edit</kind>
-	<date>2006-03-13 19:42:20.175 PST</date>
-	<endDate>2006-03-13 19:42:20.175 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.PackageDeclaration</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:qUqP5cyxm6YcTAhz05Hph5gvu9M=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:42:20.195 PST</date>
-	<endDate>2006-03-13 19:42:20.195 PST</endDate>
-	<originId>org.eclipse.jdt.ui.packages.linktoeditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>true</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-13 19:42:20.685 PST</date>
-	<endDate>2006-03-13 19:42:20.685 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>java:class org.eclipse.jdt.internal.core.SourceMethod</structureKind>
-	<structureHandle>8n=t4iILzTJq7j6G3f1OvQ=ljLk=/qUqP5cyxm6YcTAhz05Hph5gvu9M=/u1AbU5VY3lCqthZeC1B85+I27Fg=:njipS1EKh2F8=ZO7yoaeJqJ46Mk=</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.227 PST</date>
-	<endDate>2006-03-13 19:43:24.227 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.357 PST</date>
-	<endDate>2006-03-13 19:43:24.357 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.357 PST</date>
-	<endDate>2006-03-13 19:43:24.357 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.357 PST</date>
-	<endDate>2006-03-13 19:43:24.357 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.357 PST</date>
-	<endDate>2006-03-13 19:43:24.357 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.697 PST</date>
-	<endDate>2006-03-13 19:43:24.697 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.697 PST</date>
-	<endDate>2006-03-13 19:43:24.697 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.737 PST</date>
-	<endDate>2006-03-13 19:43:24.737 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.737 PST</date>
-	<endDate>2006-03-13 19:43:24.737 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-13 19:43:24.747 PST</date>
-	<endDate>2006-03-13 19:43:24.747 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:00:02.667 PST</date>
-	<endDate>2006-03-14 09:00:02.667 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:00:02.697 PST</date>
-	<endDate>2006-03-14 09:00:02.697 PST</endDate>
-	<originId>null$item.label..Delete Log</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>toolbar</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:00:02.797 PST</date>
-	<endDate>2006-03-14 09:00:02.797 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:00:50.65 PST</date>
-	<endDate>2006-03-14 09:00:50.65 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:01:10.344 PST</date>
-	<endDate>2006-03-14 09:01:10.344 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:01:41.319 PST</date>
-	<endDate>2006-03-14 09:01:41.319 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:02:16.880 PST</date>
-	<endDate>2006-03-14 09:02:16.880 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>command</kind>
-	<date>2006-03-14 09:02:53.723 PST</date>
-	<endDate>2006-03-14 09:02:53.723 PST</endDate>
-	<originId>org.eclipse.mylyn.bugzilla.ui.popup.refresh$item.label.Synchronize with Repository</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>menu</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:03:11.869 PST</date>
-	<endDate>2006-03-14 09:03:11.869 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:03:12.19 PST</date>
-	<endDate>2006-03-14 09:03:12.19 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:03:12.19 PST</date>
-	<endDate>2006-03-14 09:03:12.19 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>selection</kind>
-	<date>2006-03-14 09:03:14.12 PST</date>
-	<endDate>2006-03-14 09:03:14.12 PST</endDate>
-	<originId>org.eclipse.pde.runtime.LogView</originId>
-	<structureKind>?: class org.eclipse.pde.internal.runtime.logview.LogEntry</structureKind>
-	<structureHandle>?</structureHandle>
-	<navigation>null</navigation>
-	<delta>selected</delta>
-	<interestContribution>0.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:30.886 PST</date>
-	<endDate>2006-03-14 09:03:30.886 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: actionSetShow</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:30.936 PST</date>
-	<endDate>2006-03-14 09:03:30.936 PST</endDate>
-	<originId>org.eclipse.ui.DefaultTextEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:30.936 PST</date>
-	<endDate>2006-03-14 09:03:30.936 PST</endDate>
-	<originId>org.eclipse.pde.ui.manifestEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:30.936 PST</date>
-	<endDate>2006-03-14 09:03:30.936 PST</endDate>
-	<originId>org.eclipse.jdt.ui.CompilationUnitEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:30.936 PST</date>
-	<endDate>2006-03-14 09:03:30.936 PST</endDate>
-	<originId>org.eclipse.ant.ui.internal.editor.AntEditor</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:31.116 PST</date>
-	<endDate>2006-03-14 09:03:31.116 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective changed: editorClose</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:31.116 PST</date>
-	<endDate>2006-03-14 09:03:31.116 PST</endDate>
-	<originId>org.eclipse.jdt.ui.JavaPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:31.177 PST</date>
-	<endDate>2006-03-14 09:03:31.177 PST</endDate>
-	<originId>org.eclipse.team.ui.TeamSynchronizingPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:31.177 PST</date>
-	<endDate>2006-03-14 09:03:31.177 PST</endDate>
-	<originId>org.eclipse.team.cvs.ui.cvsPerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
-<interactionEvent>
-	<kind>preference</kind>
-	<date>2006-03-14 09:03:31.177 PST</date>
-	<endDate>2006-03-14 09:03:31.177 PST</endDate>
-	<originId>org.eclipse.ui.resourcePerspective</originId>
-	<structureKind>null</structureKind>
-	<structureHandle>null</structureHandle>
-	<navigation>null</navigation>
-	<delta>perspective closed</delta>
-	<interestContribution>1.0</interestContribution>
-</interactionEvent>
diff --git a/org.eclipse.mylyn.monitor.tests/testdata/usage-parsing.zip b/org.eclipse.mylyn.monitor.tests/testdata/usage-parsing.zip
deleted file mode 100644
index a7da65f..0000000
--- a/org.eclipse.mylyn.monitor.tests/testdata/usage-parsing.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn.monitor.ui/.classpath b/org.eclipse.mylyn.monitor.ui/.classpath
deleted file mode 100644
index 594bdc7..0000000
--- a/org.eclipse.mylyn.monitor.ui/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ui/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn.monitor.ui/.cvsignore b/org.eclipse.mylyn.monitor.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn.monitor.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn.monitor.ui/.project b/org.eclipse.mylyn.monitor.ui/.project
deleted file mode 100644
index fc60588..0000000
--- a/org.eclipse.mylyn.monitor.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn.monitor.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fbac239..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 7ab03bd..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:09 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 0a2cc0b..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:14:59 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index d8c6d26..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 25 03:02:37 GMT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn.monitor.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn.monitor.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.monitor.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7a0499f..0000000
--- a/org.eclipse.mylyn.monitor.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn.monitor.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.browser,
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.mylyn.internal.monitor.ui;x-internal:=true,
- org.eclipse.mylyn.monitor.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.monitor.ui/about.html b/org.eclipse.mylyn.monitor.ui/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn.monitor.ui/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.ui/build-user.xml b/org.eclipse.mylyn.monitor.ui/build-user.xml
deleted file mode 100644
index 6097713..0000000
--- a/org.eclipse.mylyn.monitor.ui/build-user.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<target name="help">
-    <echo message="Please run: $ ant -v -projecthelp"/>
-</target>
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.ui/build.properties b/org.eclipse.mylyn.monitor.ui/build.properties
deleted file mode 100644
index 46da6ce..0000000
--- a/org.eclipse.mylyn.monitor.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.xml,\
-               plugin.properties
-src.includes = about.html,\
-               schema/
-jre.compilation.profile = J2SE-1.5
-source.. = src/
diff --git a/org.eclipse.mylyn.monitor.ui/plugin.properties b/org.eclipse.mylyn.monitor.ui/plugin.properties
deleted file mode 100644
index 4e31da1..0000000
--- a/org.eclipse.mylyn.monitor.ui/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn.monitor.ui
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn Monitor UI
diff --git a/org.eclipse.mylyn.monitor.ui/plugin.xml b/org.eclipse.mylyn.monitor.ui/plugin.xml
deleted file mode 100644
index 16fec85..0000000
--- a/org.eclipse.mylyn.monitor.ui/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="user" name="User Monitoring" schema="schema/user.exsd"/>
-</plugin>
diff --git a/org.eclipse.mylyn.monitor.ui/schema/user.exsd b/org.eclipse.mylyn.monitor.ui/schema/user.exsd
deleted file mode 100644
index 712f25b..0000000
--- a/org.eclipse.mylyn.monitor.ui/schema/user.exsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.mylyn.monitor.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.mylyn.monitor.ui" id="user" name="User Monitoring"/>
-      </appInfo>
-      <documentation>
-         Provides user-specific monitor extensions, for example, for tracking periods of user activity/inactivity.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="osActivityTimer"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="osActivityTimer">
-      <annotation>
-         <documentation>
-            Only one extension is permitted per workbench instance.  If more than one plug-in specifies this extension point, only one will be used.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.mylyn.monitor.ui.AbstractUserActivityMonitor:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActionExecutionMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActionExecutionMonitor.java
deleted file mode 100644
index ca2f59f..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActionExecutionMonitor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.IActionExecutionListener;
-
-/**
- * @author Mik Kersten
- */
-public class ActionExecutionMonitor implements IActionExecutionListener {
-
-	public void actionObserved(IAction action) {
-		InteractionEvent interactionEvent = InteractionEvent.makeCommand(action.getId(), ""); //$NON-NLS-1$
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityChangeMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityChangeMonitor.java
deleted file mode 100644
index c9f5242..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityChangeMonitor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.activities.ActivityManagerEvent;
-import org.eclipse.ui.activities.IActivityManagerListener;
-
-/**
- * @author Mik Kersten
- */
-public class ActivityChangeMonitor implements IActivityManagerListener {
-
-	private static final String ACTIVITIES_CHANGED = "activities changed"; //$NON-NLS-1$
-
-	public void activityManagerChanged(ActivityManagerEvent activityManagerEvent) {
-		if (activityManagerEvent.haveEnabledActivityIdsChanged()) {
-			String source = activityManagerEvent.getActivityManager().toString();
-			String delta = activityManagerEvent.getActivityManager().getEnabledActivityIds().toString();
-			InteractionEvent interactionEvent = InteractionEvent.makePreference(source, ACTIVITIES_CHANGED + ": " //$NON-NLS-1$
-					+ delta);
-			MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
deleted file mode 100644
index 065e2c1..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ActivityContextManager.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractUserActivityMonitor;
-import org.eclipse.mylyn.monitor.ui.IActivityContextManager;
-import org.eclipse.mylyn.monitor.ui.IUserAttentionListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Manages the meta task-activity context.
- * 
- * @author Mik Kersten
- * @author Rob Elves
- * @since 2.0
- */
-@SuppressWarnings("restriction")
-public class ActivityContextManager implements IActivityContextManager {
-
-	private AbstractUserActivityMonitor userActivityMonitor;
-
-	private final Set<IUserAttentionListener> attentionListeners = new CopyOnWriteArraySet<IUserAttentionListener>();
-
-	private final CheckActivityJob checkJob;
-
-	private IWorkingSet[] workingSets;
-
-	private final ArrayList<AbstractUserActivityMonitor> activityMonitors;
-
-	public static final String ACTIVITY_TIMEOUT = "org.eclipse.mylyn.monitor.ui.activity.timeout"; //$NON-NLS-1$
-
-	public static final String ACTIVITY_TIMEOUT_ENABLED = "org.eclipse.mylyn.monitor.ui.activity.timeout.enabled"; //$NON-NLS-1$
-
-	private final IPropertyChangeListener WORKING_SET_CHANGE_LISTENER = new IPropertyChangeListener() {
-		public void propertyChange(PropertyChangeEvent event) {
-			if (IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE.equals(event.getProperty())) {
-				updateWorkingSetSelection();
-			}
-		}
-	};
-
-	public ActivityContextManager(ArrayList<AbstractUserActivityMonitor> monitors) {
-		this.activityMonitors = monitors;
-		checkJob = new CheckActivityJob(new IActivityManagerCallback() {
-			public void addMonitoredActivityTime(long localStartTime, long currentTime) {
-				ActivityContextManager.this.addMonitoredActivityTime(localStartTime, currentTime);
-			}
-
-			public void inactive() {
-				ActivityContextManager.this.fireInactive();
-			}
-
-			public long getLastEventTime() {
-				return ActivityContextManager.this.getLastEventTime();
-			}
-
-			public void active() {
-				ActivityContextManager.this.fireActive();
-			}
-		});
-		checkJob.setSystem(true);
-		checkJob.setPriority(Job.INTERACTIVE);
-	}
-
-	protected void updateWorkingSetSelection() {
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-				if (window != null) {
-					IWorkbenchPage page = window.getActivePage();
-					workingSets = page.getWorkingSets();
-				}
-			}
-		});
-	}
-
-	public void start() {
-		for (AbstractUserActivityMonitor monitor : activityMonitors) {
-			monitor.start();
-		}
-		updateWorkingSetSelection();
-		PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(WORKING_SET_CHANGE_LISTENER);
-		checkJob.reschedule();
-	}
-
-	public void stop() {
-		for (AbstractUserActivityMonitor monitor : activityMonitors) {
-			monitor.stop();
-		}
-		PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(WORKING_SET_CHANGE_LISTENER);
-		checkJob.cancel();
-	}
-
-	public void addListener(IUserAttentionListener listener) {
-		attentionListeners.add(listener);
-	}
-
-	public void removeListener(IUserAttentionListener listener) {
-		attentionListeners.remove(listener);
-	}
-
-	private void addMonitoredActivityTime(long start, long end) {
-		if ((end > 0 && start > 0) && (end > start)) {
-
-			String origin = InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH;
-
-			if (userActivityMonitor != null && userActivityMonitor.getOriginId() != null) {
-				origin = userActivityMonitor.getOriginId();
-			}
-
-			String handle = getStructureHandle();
-			if (handle == null) {
-				if (workingSets != null && workingSets.length > 0) {
-					for (IWorkingSet workingSet : workingSets) {
-						String workingSetName = workingSet.getName();
-						processWorkbenchEvent(origin, InteractionContextManager.ACTIVITY_STRUCTUREKIND_WORKINGSET,
-								workingSetName, start, end);
-					}
-				} else {
-					processWorkbenchEvent(origin, InteractionContextManager.ACTIVITY_STRUCTUREKIND_WORKINGSET,
-							InteractionContextManager.ACTIVITY_HANDLE_NONE, start, end);
-				}
-			} else {
-				processWorkbenchEvent(origin, InteractionContextManager.ACTIVITY_STRUCTUREKIND_TIMING, handle, start,
-						end);
-			}
-		}
-	}
-
-	private void processWorkbenchEvent(String origin, String structureKind, String handle, long start, long end) {
-		ContextCorePlugin.getContextManager().processActivityMetaContextEvent(
-				new InteractionEvent(InteractionEvent.Kind.ATTENTION, structureKind, handle, origin, null,
-						InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, new Date(start), new Date(end)));
-	}
-
-	public void addActivityTime(String handle, long start, long end) {
-		if (handle != null) {
-			ContextCorePlugin.getContextManager().processActivityMetaContextEvent(
-					new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-							InteractionContextManager.ACTIVITY_STRUCTUREKIND_TIMING, handle,
-							InteractionContextManager.ACTIVITY_ORIGINID_USER, null,
-							InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, new Date(start), new Date(end)));
-		}
-	}
-
-	public void removeActivityTime(String handle, long start, long end) {
-		if (handle != null) {
-			ContextCorePlugin.getContextManager().processActivityMetaContextEvent(
-					new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-							InteractionContextManager.ACTIVITY_STRUCTUREKIND_TIMING, handle,
-							InteractionContextManager.ACTIVITY_ORIGINID_USER, null,
-							InteractionContextManager.ACTIVITY_DELTA_REMOVED, 1f, new Date(start), new Date(end)));
-		}
-	}
-
-	private void fireInactive() {
-		for (IUserAttentionListener attentionListener : attentionListeners) {
-			attentionListener.userAttentionLost();
-		}
-	}
-
-	private void fireActive() {
-		for (IUserAttentionListener attentionListener : attentionListeners) {
-			attentionListener.userAttentionGained();
-		}
-	}
-
-	private long getLastEventTime() {
-		for (AbstractUserActivityMonitor monitor : activityMonitors) {
-			if (monitor.isEnabled()) {
-				userActivityMonitor = monitor;
-				return userActivityMonitor.getLastInteractionTime();
-			}
-		}
-
-		return -1;
-	}
-
-	public void setInactivityTimeout(int inactivityTimeout) {
-		checkJob.setInactivityTimeout(inactivityTimeout);
-	}
-
-	public int getInactivityTimeout() {
-		return checkJob.getInactivityTimeout();
-	}
-
-	/**
-	 * @return null when no task is active
-	 */
-	public String getStructureHandle() {
-		if (ContextCore.getContextManager().getActiveContext().getHandleIdentifier() != null) {
-			return ContextCore.getContextManager().getActiveContext().getHandleIdentifier();
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/BrowserMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/BrowserMonitor.java
deleted file mode 100644
index 51a98b3..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/BrowserMonitor.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.LocationListener;
-import org.eclipse.ui.IPageListener;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.browser.BrowserViewer;
-import org.eclipse.ui.internal.browser.WebBrowserEditor;
-
-/**
- * @author Mik Kersten
- */
-// TODO e3.2 move to web.ui or tests
-public class BrowserMonitor extends AbstractUserInteractionMonitor implements IPartListener, IWindowListener,
-		IPageListener {
-
-	public static final String URL_LIST_DELIM = ","; //$NON-NLS-1$
-
-	private final UrlTrackingListener urlTrackingListener = new UrlTrackingListener();
-
-	private List<String> acceptedUrls = new ArrayList<String>();
-
-	class UrlTrackingListener implements LocationListener {
-
-		public void changing(LocationEvent event) {
-			// ignore
-		}
-
-		public void changed(LocationEvent locationEvent) {
-			String url = locationEvent.location;
-			boolean accept = false;
-			for (String urlMatch : acceptedUrls) {
-				if (url.indexOf(urlMatch) != -1) {
-					accept = true;
-				}
-			}
-			if (accept) {
-				InteractionEvent interactionEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION, "url", url, //$NON-NLS-1$
-						WebBrowserEditor.WEB_BROWSER_EDITOR_ID, "null", "", 0); //$NON-NLS-1$ //$NON-NLS-2$
-				MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent); // TODO:
-				// move
-			}
-		}
-	}
-
-	@Override
-	protected void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection, boolean contributeToContext) {
-		// ignore, this is a special case
-	}
-
-	// ---- Part Listener
-
-	public void partOpened(IWorkbenchPart part) {
-		if (part instanceof WebBrowserEditor) {
-			Browser browser = getBrowser((WebBrowserEditor) part);
-			if (browser != null) {
-				browser.addLocationListener(urlTrackingListener);
-			}
-		}
-	}
-
-	public void partClosed(IWorkbenchPart part) {
-		if (part instanceof WebBrowserEditor) {
-			Browser browser = getBrowser((WebBrowserEditor) part);
-			if (browser != null && !browser.isDisposed()) {
-				browser.removeLocationListener(urlTrackingListener);
-			}
-		}
-	}
-
-	public void partActivated(IWorkbenchPart part) {
-	}
-
-	public void partBroughtToTop(IWorkbenchPart part) {
-	}
-
-	public void partDeactivated(IWorkbenchPart part) {
-	}
-
-	private Browser getBrowser(final WebBrowserEditor browserEditor) {
-		try { // HACK: using reflection to gain accessibility
-			Class<?> browserClass = browserEditor.getClass();
-			Field browserField = browserClass.getDeclaredField("webBrowser"); //$NON-NLS-1$
-			browserField.setAccessible(true);
-			Object browserObject = browserField.get(browserEditor);
-			if (browserObject != null && browserObject instanceof BrowserViewer) {
-				return ((BrowserViewer) browserObject).getBrowser();
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.WARNING, MonitorUiPlugin.ID_PLUGIN, "Could not add browser listener", //$NON-NLS-1$
-					e));
-		}
-		return null;
-	}
-
-	// --- Window listener
-
-	public void windowActivated(IWorkbenchWindow window) {
-	}
-
-	public void windowDeactivated(IWorkbenchWindow window) {
-	}
-
-	public void windowClosed(IWorkbenchWindow window) {
-		window.removePageListener(this);
-	}
-
-	public void windowOpened(IWorkbenchWindow window) {
-		window.addPageListener(this);
-	}
-
-	// ---- IPageListener
-
-	public void pageActivated(IWorkbenchPage page) {
-	}
-
-	public void pageClosed(IWorkbenchPage page) {
-		page.removePartListener(this);
-	}
-
-	public void pageOpened(IWorkbenchPage page) {
-		page.addPartListener(this);
-	}
-
-	public List<String> getAcceptedUrls() {
-		return acceptedUrls;
-	}
-
-	public void setAcceptedUrls(String urlBuffer) {
-		acceptedUrls = new ArrayList<String>();
-
-		if (urlBuffer != null) {
-			StringTokenizer token = new StringTokenizer(urlBuffer, URL_LIST_DELIM);
-			while (token.hasMoreTokens()) {
-				acceptedUrls.add(token.nextToken());
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java
deleted file mode 100644
index c28ec40..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/CheckActivityJob.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * A job that is scheduled periodically to check for user activity.
- * 
- * @author Robert Elves
- * @author Steffen Pingel
- */
-public class CheckActivityJob extends Job {
-
-	/**
-	 * If true, the user is assumed to be active.
-	 */
-	private boolean active;
-
-	/**
-	 * The rescheduling interval in ms when active. Should be reasonably short to provide accurate tracking.
-	 */
-	private final int ACTIVE_TICK = 30 * 1000;
-
-	private final IActivityManagerCallback callback;
-
-	/**
-	 * The timeout when to assume a user is inactive. If set to 0 it is assumed that a user is always active.
-	 */
-	private int inactivityTimeout;
-
-	protected long previousEventTime;
-
-	/**
-	 * Protected for testing.
-	 */
-	protected long tick = ACTIVE_TICK;
-
-	public CheckActivityJob(IActivityManagerCallback callback) {
-		super(Messages.CheckActivityJob_Activity_Monitor_Job);
-		this.callback = callback;
-	}
-
-	public int getInactivityTimeout() {
-		return this.inactivityTimeout;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	protected boolean isEnabled() {
-		return Platform.isRunning() && !MonitorUiPlugin.getDefault().getWorkbench().isClosing();
-	}
-
-	/**
-	 * Uses a short interval when inactive. This makes event notifications more accurate when switching from an inactive
-	 * to an active state, e.g. to ensure lively updates of the UI.
-	 */
-	public void reschedule() {
-		schedule(active ? tick : tick / 6);
-	}
-
-	@Override
-	protected IStatus run(IProgressMonitor monitor) {
-		if (isEnabled()) {
-			try {
-				long lastEventTime = callback.getLastEventTime();
-				long currentTime = System.currentTimeMillis();
-				// check if the last activity exceeds timeout
-				if ((currentTime - lastEventTime) >= inactivityTimeout && inactivityTimeout != 0) {
-					if (active) {
-						// time out
-						active = false;
-						callback.inactive();
-					}
-				} else {
-					if (!active) {
-						active = true;
-						// back, start recording activity
-						if (inactivityTimeout != 0) {
-							previousEventTime = lastEventTime;
-						} else {
-							// if timeouts are disabled only the currentTime is relevant for tracking activity 
-							previousEventTime = currentTime;
-						}
-						callback.active();
-					} else {
-						// check if the activity internal is unreasonably long, it is likely that 
-						// the computer came back from sleep at worst difference should be tick * 2
-						if (currentTime - previousEventTime > tick * 3) {
-							if (inactivityTimeout != 0) {
-								// check for recent event
-								if (currentTime - lastEventTime <= tick) {
-									// event since resume
-									previousEventTime = lastEventTime;
-								} else {
-									// time out
-									active = false;
-									callback.inactive();
-								}
-							} else {
-								// if timeouts are disabled only the currentTime is relevant for tracking activity 
-								previousEventTime = currentTime;
-							}
-						} else {
-							callback.addMonitoredActivityTime(previousEventTime, currentTime);
-							previousEventTime = currentTime;
-						}
-					}
-				}
-			} finally {
-				reschedule();
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	public void setInactivityTimeout(int inactivityTimeout) {
-		this.inactivityTimeout = inactivityTimeout;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IActivityManagerCallback.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IActivityManagerCallback.java
deleted file mode 100644
index 13b2482..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IActivityManagerCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-public interface IActivityManagerCallback {
-
-	public abstract void inactive();
-
-	public abstract void active();
-
-	public abstract void addMonitoredActivityTime(long localStartTime, long currentTime);
-
-	public abstract long getLastEventTime();
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IMonitoredWindow.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IMonitoredWindow.java
deleted file mode 100644
index ad0354e..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/IMonitoredWindow.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-/**
- * TODO: consider changing to abstract class
- * 
- * @author Shawn Minto
- */
-public interface IMonitoredWindow {
-
-	public boolean isMonitored();
-
-	public boolean isPerspectiveManaged();
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/KeybindingCommandMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/KeybindingCommandMonitor.java
deleted file mode 100644
index f8e4353..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/KeybindingCommandMonitor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractCommandMonitor;
-
-/**
- * @author Mik Kersten
- */
-public class KeybindingCommandMonitor extends AbstractCommandMonitor {
-
-	public static final String COMMAND_INVOKED = "keybinding"; //$NON-NLS-1$
-
-	@Override
-	protected void handleCommandExecution(String commandId, ExecutionEvent event) {
-		InteractionEvent interactionEvent = InteractionEvent.makeCommand(commandId, COMMAND_INVOKED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MenuCommandMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MenuCommandMonitor.java
deleted file mode 100644
index b8c777b..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MenuCommandMonitor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * @author Mik Kersten
- * @author Leah Findlater
- * 
- */
-public class MenuCommandMonitor implements Listener {
-
-	public static final String MENU_ITEM_ID = "item.label."; //$NON-NLS-1$
-
-	public static final String MENU_ITEM_SELECTED = "menu"; //$NON-NLS-1$
-
-	public static final String TOOLBAR_ITEM_SELECTED = "toolbar"; //$NON-NLS-1$
-
-	public static final String MENU_PATH_DELIM = "/"; //$NON-NLS-1$
-
-	public void handleEvent(Event event) {
-		try {
-			if (!(event.widget instanceof Item)) {
-				return;
-			}
-			Item item = (Item) event.widget;
-			if (item.getData() == null) {
-				return;
-			}
-			Object target = event.widget.getData();
-			String id = null;
-			String delta = null;
-			if (target instanceof IContributionItem) {
-				id = ((IContributionItem) target).getId();
-			}
-			if (id == null && target instanceof ActionContributionItem) {
-				IAction action = ((ActionContributionItem) target).getAction();
-				if (action.getId() != null) {
-					id = action.getId();
-				} else {
-					id = action.getClass().getName();
-				}
-			} else if (id == null) {
-				id = target.getClass().getName();
-			}
-
-			if (item instanceof MenuItem) {
-				MenuItem menu = (MenuItem) item;
-				Menu parentMenu = menu.getParent();
-				String location = ""; //$NON-NLS-1$
-				if (parentMenu != null) {
-					while (parentMenu.getParentItem() != null) {
-						location = parentMenu.getParentItem().getText() + MENU_PATH_DELIM + location;
-						parentMenu = parentMenu.getParentMenu();
-					}
-				}
-				if (id == null) {
-					return;
-					// TODO: would be good to put back this info in some form
-					// but it can contain private data, bug 178604
-
-//					if (id == null) 
-//						id = "null";
-//					String itemText = obfuscateItemText(item.getText());
-//					id = id + "$" + MENU_ITEM_ID + location + itemText;
-				}
-
-				delta = MENU_ITEM_SELECTED;
-			} else if (item instanceof ToolItem) {
-				// TODO: would be good to put back this info in some form
-				// but it can contain private data, bug 178604
-				// ToolItem tool = (ToolItem) item;
-				// if (id == null)
-				// 	 id = "null";
-				// id = id + "$" + MENU_ITEM_ID + '.' + tool.getToolTipText();
-				delta = TOOLBAR_ITEM_SELECTED;
-			}
-			InteractionEvent interactionEvent = InteractionEvent.makeCommand(id, delta);
-			MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-
-		} catch (Throwable t) {
-			StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Could not log selection", t)); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/Messages.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/Messages.java
deleted file mode 100644
index 5a8afbd..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/Messages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.monitor.ui.messages"; //$NON-NLS-1$
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String CheckActivityJob_Activity_Monitor_Job;
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java
deleted file mode 100644
index 91cb8aa..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.CoreUtil;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.monitor.core.IInteractionEventListener;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.ui.AbstractUserActivityMonitor;
-import org.eclipse.mylyn.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.mylyn.monitor.ui.IActivityContextManager;
-import org.eclipse.ui.IPageListener;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPerspectiveListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Mik Kersten
- * @author Shawn Minto
- * @since 3.0
- */
-public class MonitorUiPlugin extends AbstractUIPlugin {
-
-	private static final int DEFAULT_ACTIVITY_TIMEOUT = 180000;
-
-	public static final String ID_PLUGIN = "org.eclipse.mylyn.monitor.ui"; //$NON-NLS-1$
-
-	private static MonitorUiPlugin INSTANCE;
-
-	private ShellLifecycleListener shellLifecycleListener;
-
-	private final List<AbstractUserInteractionMonitor> selectionMonitors = new ArrayList<AbstractUserInteractionMonitor>();
-
-	/**
-	 * TODO: this could be merged with context interaction events rather than requiring update from the monitor.
-	 */
-	private final List<IInteractionEventListener> interactionListeners = new ArrayList<IInteractionEventListener>();
-
-	private ActivityContextManager activityContextManager;
-
-	private final ArrayList<AbstractUserActivityMonitor> monitors = new ArrayList<AbstractUserActivityMonitor>();
-
-	protected Set<IPartListener> partListeners = new HashSet<IPartListener>();
-
-	protected Set<IPageListener> pageListeners = new HashSet<IPageListener>();
-
-	protected Set<IPerspectiveListener> perspectiveListeners = new HashSet<IPerspectiveListener>();
-
-	protected Set<ISelectionListener> postSelectionListeners = new HashSet<ISelectionListener>();
-
-	private final Set<IWorkbenchWindow> monitoredWindows = new HashSet<IWorkbenchWindow>();
-
-	public static final String OBFUSCATED_LABEL = "[obfuscated]"; //$NON-NLS-1$
-
-	public static final String PREF_USER_ACTIVITY_ENABLED = "org.eclipse.mylyn.monitor.user.activity.enabled"; //$NON-NLS-1$
-
-	private IWorkbenchWindow launchingWorkbenchWindow = null;
-
-	private final org.eclipse.jface.util.IPropertyChangeListener PROPERTY_LISTENER = new org.eclipse.jface.util.IPropertyChangeListener() {
-
-		public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
-			if (event.getProperty().equals(ActivityContextManager.ACTIVITY_TIMEOUT)
-					|| event.getProperty().equals(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED)) {
-				updateActivityTimout();
-			} else if (event.getProperty().equals(PREF_USER_ACTIVITY_ENABLED)) {
-				if (getPreferenceStore().getBoolean(PREF_USER_ACTIVITY_ENABLED)) {
-					activityContextManager.start();
-				} else {
-					activityContextManager.stop();
-				}
-
-			}
-		}
-
-	};
-
-	protected IWindowListener WINDOW_LISTENER = new IWindowListener() {
-		public void windowActivated(IWorkbenchWindow window) {
-			// ignore
-		}
-
-		public void windowDeactivated(IWorkbenchWindow window) {
-			// ignore
-		}
-
-		public void windowOpened(IWorkbenchWindow window) {
-			if (getWorkbench().isClosing()) {
-				return;
-			}
-
-			if (window instanceof IMonitoredWindow) {
-				IMonitoredWindow awareWindow = (IMonitoredWindow) window;
-				if (!awareWindow.isMonitored()) {
-					return;
-				}
-			}
-
-			addListenersToWindow(window);
-		}
-
-		public void windowClosed(IWorkbenchWindow window) {
-			removeListenersFromWindow(window);
-			if (window == launchingWorkbenchWindow) {
-				launchingWorkbenchWindow = null;
-			}
-		}
-	};
-
-	public MonitorUiPlugin() {
-		INSTANCE = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-
-		getPreferenceStore().setDefault(ActivityContextManager.ACTIVITY_TIMEOUT, DEFAULT_ACTIVITY_TIMEOUT);
-		getPreferenceStore().setDefault(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED, true);
-
-		if (CoreUtil.TEST_MODE) {
-			init();
-		} else {
-			// FIXME: use UIJob
-			// delay initialization until workbench is realized
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					init();
-				}
-			});
-		}
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		try {
-			if (Platform.isRunning()) {
-				if (activityContextManager != null) {
-					activityContextManager.stop();
-				}
-				getPreferenceStore().removePropertyChangeListener(PROPERTY_LISTENER);
-				if (getWorkbench() != null && !getWorkbench().isClosing()) {
-					getWorkbench().removeWindowListener(WINDOW_LISTENER);
-
-					if (getWorkbench().getActiveWorkbenchWindow() != null
-							&& getWorkbench().getActiveWorkbenchWindow().getShell() != null
-							&& !getWorkbench().getActiveWorkbenchWindow().getShell().isDisposed()) {
-						getWorkbench().getActiveWorkbenchWindow()
-								.getShell()
-								.removeShellListener(shellLifecycleListener);
-					}
-
-					for (IWorkbenchWindow window : monitoredWindows) {
-						removeListenersFromWindow(window);
-					}
-				}
-
-			}
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Monitor UI stop failed", e)); //$NON-NLS-1$
-		}
-		INSTANCE = null;
-	}
-
-	public ShellLifecycleListener getShellLifecycleListener() {
-		return shellLifecycleListener;
-	}
-
-	public void addWindowPartListener(IPartListener listener) {
-		partListeners.add(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.getPartService().addPartListener(listener);
-		}
-	}
-
-	public void removeWindowPartListener(IPartListener listener) {
-		partListeners.remove(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.getPartService().removePartListener(listener);
-		}
-	}
-
-	public void addWindowPageListener(IPageListener listener) {
-		pageListeners.add(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.addPageListener(listener);
-		}
-	}
-
-	public void removeWindowPageListener(IPageListener listener) {
-		pageListeners.remove(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.removePageListener(listener);
-		}
-	}
-
-	public void addWindowPerspectiveListener(IPerspectiveListener listener) {
-		perspectiveListeners.add(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.addPerspectiveListener(listener);
-		}
-	}
-
-	public void removeWindowPerspectiveListener(IPerspectiveListener listener) {
-		perspectiveListeners.remove(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			window.removePerspectiveListener(listener);
-		}
-	}
-
-	public void addWindowPostSelectionListener(ISelectionListener listener) {
-		postSelectionListeners.add(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			ISelectionService service = window.getSelectionService();
-			service.addPostSelectionListener(listener);
-		}
-	}
-
-	public void removeWindowPostSelectionListener(ISelectionListener listener) {
-		getDefault().postSelectionListeners.remove(listener);
-		for (IWorkbenchWindow window : monitoredWindows) {
-			ISelectionService service = window.getSelectionService();
-			service.removePostSelectionListener(listener);
-		}
-	}
-
-	public static MonitorUiPlugin getDefault() {
-		return INSTANCE;
-	}
-
-	public List<AbstractUserInteractionMonitor> getSelectionMonitors() {
-		return selectionMonitors;
-	}
-
-	public void addInteractionListener(IInteractionEventListener listener) {
-		interactionListeners.add(listener);
-	}
-
-	public void removeInteractionListener(IInteractionEventListener listener) {
-		interactionListeners.remove(listener);
-	}
-
-	/**
-	 * TODO: refactor this, it's awkward
-	 */
-	public void notifyInteractionObserved(InteractionEvent interactionEvent) {
-		for (IInteractionEventListener listener : interactionListeners) {
-			listener.interactionObserved(interactionEvent);
-		}
-	}
-
-	public List<IInteractionEventListener> getInteractionListeners() {
-		return interactionListeners;
-	}
-
-	class MonitorUiExtensionPointReader {
-
-		public static final String EXTENSION_ID_USER = "org.eclipse.mylyn.monitor.ui.user"; //$NON-NLS-1$
-
-		public static final String ELEMENT_ACTIVITY_TIMER = "osActivityTimer"; //$NON-NLS-1$
-
-		public static final String ELEMENT_CLASS = "class"; //$NON-NLS-1$
-
-		private boolean extensionsRead = false;
-
-		public void initExtensions() {
-			try {
-				if (!extensionsRead) {
-					IExtensionRegistry registry = Platform.getExtensionRegistry();
-					IExtensionPoint extensionPoint = registry.getExtensionPoint(EXTENSION_ID_USER);
-					if (extensionPoint != null) {
-						IExtension[] extensions = extensionPoint.getExtensions();
-						for (IExtension extension : extensions) {
-							IConfigurationElement[] elements = extension.getConfigurationElements();
-							for (IConfigurationElement element : elements) {
-								if (element.getName().compareTo(ELEMENT_ACTIVITY_TIMER) == 0) {
-									readActivityMonitor(element);
-								}
-							}
-						}
-						extensionsRead = true;
-					}
-				}
-			} catch (Throwable t) {
-				StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN,
-						"Could not read monitor extension", t)); //$NON-NLS-1$
-			}
-		}
-
-		private void readActivityMonitor(IConfigurationElement element) throws CoreException {
-			try {
-				if (element.getAttribute(ELEMENT_CLASS) != null) {
-					Object activityTimer = element.createExecutableExtension(ELEMENT_CLASS);
-					if (activityTimer instanceof AbstractUserActivityMonitor) {
-						monitors.add(0, (AbstractUserActivityMonitor) activityTimer);
-					}
-				}
-			} catch (CoreException e) {
-				StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Could not load activity timer", //$NON-NLS-1$
-						e));
-			}
-		}
-	}
-
-	public IActivityContextManager getActivityContextManager() {
-		return activityContextManager;
-	}
-
-	public boolean suppressConfigurationWizards() {
-		List<String> commandLineArgs = Arrays.asList(Platform.getCommandLineArgs());
-		if (commandLineArgs.contains("-showMylynWizards")) { //$NON-NLS-1$
-			return false;
-		} else {
-			return commandLineArgs.contains("-pdelaunch"); //$NON-NLS-1$
-		}
-	}
-
-	private void removeListenersFromWindow(IWorkbenchWindow window) {
-		for (IPageListener listener : pageListeners) {
-			window.removePageListener(listener);
-		}
-		for (IPartListener listener : partListeners) {
-			window.getPartService().removePartListener(listener);
-		}
-		for (IPerspectiveListener listener : perspectiveListeners) {
-			window.removePerspectiveListener(listener);
-		}
-		for (ISelectionListener listener : postSelectionListeners) {
-			window.getSelectionService().removePostSelectionListener(listener);
-		}
-		monitoredWindows.remove(window);
-	}
-
-	// TODO: consider making API
-	private void addListenersToWindow(IWorkbenchWindow window) {
-		for (IPageListener listener : pageListeners) {
-			window.addPageListener(listener);
-		}
-		for (IPartListener listener : partListeners) {
-			window.getPartService().addPartListener(listener);
-		}
-		for (IPerspectiveListener listener : perspectiveListeners) {
-			window.addPerspectiveListener(listener);
-		}
-		for (ISelectionListener listener : postSelectionListeners) {
-			window.getSelectionService().addPostSelectionListener(listener);
-		}
-
-		monitoredWindows.add(window);
-	}
-
-	/**
-	 * @since 2.2
-	 */
-	public Set<IWorkbenchWindow> getMonitoredWindows() {
-		return monitoredWindows;
-	}
-
-	/**
-	 * @since 2.2
-	 */
-	public IWorkbenchWindow getLaunchingWorkbenchWindow() {
-		return launchingWorkbenchWindow;
-	}
-
-	private void init() {
-		try {
-			getWorkbench().addWindowListener(WINDOW_LISTENER);
-			launchingWorkbenchWindow = getWorkbench().getActiveWorkbenchWindow();
-
-			for (IWorkbenchWindow window : getWorkbench().getWorkbenchWindows()) {
-				addListenersToWindow(window);
-			}
-
-			shellLifecycleListener = new ShellLifecycleListener(ContextCorePlugin.getContextManager());
-			getWorkbench().getActiveWorkbenchWindow().getShell().addShellListener(shellLifecycleListener);
-
-			monitors.add(new WorkbenchUserActivityMonitor());
-			new MonitorUiExtensionPointReader().initExtensions();
-
-			activityContextManager = new ActivityContextManager(monitors);
-
-			updateActivityTimout();
-
-			if (getPreferenceStore().getBoolean(PREF_USER_ACTIVITY_ENABLED)) {
-				activityContextManager.start();
-			}
-
-			getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
-
-		} catch (Exception e) {
-			StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Monitor UI start failed", e)); //$NON-NLS-1$
-		}
-	}
-
-	private void updateActivityTimout() {
-		if (getPreferenceStore().getBoolean(ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED)) {
-			activityContextManager.setInactivityTimeout(getPreferenceStore().getInt(
-					ActivityContextManager.ACTIVITY_TIMEOUT));
-		} else {
-			activityContextManager.setInactivityTimeout(0);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PerspectiveChangeMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PerspectiveChangeMonitor.java
deleted file mode 100644
index a1cff64..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PerspectiveChangeMonitor.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Lean Findlater - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PerspectiveAdapter;
-import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
-
-/**
- * @author Leah Findlater
- * @author Mik Kersten
- */
-public class PerspectiveChangeMonitor extends PerspectiveAdapter {
-
-	public static final String PERSPECTIVE_SAVED = "perspective saved"; //$NON-NLS-1$
-
-	public static final String PERSPECTIVE_OPENED = "perspective opened"; //$NON-NLS-1$
-
-	public static final String PERSPECTIVE_CLOSED = "perspective closed"; //$NON-NLS-1$
-
-	public static final String PERSPECTIVE_CHANGED = "perspective changed"; //$NON-NLS-1$
-
-	public static final String PERSPECTIVE_ACTIVATED = "perspective activated"; //$NON-NLS-1$
-
-	@Override
-	public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		String source = this.getPerspectiveId(perspective);
-
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_ACTIVATED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	@Override
-	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective,
-			IWorkbenchPartReference partRef, String changeId) {
-		if (partRef != null) {
-			String source = partRef.getId();
-			InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_CHANGED + ": " //$NON-NLS-1$
-					+ changeId);
-			MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-		}
-	}
-
-	@Override
-	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
-		String source = this.getPerspectiveId(perspective);
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_CHANGED + ": " //$NON-NLS-1$
-				+ changeId);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	@Override
-	public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		String source = this.getPerspectiveId(perspective);
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_CLOSED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	@Override
-	public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		String source = this.getPerspectiveId(perspective);
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_OPENED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	@Override
-	public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective,
-			IPerspectiveDescriptor newPerspective) {
-		String source = this.getPerspectiveId(newPerspective);
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(source, PERSPECTIVE_SAVED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	private String getPerspectiveId(IPerspectiveDescriptor perspective) {
-		String id;
-
-		if (perspective instanceof PerspectiveDescriptor) {
-			String originalId = ((PerspectiveDescriptor) perspective).getOriginalId();
-			if (!originalId.equals(perspective.getId())) {
-				id = originalId + "[customized]"; //$NON-NLS-1$
-			} else {
-				id = perspective.getId();
-			}
-		} else {
-			id = perspective.getId();
-		}
-		return id;
-	}
-
-}
-
-/* Perspective listener methods */
-
-// TODO Should we comment out the more detailed perspective listener methods and
-// just use this one instead? This one logs the open set of views and editors
-// whenever that changes.
-/*
- * @Override public void perspectiveChanged(IWorkbenchPage page,
- * IPerspectiveDescriptor perspective, String changeId) {
- * super.perspectiveChanged(page, perspective, changeId);
- * 
- * if(changeId.startsWith("view") || changeId.startsWith("editor")) {
- * IWorkbenchPage workbenchPage =
- * PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- * IViewReference[] viewList = workbenchPage.getViewReferences();
- * IEditorReference[] editorList = workbenchPage.getEditorReferences();
- * 
- * String delta = ""; for(int i = 0; i < viewList.length; i++) { delta = delta +
- * viewList[i].getTitle() + ","; } delta = delta + "Editor (" +
- * editorList.length + " open)";
- * 
- * String source = "perspective." + perspective.getLabel(); InteractionEvent
- * interactionEvent = new InteractionEvent( source, delta );
- * logger.interactionObserved(interactionEvent); } }
- */
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PreferenceChangeMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PreferenceChangeMonitor.java
deleted file mode 100644
index 4fe6e80..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/PreferenceChangeMonitor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-
-/**
- * @author Mik Kersten
- */
-public class PreferenceChangeMonitor implements IPropertyChangeListener {
-
-	public void propertyChange(PropertyChangeEvent event) {
-		String newValue = obfuscateValueIfContainsPath(event.getNewValue().toString());
-		InteractionEvent interactionEvent = InteractionEvent.makePreference(event.getProperty(), newValue);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	private String obfuscateValueIfContainsPath(String preferenceValue) {
-		if (preferenceValue.indexOf(java.io.File.separator) != -1 || preferenceValue.indexOf('/') != -1) {
-			return MonitorUiPlugin.OBFUSCATED_LABEL;
-		} else {
-			return preferenceValue;
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ShellLifecycleListener.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ShellLifecycleListener.java
deleted file mode 100644
index 66fbf89..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/ShellLifecycleListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.events.ShellListener;
-
-/**
- * Translates interaction with the shell/window to interaction events.
- * 
- * @author Mik Kersten
- */
-@SuppressWarnings("restriction")
-public class ShellLifecycleListener implements ShellListener {
-
-	private final InteractionContextManager manager;
-
-	public ShellLifecycleListener(InteractionContextManager manager) {
-		this.manager = manager;
-
-		String productId = InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH;
-		if (Platform.getProduct() != null) {
-			productId = Platform.getProduct().getId();
-		}
-
-		manager.processActivityMetaContextEvent(new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-				InteractionContextManager.ACTIVITY_STRUCTUREKIND_LIFECYCLE, productId,
-				InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-				InteractionContextManager.ACTIVITY_DELTA_STARTED, 1f));
-	}
-
-	public void shellClosed(ShellEvent shellEvent) {
-		// XXX: if this is only used for saving this is not right
-		manager.deactivateAllContexts();
-
-		String productId = InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH;
-		if (Platform.getProduct() != null) {
-			productId = Platform.getProduct().getId();
-		}
-
-		manager.processActivityMetaContextEvent(new InteractionEvent(InteractionEvent.Kind.ATTENTION,
-				InteractionContextManager.ACTIVITY_STRUCTUREKIND_LIFECYCLE, productId,
-				InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
-				InteractionContextManager.ACTIVITY_DELTA_STOPPED, 1f));
-//		ContextCore.getContextManager().saveActivityMetaContext();
-	}
-
-	public void shellDeactivated(ShellEvent arg0) {
-		// ignore
-	}
-
-	public void shellActivated(ShellEvent arg0) {
-		// ignore
-	}
-
-	public void shellDeiconified(ShellEvent arg0) {
-		// ignore
-	}
-
-	public void shellIconified(ShellEvent arg0) {
-		// ignore
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WindowChangeMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WindowChangeMonitor.java
deleted file mode 100644
index 17414c7..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WindowChangeMonitor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *     Leah Findlater - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * Logs all bug root window selections (i.e. the window that the workbench is launced with).
- * 
- * @author Mik Kersten
- * @author Leah Findlater
- * 
- */
-public class WindowChangeMonitor implements IWindowListener {
-
-	public static final String WINDOW_CLOSED = "closed"; //$NON-NLS-1$
-
-	public static final String WINDOW_OPENED = "opened"; //$NON-NLS-1$
-
-	public static final String WINDOW_ACTIVATED = "activated"; //$NON-NLS-1$
-
-	public static final String WINDOW_DEACTIVATED = "deactivated"; //$NON-NLS-1$
-
-	public WindowChangeMonitor() {
-		super();
-	}
-
-	// TODO: Should we add the default set of monitors to the new window as
-	// well?
-	public void windowOpened(IWorkbenchWindow window) {
-		InteractionEvent interactionEvent = InteractionEvent.makeCommand(getWindowOrigin(window), WINDOW_OPENED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	public void windowClosed(IWorkbenchWindow window) {
-		InteractionEvent interactionEvent = InteractionEvent.makeCommand(getWindowOrigin(window), WINDOW_CLOSED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	public void windowDeactivated(IWorkbenchWindow window) {
-//		InteractionEvent interactionEvent = InteractionEvent.makeCommand(getWindowOrigin(window),
-//				WINDOW_DEACTIVATED);
-//		MylynMonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	public void windowActivated(IWorkbenchWindow window) {
-		InteractionEvent interactionEvent = InteractionEvent.makeCommand(getWindowOrigin(window), WINDOW_ACTIVATED);
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(interactionEvent);
-	}
-
-	protected String getWindowOrigin(IWorkbenchWindow window) {
-		return window.getClass().getCanonicalName();// + "@" + window.hashCode();
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WorkbenchUserActivityMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WorkbenchUserActivityMonitor.java
deleted file mode 100644
index d74f4f7..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/WorkbenchUserActivityMonitor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.monitor.ui;
-
-import org.eclipse.mylyn.monitor.ui.AbstractUserActivityMonitor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * @author Mik Kersten
- * @author Rob Elves
- */
-public class WorkbenchUserActivityMonitor extends AbstractUserActivityMonitor {
-
-	private Listener interactionActivityListener;
-
-	private Display display;
-
-	@Override
-	public void start() {
-		display = MonitorUiPlugin.getDefault().getWorkbench().getDisplay();
-		interactionActivityListener = new Listener() {
-			public void handleEvent(Event event) {
-				setLastEventTime(System.currentTimeMillis());
-			}
-		};
-
-		display.addFilter(SWT.KeyUp, interactionActivityListener);
-		display.addFilter(SWT.MouseUp, interactionActivityListener);
-	}
-
-	@Override
-	public void stop() {
-		if (display != null && !display.isDisposed() && interactionActivityListener != null) {
-			display.removeFilter(SWT.KeyUp, interactionActivityListener);
-			display.removeFilter(SWT.MouseUp, interactionActivityListener);
-		}
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/messages.properties b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/messages.properties
deleted file mode 100644
index 1e43bce..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-CheckActivityJob_Activity_Monitor_Job=Activity Monitor Job
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractCommandMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractCommandMonitor.java
deleted file mode 100644
index 80043d5..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractCommandMonitor.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IExecutionListener;
-import org.eclipse.core.commands.NotHandledException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.ICommandService;
-
-/**
- * Self-registering on construction. Monitors the execution of commands within the workbench.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractCommandMonitor implements IExecutionListener {
-
-	/**
-	 * Workbench must be active.
-	 */
-	public AbstractCommandMonitor() {
-		try {
-			ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getAdapter(
-					ICommandService.class);
-			commandService.addExecutionListener(this);
-		} catch (NullPointerException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN,
-					"Monitors can not be instantiated until the workbench is active.", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void dispose() {
-		try {
-			ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getAdapter(
-					ICommandService.class);
-			commandService.removeExecutionListener(this);
-		} catch (NullPointerException e) {
-			StatusHandler.log(new Status(IStatus.ERROR, MonitorUiPlugin.ID_PLUGIN, "Could not dispose monitor.", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void postExecuteFailure(String commandId, ExecutionException exception) {
-		// don't care about this
-	}
-
-	public void notHandled(String commandId, NotHandledException exception) {
-		// don't care about this
-	}
-
-	public void postExecuteSuccess(String commandId, Object returnValue) {
-		// don't care about this
-	}
-
-	public void preExecute(String commandId, ExecutionEvent event) {
-		if (commandId != null) {
-			handleCommandExecution(commandId, event);
-		}
-	}
-
-	protected abstract void handleCommandExecution(String commandId, ExecutionEvent event);
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractEditorTracker.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractEditorTracker.java
deleted file mode 100644
index 4993f49..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractEditorTracker.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Tracks interaction with workbench editors.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractEditorTracker extends AbstractPartTracker {
-
-	@Override
-	public void partClosed(IWorkbenchPart part) {
-		if (part instanceof IEditorPart) {
-			editorClosed((IEditorPart) part);
-		}
-	}
-
-	@Override
-	public void partOpened(IWorkbenchPart part) {
-		if (part instanceof IEditorPart) {
-			editorOpened((IEditorPart) part);
-		}
-	}
-
-	@Override
-	public void partBroughtToTop(IWorkbenchPart part) {
-		if (part instanceof IEditorPart) {
-			editorBroughtToTop((IEditorPart) part);
-		}
-	}
-
-	protected abstract void editorOpened(IEditorPart part);
-
-	protected abstract void editorClosed(IEditorPart part);
-
-	protected abstract void editorBroughtToTop(IEditorPart part);
-
-	@Override
-	public void partActivated(IWorkbenchPart part) {
-		// ignore
-	}
-
-	@Override
-	public void partDeactivated(IWorkbenchPart part) {
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractPartTracker.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractPartTracker.java
deleted file mode 100644
index 3b511b2..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractPartTracker.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Monitors interaction with workbench parts.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public abstract class AbstractPartTracker implements IPartListener {
-
-	public void install(IWorkbench workbench) {
-		MonitorUiPlugin.getDefault().addWindowPartListener(this);
-	}
-
-	public void dispose(IWorkbench workbench) {
-		MonitorUiPlugin.getDefault().removeWindowPartListener(this);
-	}
-
-	public abstract void partActivated(IWorkbenchPart part);
-
-	public abstract void partBroughtToTop(IWorkbenchPart part);
-
-	public abstract void partClosed(IWorkbenchPart part);
-
-	public abstract void partDeactivated(IWorkbenchPart part);
-
-	public abstract void partOpened(IWorkbenchPart part);
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserActivityMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserActivityMonitor.java
deleted file mode 100644
index 85f4335..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserActivityMonitor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-/**
- * Extend to monitor periods of user activity and inactivity.
- * 
- * @author Mik Kersten
- * @author Rob Elves
- * @since 2.0
- */
-public abstract class AbstractUserActivityMonitor {
-
-	private long lastEventTimeStamp = -1;
-
-	/**
-	 * @since 2.0
-	 */
-	public long getLastInteractionTime() {
-		synchronized (this) {
-			return lastEventTimeStamp;
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public void setLastEventTime(long lastEventTime) {
-		synchronized (this) {
-			lastEventTimeStamp = lastEventTime;
-		}
-	}
-
-	/**
-	 * @since 2.0
-	 */
-	public abstract void start();
-
-	/**
-	 * @since 2.0
-	 */
-	public abstract void stop();
-
-	/**
-	 * @return false if monitor unable to run (i.e. startup failures of any kind)
-	 * @since 2.0
-	 */
-	public boolean isEnabled() {
-		return true;
-	}
-
-	/**
-	 * @since 3.1
-	 */
-	public String getOriginId() {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserInteractionMonitor.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserInteractionMonitor.java
deleted file mode 100644
index d844439..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/AbstractUserInteractionMonitor.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.context.core.AbstractContextStructureBridge;
-import org.eclipse.mylyn.context.core.ContextCore;
-import org.eclipse.mylyn.internal.monitor.ui.IMonitoredWindow;
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.monitor.core.InteractionEvent;
-import org.eclipse.mylyn.monitor.core.InteractionEvent.Kind;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * Self-registering on construction. Encapsulates users' interaction with the context model.
- * 
- * @author Mik Kersten
- * @author Shawn Minto
- * @since 2.0
- */
-public abstract class AbstractUserInteractionMonitor implements ISelectionListener {
-
-	protected Object lastSelectedElement = null;
-
-	/**
-	 * Requires workbench to be active.
-	 */
-	public AbstractUserInteractionMonitor() {
-		try {
-			MonitorUiPlugin.getDefault().addWindowPostSelectionListener(this);
-		} catch (NullPointerException e) {
-			StatusHandler.log(new Status(IStatus.WARNING, MonitorUiPlugin.ID_PLUGIN,
-					"Monitors can not be instantiated until the workbench is active", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void dispose() {
-		try {
-			MonitorUiPlugin.getDefault().removeWindowPostSelectionListener(this);
-		} catch (NullPointerException e) {
-			StatusHandler.log(new Status(IStatus.WARNING, MonitorUiPlugin.ID_PLUGIN, "Could not dispose monitor", e)); //$NON-NLS-1$
-		}
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (part.getSite() != null && part.getSite().getWorkbenchWindow() != null) {
-			IWorkbenchWindow window = part.getSite().getWorkbenchWindow();
-			if (window instanceof IMonitoredWindow && !((IMonitoredWindow) window).isMonitored()) {
-				return;
-			}
-		}
-		if (selection == null || selection.isEmpty()) {
-			return;
-		}
-		if (!ContextCore.getContextManager().isContextActive()) {
-			handleWorkbenchPartSelection(part, selection, false);
-		} else {
-			handleWorkbenchPartSelection(part, selection, true);
-		}
-	}
-
-	protected abstract void handleWorkbenchPartSelection(IWorkbenchPart part, ISelection selection,
-			boolean contributeToContext);
-
-	/**
-	 * Intended to be called back by subclasses.
-	 */
-	protected InteractionEvent handleElementSelection(IWorkbenchPart part, Object selectedElement,
-			boolean contributeToContext) {
-		return handleElementSelection(part.getSite().getId(), selectedElement, contributeToContext);
-	}
-
-	/**
-	 * Intended to be called back by subclasses.
-	 */
-	protected void handleElementEdit(IWorkbenchPart part, Object selectedElement, boolean contributeToContext) {
-		handleElementEdit(part.getSite().getId(), selectedElement, contributeToContext);
-	}
-
-	/**
-	 * Intended to be called back by subclasses.
-	 */
-	protected void handleNavigation(IWorkbenchPart part, Object targetElement, String kind, boolean contributeToContext) {
-		handleNavigation(part.getSite().getId(), targetElement, kind, contributeToContext);
-	}
-
-	/**
-	 * Intended to be called back by subclasses. *
-	 * 
-	 * @since 3.1
-	 */
-	protected void handleNavigation(String partId, Object targetElement, String kind, boolean contributeToContext) {
-		AbstractContextStructureBridge adapter = ContextCore.getStructureBridge(targetElement);
-		if (adapter.getContentType() != null) {
-			String handleIdentifier = adapter.getHandleIdentifier(targetElement);
-			InteractionEvent navigationEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION,
-					adapter.getContentType(), handleIdentifier, partId, kind);
-			if (handleIdentifier != null && contributeToContext) {
-				ContextCore.getContextManager().processInteractionEvent(navigationEvent);
-			}
-			MonitorUiPlugin.getDefault().notifyInteractionObserved(navigationEvent);
-		}
-	}
-
-	/**
-	 * Intended to be called back by subclasses.
-	 * 
-	 * @since 3.1
-	 */
-	protected void handleElementEdit(String partId, Object selectedElement, boolean contributeToContext) {
-		if (selectedElement == null) {
-			return;
-		}
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(selectedElement);
-		String handleIdentifier = bridge.getHandleIdentifier(selectedElement);
-		InteractionEvent editEvent = new InteractionEvent(InteractionEvent.Kind.EDIT, bridge.getContentType(),
-				handleIdentifier, partId);
-		if (handleIdentifier != null && contributeToContext) {
-			ContextCore.getContextManager().processInteractionEvent(editEvent);
-		}
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(editEvent);
-	}
-
-	/**
-	 * Intended to be called back by subclasses. *
-	 * 
-	 * @since 3.1
-	 */
-	protected InteractionEvent handleElementSelection(String partId, Object selectedElement, boolean contributeToContext) {
-		if (selectedElement == null || selectedElement.equals(lastSelectedElement)) {
-			return null;
-		}
-		AbstractContextStructureBridge bridge = ContextCore.getStructureBridge(selectedElement);
-		String handleIdentifier = bridge.getHandleIdentifier(selectedElement);
-		InteractionEvent selectionEvent;
-		if (bridge.getContentType() != null) {
-			selectionEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION, bridge.getContentType(),
-					handleIdentifier, partId);
-		} else {
-			selectionEvent = new InteractionEvent(InteractionEvent.Kind.SELECTION, null, null, partId);
-		}
-		if (handleIdentifier != null && contributeToContext) {
-			ContextCore.getContextManager().processInteractionEvent(selectionEvent);
-		}
-		MonitorUiPlugin.getDefault().notifyInteractionObserved(selectionEvent);
-		return selectionEvent;
-	}
-
-	public Kind getEventKind() {
-		return InteractionEvent.Kind.SELECTION;
-	}
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActionExecutionListener.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActionExecutionListener.java
deleted file mode 100644
index 51d1a4c..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActionExecutionListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import org.eclipse.jface.action.IAction;
-
-/**
- * Notified of user action executions.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public interface IActionExecutionListener {
-
-	public void actionObserved(IAction action);
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActivityContextManager.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActivityContextManager.java
deleted file mode 100644
index 1ca41e5..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IActivityContextManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-/**
- * @author Rob Elves
- * @since 3.0
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IActivityContextManager {
-
-	public abstract void removeActivityTime(String handle, long start, long end);
-
-	public abstract void setInactivityTimeout(int inactivityTimeout);
-
-	public abstract int getInactivityTimeout();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IMonitorLifecycleListener.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IMonitorLifecycleListener.java
deleted file mode 100644
index f2b7540..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IMonitorLifecycleListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Brian de Alwis - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-/**
- * Notified of monitor life-cycle changes.
- * 
- * @author Brian de Alwis
- * @since 3.0
- */
-public interface IMonitorLifecycleListener {
-
-	public void startMonitoring();
-
-	public void stopMonitoring();
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IUserAttentionListener.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IUserAttentionListener.java
deleted file mode 100644
index 16f7240..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/IUserAttentionListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-/**
- * Notified of user activity and inactivity events.
- * 
- * @author Mik Kersten
- * @since 2.0
- */
-public interface IUserAttentionListener {
-
-	public void userAttentionGained();
-
-	public void userAttentionLost();
-
-}
diff --git a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/MonitorUi.java b/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/MonitorUi.java
deleted file mode 100644
index f7f8ba5..0000000
--- a/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/monitor/ui/MonitorUi.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.monitor.ui;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
-import org.eclipse.mylyn.monitor.core.IInteractionEventListener;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPerspectiveListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * @author Steffen Pingel
- * @author Mik Kersten
- * @since 3.0
- */
-public class MonitorUi {
-
-	public static void addWindowPostSelectionListener(ISelectionListener listener) {
-		MonitorUiPlugin.getDefault().addWindowPostSelectionListener(listener);
-	}
-
-	public static void removeWindowPostSelectionListener(ISelectionListener listener) {
-		MonitorUiPlugin.getDefault().removeWindowPostSelectionListener(listener);
-	}
-
-	public static void addInteractionListener(IInteractionEventListener listener) {
-		MonitorUiPlugin.getDefault().addInteractionListener(listener);
-	}
-
-	public static List<AbstractUserInteractionMonitor> getSelectionMonitors() {
-		return MonitorUiPlugin.getDefault().getSelectionMonitors();
-	}
-
-	public static void removeInteractionListener(IInteractionEventListener listener) {
-		MonitorUiPlugin.getDefault().removeInteractionListener(listener);
-	}
-
-	public static IActivityContextManager getActivityContextManager() {
-		return MonitorUiPlugin.getDefault().getActivityContextManager();
-	}
-
-	public static IWorkbenchWindow getLaunchingWorkbenchWindow() {
-		return MonitorUiPlugin.getDefault().getLaunchingWorkbenchWindow();
-	}
-
-	public static Set<IWorkbenchWindow> getMonitoredWindows() {
-		return MonitorUiPlugin.getDefault().getMonitoredWindows();
-	}
-
-	public static void addWindowPartListener(IPartListener listener) {
-		MonitorUiPlugin.getDefault().addWindowPartListener(listener);
-	}
-
-	public static void removeWindowPartListener(IPartListener listener) {
-		MonitorUiPlugin.getDefault().removeWindowPartListener(listener);
-	}
-
-	public static void addWindowPerspectiveListener(IPerspectiveListener listener) {
-		MonitorUiPlugin.getDefault().addWindowPerspectiveListener(listener);
-	}
-
-	public static void removeWindowPerspectiveListener(IPerspectiveListener listener) {
-		MonitorUiPlugin.getDefault().removeWindowPerspectiveListener(listener);
-	}
-}
diff --git a/org.eclipse.mylyn/.classpath b/org.eclipse.mylyn/.classpath
deleted file mode 100644
index 5f3bf8a..0000000
--- a/org.eclipse.mylyn/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<accessrules>
-			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.mylyn/.cvsignore b/org.eclipse.mylyn/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.mylyn/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.mylyn/.project b/org.eclipse.mylyn/.project
deleted file mode 100644
index c0a047a..0000000
--- a/org.eclipse.mylyn/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.mylyn</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.core.resources.prefs b/org.eclipse.mylyn/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1f4b9d9..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Feb 06 18:44:59 PST 2007
-eclipse.preferences.version=1
-encoding/.project=UTF-8
-encoding//META-INF/MANIFEST.MF=UTF-8
-encoding/build.properties=ISO-8859-1
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f1554b1..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,342 +0,0 @@
-#Tue May 12 20:42:43 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.mylyn/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 766f9cb..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,63 +0,0 @@
-#Thu Sep 11 16:27:18 PDT 2008
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Mylyn based on Eclipse
-formatter_settings_version=11
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2004, 2008 Tasktop Technologies and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *     Tasktop Technologies - initial API and implementation\r\n *******************************************************************************/\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ignore\r\n${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ignore</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Jsdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.ltk.core.refactoring.prefs b/org.eclipse.mylyn/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index bbebc5a..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 02 15:30:24 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=true
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasklist.prefs b/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasklist.prefs
deleted file mode 100644
index 9b9494b..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasklist.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Jun 18 17:13:01 PDT 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 3c0413f..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Dec 19 18:09:57 PST 2007
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.mylyn/.settings/org.eclipse.pde.prefs b/org.eclipse.mylyn/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e8f2d56..0000000
--- a/org.eclipse.mylyn/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-#Tue Apr 15 11:07:59 PDT 2008
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/org.eclipse.mylyn/META-INF/MANIFEST.MF b/org.eclipse.mylyn/META-INF/MANIFEST.MF
deleted file mode 100644
index 730750c..0000000
--- a/org.eclipse.mylyn/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.mylyn
-Bundle-Version: 3.2.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn/about.html b/org.eclipse.mylyn/about.html
deleted file mode 100644
index d774b07..0000000
--- a/org.eclipse.mylyn/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 25, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.mylyn/about.ini b/org.eclipse.mylyn/about.ini
deleted file mode 100644
index 8fba0c2..0000000
--- a/org.eclipse.mylyn/about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=Eclipse Mylyn Project\n\
-\n\ Copyright (c) 2004, 2008 Mylyn project committers and others.  All rights reserved.\n\
-Visit http://eclipse.org/mylyn
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=feature.gif
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
diff --git a/org.eclipse.mylyn/build.properties b/org.eclipse.mylyn/build.properties
deleted file mode 100644
index 2720338..0000000
--- a/org.eclipse.mylyn/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 Tasktop Technologies and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-###############################################################################
-
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               feature.gif,\
-               .,\
-               plugin.properties
-src.includes = about.html,\
-               about.ini
-
diff --git a/org.eclipse.mylyn/feature.gif b/org.eclipse.mylyn/feature.gif
deleted file mode 100644
index 76a1f0a..0000000
--- a/org.eclipse.mylyn/feature.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.mylyn/plugin.properties b/org.eclipse.mylyn/plugin.properties
deleted file mode 100644
index 39113e8..0000000
--- a/org.eclipse.mylyn/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.mylyn
-Bundle-Vendor = Eclipse.org
-Bundle-Name = Mylyn